Index: knurl.module =================================================================== --- knurl.module (revision 32622) +++ knurl.module (working copy) @@ -20,16 +20,7 @@ * Implementation of hook_perm(). */ function knurl_perm() { - return array('create knurl', 'access knurl', 'remove knurl'); -} - -/** - * Implementation of hook_access(). - */ -function knurl_access($op, $node) { - if ($op == 'create') return user_access('create knurl'); - else if ($op == 'remove') return user_access('remove knurl'); - else return user_access('access knurl'); + return array('create knurl', 'access knurl', 'remove knurl', 'show knurl'); } /** @@ -38,19 +29,19 @@ function knurl_menu() { $items = array(); - $items['knurl'] = array( + $items['knurl/create'] = array( 'title' => t('Create a new URL shortcut'), 'page callback' => 'drupal_get_form', 'page arguments' => array ('knurl_add_form'), 'access callback' => 'user_access', - 'access arguments' => array('access knurl'), + 'access arguments' => array('create knurl'), 'type' => MENU_NORMAL_ITEM ); $items['knurl/show'] = array( 'title' => 'Show URL', 'page callback' => 'knurl_show', 'access callback' => 'user_access', - 'access arguments' => array('access knurl'), + 'access arguments' => array('show knurl'), 'type' => MENU_CALLBACK ); $items['knurl/remove'] = array(