Index: vocabindex.module =================================================================== --- vocabindex.module (revision 74) +++ vocabindex.module (working copy) @@ -45,15 +45,15 @@ * A VI page. */ define('VOCABINDEX_VI_PAGE', 2); - -/** - * Implementation of hook_perm(). - */ -function vocabindex_perm() { + +/** + * Implementation of hook_perm(). + */ +function vocabindex_perm() { return array( 'administer vocabulary index', 'view vocabulary index pages', - ); + ); } /** @@ -64,74 +64,74 @@ $path = base_path() . 'update.php'; drupal_set_message(t("Please proceed to !update.php to update your database to Vocabulary Index 2.", array('!update.php' => 'update.php')), 'error'); } -} - -/** - * Implementation of hook_menu(). - */ +} + +/** + * Implementation of hook_menu(). + */ function vocabindex_menu() { if (vocabindex_update_status() == FALSE) { return array(); } - $items[_vocabindex_menu_paths('admin_main')] = array( + $items[_vocabindex_menu_paths('admin_main')] = array( 'title' => 'Vocabulary Index', - 'description' => 'Create index pages for vocabularies.', - 'access arguments' => array('administer vocabulary index'), + 'description' => 'Create index pages for vocabularies.', + 'access arguments' => array('administer vocabulary index'), 'page callback' => 'vocabindex_admin_vi', 'page arguments' => array((string) VOCABINDEX_VI_PAGE), - 'file' => 'vocabindex.admin.inc', - ); + 'file' => 'vocabindex.admin.inc', + ); $items[_vocabindex_menu_paths('admin_pages')] = array( - 'title' => 'Pages', + 'title' => 'Pages', 'access arguments' => array('administer vocabulary index'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'file' => 'vocabindex.admin.inc', 'weight' => 0, - ); + ); $items[_vocabindex_menu_paths('admin_blocks')] = array( 'title' => 'Blocks', - 'description' => 'Create index blocks for vocabularies.', - 'access arguments' => array('administer vocabulary index'), + 'description' => 'Create index blocks for vocabularies.', + 'access arguments' => array('administer vocabulary index'), 'page callback' => 'vocabindex_admin_vi', 'page arguments' => array((string) VOCABINDEX_VI_BLOCK), 'type' => MENU_LOCAL_TASK, 'file' => 'vocabindex.admin.inc', 'weight' => 1, - ); + ); - $items[_vocabindex_menu_paths('admin_settings')] = array( + $items[_vocabindex_menu_paths('admin_settings')] = array( 'title' => 'Settings', - 'description' => 'General settings.', + 'description' => 'General settings.', 'access arguments' => array('administer vocabulary index'), - 'page callback' => 'drupal_get_form', + 'page callback' => 'drupal_get_form', 'page arguments' => array('vocabindex_admin'), 'type' => MENU_LOCAL_TASK, 'file' => 'vocabindex.admin.inc', - 'weight' => 2, + 'weight' => 2, ); // VI pages. - $vis = vocabindex_vi_load(VOCABINDEX_VI_PAGE); + $vis = vocabindex_vi_load(VOCABINDEX_VI_PAGE); foreach ($vis as $vi) { $item = vocabindex_menu_base() + array( 'title' => $vi->name, 'description' => check_plain($vi->description), // We need to cast out the constant to a string, because the integer will - // otherwise be replaced with the corresponding part of the menu path. - 'page arguments' => array($vi->vid, (string) VOCABINDEX_VOC), + // otherwise be replaced with the corresponding part of the menu path. + 'page arguments' => array($vi->vid, (string) VOCABINDEX_VOC), ); // The menu item for alphabetical VIs using the letter wildcard. if ($vi->view == VOCABINDEX_VIEW_ALPHABETICAL) { $arg = (int) substr_count($vi->path, '/') + 1; $path = $vi->path . '/%vocabindex_letter'; $item['page arguments'][2] = $arg; - } - $items[$vi->path] = $item; + } + $items[$vi->path] = $item; } - + return $items; } @@ -142,7 +142,7 @@ * index pages. */ function vocabindex_menu_alter(&$items) { - $vis = vocabindex_vi_load(VOCABINDEX_VI_PAGE); + $vis = vocabindex_vi_load(VOCABINDEX_VI_PAGE); foreach ($vis as $vi) { if ($vi->view == VOCABINDEX_VIEW_FLAT) { $tree = taxonomy_get_tree($vi->vid); @@ -157,7 +157,7 @@ // integer will otherwise be replaced with the corresponding part // of the menu path. 'page arguments' => array($term->tid, (string) VOCABINDEX_TERM), - 'file path' => drupal_get_path('module', 'vocabindex'), + 'file path' => drupal_get_path('module', 'vocabindex'), ); } } @@ -369,10 +369,10 @@ */ function vocabindex_menu_base() { return array( - 'access arguments' => array('view vocabulary index pages'), - 'page callback' => 'vocabindex_view_page', + 'access arguments' => array('view vocabulary index pages'), + 'page callback' => 'vocabindex_view_page', 'type' => MENU_CALLBACK, - 'file' => 'vocabindex.view.inc', + 'file' => 'vocabindex.view.inc', ); }