Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#156782 by webernet and pwolanin: clean up menu API and menu module code comments, fix typos, wrap lines properly and fix some coding style issues

6.x
Gábor Hojtsy 2007-07-04 21:33:55 +00:00
parent 0c0a340f29
commit 07a8d9bcb3
2 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
includes/menu.inc
View File

@ -67,7 +67,7 @@
* *
* Everything described so far is stored in the menu_router table. The * Everything described so far is stored in the menu_router table. The
* menu_links table holds the visible menu links. By default these are * menu_links table holds the visible menu links. By default these are
* derived from the same hook_menu definitons, however you are free to * derived from the same hook_menu definitions, however you are free to
* add more with menu_link_save(). * add more with menu_link_save().
*/ */
@ -357,8 +357,8 @@ function _menu_load_objects($item, &$map) {
* $item['access'] becomes TRUE if the item is accessible, FALSE otherwise. * $item['access'] becomes TRUE if the item is accessible, FALSE otherwise.
*/ */
function _menu_check_access(&$item, $map) { function _menu_check_access(&$item, $map) {
// Determine access callback, which will decide whether or not the current user has // Determine access callback, which will decide whether or not the current
// access to this path. // user has access to this path.
$callback = trim($item['access_callback']); $callback = trim($item['access_callback']);
// Check for a TRUE or FALSE value. // Check for a TRUE or FALSE value.
if (is_numeric($callback)) { if (is_numeric($callback)) {
@ -381,9 +381,9 @@ function _menu_check_access(&$item, $map) {
* Localize the item title using t() or another callback. * Localize the item title using t() or another callback.
*/ */
function _menu_item_localize(&$item) { function _menu_item_localize(&$item) {
// Translate the title to allow storage of English title strings // Translate the title to allow storage of English title strings in the
// in the database, yet display of them in the language required // database, yet display of them in the language required by the current
// by the current user. // user.
$callback = $item['title_callback']; $callback = $item['title_callback'];
// t() is a special case. Since it is used very close to all the time, // t() is a special case. Since it is used very close to all the time,
// we handle it directly instead of using indirect, slower methods. // we handle it directly instead of using indirect, slower methods.
@ -516,7 +516,7 @@ function _menu_link_translate(&$item) {
_menu_link_map_translate($map, $item['to_arg_functions']); _menu_link_map_translate($map, $item['to_arg_functions']);
$item['href'] = implode('/', $map); $item['href'] = implode('/', $map);
// Note- skip callbacks without real values for their arguments. // Note - skip callbacks without real values for their arguments.
if (strpos($item['href'], '%') !== FALSE) { if (strpos($item['href'], '%') !== FALSE) {
$item['access'] = FALSE; $item['access'] = FALSE;
return FALSE; return FALSE;
@ -639,10 +639,10 @@ function menu_tree_all_data($menu_name = 'navigation', $item = NULL, $show_hidde
} }
array_unshift($args, $menu_name); array_unshift($args, $menu_name);
// Select the links from the table, and recursively build the tree. We // Select the links from the table, and recursively build the tree. We
// LEFT JOIN since there is no match in {menu_router} for an external link. // LEFT JOIN since there is no match in {menu_router} for an external
// We need to select links that are visible or hidden (ml.hidden >= 0), but // link. We need to select links that are visible or hidden
// not callbacks (ml.hidden < 0), so that we can later exclude all the // (ml.hidden >= 0), but not callbacks (ml.hidden < 0), so that we can
// children of a hidden item. // later exclude all the children of a hidden item.
// No need to order by p6 - there is a sort by weight later. // No need to order by p6 - there is a sort by weight later.
$tree[$cid] = menu_tree_data(db_query(" $tree[$cid] = menu_tree_data(db_query("
SELECT m.*, ml.menu_name, ml.mlid, ml.plid, ml.link_path, ml.router_path, ml.hidden, ml.external, ml.has_children, ml.expanded, ml.weight + 50000 AS weight, ml.depth, ml.p1, ml.p2, ml.p3, ml.p4, ml.p5, ml.p6, ml.module, ml.link_title, ml.options SELECT m.*, ml.menu_name, ml.mlid, ml.plid, ml.link_path, ml.router_path, ml.hidden, ml.external, ml.has_children, ml.expanded, ml.weight + 50000 AS weight, ml.depth, ml.p1, ml.p2, ml.p3, ml.p4, ml.p5, ml.p6, ml.module, ml.link_title, ml.options
@ -661,7 +661,7 @@ function menu_tree_all_data($menu_name = 'navigation', $item = NULL, $show_hidde
/** /**
* Get the data structure representing a named menu tree, based on the current * Get the data structure representing a named menu tree, based on the current
* page. The tree order is maintained by storing each parent in an invidual * page. The tree order is maintained by storing each parent in an individual
* field, see http://drupal.org/node/141866 for more. * field, see http://drupal.org/node/141866 for more.
* *
* @param $menu_name * @param $menu_name
@ -670,8 +670,8 @@ function menu_tree_all_data($menu_name = 'navigation', $item = NULL, $show_hidde
* An array of menu links, in the order they should be rendered. The array * An array of menu links, in the order they should be rendered. The array
* is a list of associative arrays -- these have two keys, link and below. * is a list of associative arrays -- these have two keys, link and below.
* link is a menu item, ready for theming as a link. Below represents the * link is a menu item, ready for theming as a link. Below represents the
* submenu below the link if there is one and it is a similar list that was * submenu below the link if there is one, and it is a subtree that has the
* described so far. * same structure described for the top-level array.
*/ */
function menu_tree_page_data($menu_name = 'navigation') { function menu_tree_page_data($menu_name = 'navigation') {
static $tree = array(); static $tree = array();
@ -695,7 +695,7 @@ function menu_tree_page_data($menu_name = 'navigation') {
if (empty($parents)) { if (empty($parents)) {
// If no link exists, we may be on a local task that's not in the links. // If no link exists, we may be on a local task that's not in the links.
// TODO: handle the case like a local task on a specific node in the menu. // TODO: Handle the case like a local task on a specific node in the menu.
$parents = db_fetch_array(db_query("SELECT p1, p2, p3, p4, p5, p6 FROM {menu_links} WHERE menu_name = '%s' AND link_path = '%s'", $menu_name, $item['tab_root'])); $parents = db_fetch_array(db_query("SELECT p1, p2, p3, p4, p5, p6 FROM {menu_links} WHERE menu_name = '%s' AND link_path = '%s'", $menu_name, $item['tab_root']));
} }
// We always want all the top-level links with plid == 0. // We always want all the top-level links with plid == 0.
@ -706,8 +706,8 @@ function menu_tree_page_data($menu_name = 'navigation') {
$expanded = variable_get('menu_expanded', array()); $expanded = variable_get('menu_expanded', array());
// Check whether the current menu has any links set to be expanded. // Check whether the current menu has any links set to be expanded.
if (in_array($menu_name, $expanded)) { if (in_array($menu_name, $expanded)) {
// Collect all the links set to be expanded, and then add all their // Collect all the links set to be expanded, and then add all of
// children to the list also. // their children to the list as well.
do { do {
$result = db_query("SELECT mlid FROM {menu_links} WHERE expanded != 0 AND has_children != 0 AND menu_name = '%s' AND plid IN (". $placeholders .') AND mlid NOT IN ('. $placeholders .')', array_merge(array($menu_name), $args, $args)); $result = db_query("SELECT mlid FROM {menu_links} WHERE expanded != 0 AND has_children != 0 AND menu_name = '%s' AND plid IN (". $placeholders .') AND mlid NOT IN ('. $placeholders .')', array_merge(array($menu_name), $args, $args));
while ($item = db_fetch_array($result)) { while ($item = db_fetch_array($result)) {
@ -724,11 +724,11 @@ function menu_tree_page_data($menu_name = 'navigation') {
$placeholders = '%d'; $placeholders = '%d';
$parents = array(); $parents = array();
} }
// Select the links from the table, and recursively build the tree. We // Select the links from the table, and recursively build the tree. We
// LEFT JOIN since there is no match in {menu_router} for an external link. // LEFT JOIN since there is no match in {menu_router} for an external
// We need to select links that are visible or hidden (ml.hidden >= 0), but // link. We need to select links that are visible or hidden
// not callbacks (ml.hidden < 0), so that we can later exclude all the // (ml.hidden >= 0), but not callbacks (ml.hidden < 0), so that we can
// children of a hidden item. // later exclude all the children of a hidden item.
// No need to order by p6 - there is a sort by weight later. // No need to order by p6 - there is a sort by weight later.
$tree[$cid] = menu_tree_data(db_query(" $tree[$cid] = menu_tree_data(db_query("
SELECT m.*, ml.menu_name, ml.mlid, ml.plid, ml.link_path, ml.router_path, ml.hidden, ml.external, ml.has_children, ml.expanded, ml.weight + 50000 AS weight, ml.depth, ml.p1, ml.p2, ml.p3, ml.p4, ml.p5, ml.p6, ml.module, ml.link_title, ml.options SELECT m.*, ml.menu_name, ml.mlid, ml.plid, ml.link_path, ml.router_path, ml.hidden, ml.external, ml.has_children, ml.expanded, ml.weight + 50000 AS weight, ml.depth, ml.p1, ml.p2, ml.p3, ml.p4, ml.p5, ml.p6, ml.module, ml.link_title, ml.options
@ -751,9 +751,9 @@ function menu_tree_page_data($menu_name = 'navigation') {
* Check access and perform other dynamic operations for each link in the tree. * Check access and perform other dynamic operations for each link in the tree.
*/ */
function menu_tree_check_access(&$tree, $show_hidden = FALSE) { function menu_tree_check_access(&$tree, $show_hidden = FALSE) {
// TODO: special case node links and access check via db_rewite_sql(). // TODO: Special case node links and access check via db_rewite_sql().
// TODO: move sorting of siblings in the tree here so that we can sort based on // TODO: Move sorting of siblings in the tree here so that we can sort based
// the localized title of each link. Currently the dorting is done in // on the localized title of each link. Currently the dorting is done in
// function _menu_tree_data(). // function _menu_tree_data().
_menu_tree_check_access($tree, $show_hidden); _menu_tree_check_access($tree, $show_hidden);
} }
@ -831,9 +831,10 @@ function _menu_tree_data($result, $parents, $depth, $previous_element = '') {
// This will be the link to be output in the next iteration. // This will be the link to be output in the next iteration.
$previous_element = $item; $previous_element = $item;
} }
// We are in the same menu. We render the previous element, $previous_element. // We are at the same depth, so we use the previous element.
elseif ($item['depth'] == $depth) { elseif ($item['depth'] == $depth) {
if ($previous_element) { // Only the first time if ($previous_element) {
// Only the first time.
$tree[$index] = array( $tree[$index] = array(
'link' => $previous_element, 'link' => $previous_element,
'below' => '', 'below' => '',
@ -849,7 +850,7 @@ function _menu_tree_data($result, $parents, $depth, $previous_element = '') {
} }
} }
if ($previous_element) { if ($previous_element) {
// We have one more link dangling // We have one more link dangling.
$tree[$previous_element['weight'] .' '. drupal_strtolower($previous_element['link_title']) .' '. $previous_element['mlid']] = array( $tree[$previous_element['weight'] .' '. drupal_strtolower($previous_element['link_title']) .' '. $previous_element['mlid']] = array(
'link' => $previous_element, 'link' => $previous_element,
'below' => '', 'below' => '',
@ -915,7 +916,8 @@ function menu_get_active_help() {
if ($help = module_invoke($name, 'help', $router_path, $arg)) { if ($help = module_invoke($name, 'help', $router_path, $arg)) {
$output .= $help ."\n"; $output .= $help ."\n";
} }
// Add "more help" link on admin pages if the module provides a standalone help page. // Add "more help" link on admin pages if the module provides a
// standalone help page.
if (module_hook('help', 'page') && $arg[0] == "admin" && module_invoke($name, 'help', 'admin/help#'. $arg[2], $empty_arg) && $help) { if (module_hook('help', 'page') && $arg[0] == "admin" && module_invoke($name, 'help', 'admin/help#'. $arg[2], $empty_arg) && $help) {
$output .= theme("more_help_link", url('admin/help/'. $arg[2])); $output .= theme("more_help_link", url('admin/help/'. $arg[2]));
} }
@ -1001,7 +1003,7 @@ function menu_local_tasks($level = 0, $return_root = FALSE) {
while ($item = db_fetch_array($result)) { while ($item = db_fetch_array($result)) {
_menu_translate($item, $map, TRUE); _menu_translate($item, $map, TRUE);
if ($item['tab_parent']) { if ($item['tab_parent']) {
// All tabs, but not the root page // All tabs, but not the root page.
$children[$item['tab_parent']][$item['path']] = $item; $children[$item['tab_parent']][$item['path']] = $item;
} }
// Store the translated item for later use. // Store the translated item for later use.
@ -1157,7 +1159,7 @@ function menu_set_active_item() {
} }
/** /**
* Set (or get) the active trail for the current page - the path to root in the menu tree.. * Set (or get) the active trail for the current page - the path to root in the menu tree.
*/ */
function menu_set_active_trail($new_trail = NULL) { function menu_set_active_trail($new_trail = NULL) {
static $trail; static $trail;
@ -1197,7 +1199,7 @@ function menu_set_active_trail($new_trail = NULL) {
} }
/** /**
* Get the active trail for the current page - the path to root in the menu tree.. * Get the active trail for the current page - the path to root in the menu tree.
*/ */
function menu_get_active_trail() { function menu_get_active_trail() {
return menu_set_active_trail(); return menu_set_active_trail();
@ -1297,10 +1299,11 @@ function menu_router_build($reset = FALSE) {
} }
else { else {
db_query('DELETE FROM {menu_router}'); db_query('DELETE FROM {menu_router}');
// We need to manually call each module so that we can know which module a given item came from. // We need to manually call each module so that we can know which module
// a given item came from.
$callbacks = array(); $callbacks = array();
foreach (module_implements('menu') as $module) { foreach (module_implements('menu') as $module) {
$router_items = call_user_func($module . '_menu'); $router_items = call_user_func($module .'_menu');
if (isset($router_items) && is_array($router_items)) { if (isset($router_items) && is_array($router_items)) {
foreach (array_keys($router_items) as $path) { foreach (array_keys($router_items) as $path) {
$router_items[$path]['module'] = $module; $router_items[$path]['module'] = $module;
@ -1399,7 +1402,7 @@ function _menu_delete_item($item) {
// System-created items get automatically deleted, but only on menu rebuild. // System-created items get automatically deleted, but only on menu rebuild.
if ($item && $item['module'] != 'system') { if ($item && $item['module'] != 'system') {
// Children get re-attached to the item's parent // Children get re-attached to the item's parent.
if ($item['has_children']) { if ($item['has_children']) {
$result = db_query("SELECT mlid FROM {menu_links} WHERE plid = %d", $item['mlid']); $result = db_query("SELECT mlid FROM {menu_links} WHERE plid = %d", $item['mlid']);
while ($m = db_fetch_array($result)) { while ($m = db_fetch_array($result)) {
@ -1411,7 +1414,7 @@ function _menu_delete_item($item) {
db_query('DELETE FROM {menu_links} WHERE mlid = %d', $item['mlid']); db_query('DELETE FROM {menu_links} WHERE mlid = %d', $item['mlid']);
// Update the has_children status of the parent // Update the has_children status of the parent.
$children = (bool)db_result(db_query("SELECT COUNT(*) FROM {menu_links} WHERE plid = %d AND hidden = 0", $item['plid'])); $children = (bool)db_result(db_query("SELECT COUNT(*) FROM {menu_links} WHERE plid = %d AND hidden = 0", $item['plid']));
db_query("UPDATE {menu_links} SET has_children = %d WHERE mlid = %d", $children, $item['plid']); db_query("UPDATE {menu_links} SET has_children = %d WHERE mlid = %d", $children, $item['plid']);
@ -1441,7 +1444,7 @@ function menu_link_save(&$item) {
// This is the easiest way to handle the unique internal path '<front>', // This is the easiest way to handle the unique internal path '<front>',
// since a path marked as external does not need to match a router path. // since a path marked as external does not need to match a router path.
$item['_external'] = menu_path_is_external($item['link_path']) || $item['link_path'] == '<front>'; $item['_external'] = menu_path_is_external($item['link_path']) || $item['link_path'] == '<front>';
// Load defaults // Load defaults.
$item += array( $item += array(
'menu_name' => 'navigation', 'menu_name' => 'navigation',
'weight' => 0, 'weight' => 0,
@ -1502,7 +1505,7 @@ function menu_link_save(&$item) {
$item['depth'] = 1; $item['depth'] = 1;
} }
else { else {
// Cannot add beyond the maximum depth // Cannot add beyond the maximum depth.
if ($item['has_children'] && $existing_item) { if ($item['has_children'] && $existing_item) {
$limit = MENU_MAX_DEPTH - menu_link_children_relative_depth($existing_item) - 1; $limit = MENU_MAX_DEPTH - menu_link_children_relative_depth($existing_item) - 1;
} }
@ -1745,10 +1748,11 @@ function _menu_router_build($callbacks) {
foreach ($menu as $path => $v) { foreach ($menu as $path => $v) {
$item = &$menu[$path]; $item = &$menu[$path];
if (!isset($item['access callback']) && isset($item['access arguments'])) { if (!isset($item['access callback']) && isset($item['access arguments'])) {
$item['access callback'] = 'user_access'; // Default callback. // Default callback.
$item['access callback'] = 'user_access';
} }
if (!$item['_tab']) { if (!$item['_tab']) {
// Non-tab items // Non-tab items.
$item['tab_parent'] = ''; $item['tab_parent'] = '';
$item['tab_root'] = $path; $item['tab_root'] = $path;
} }
@ -1759,7 +1763,7 @@ function _menu_router_build($callbacks) {
$parent = $menu[$parent_path]; $parent = $menu[$parent_path];
if (!isset($item['tab_parent'])) { if (!isset($item['tab_parent'])) {
// parent stores the parent of the path. // Parent stores the parent of the path.
$item['tab_parent'] = $parent_path; $item['tab_parent'] = $parent_path;
} }
if (!isset($item['tab_root']) && !$parent['_tab']) { if (!isset($item['tab_root']) && !$parent['_tab']) {
@ -1816,7 +1820,7 @@ function _menu_router_build($callbacks) {
// Calculate out the file to be included for each callback, if any. // Calculate out the file to be included for each callback, if any.
if ($item['file']) { if ($item['file']) {
$file_path = $item['file path'] ? $item['file path'] : drupal_get_path('module', $item['module']); $file_path = $item['file path'] ? $item['file path'] : drupal_get_path('module', $item['module']);
$item['include file'] = $file_path . '/' . $item['file']; $item['include file'] = $file_path .'/'. $item['file'];
} }
db_query("INSERT INTO {menu_router} db_query("INSERT INTO {menu_router}
@ -1863,7 +1867,8 @@ function _menu_site_is_offline() {
else { else {
$offline_message = t('Operating in off-line mode.'); $offline_message = t('Operating in off-line mode.');
$messages = drupal_set_message(); $messages = drupal_set_message();
// Ensure that the off-line message is displayed only once [allowing for page redirects]. // Ensure that the off-line message is displayed only once [allowing for
// page redirects].
if (!isset($messages) || !isset($messages['status']) || !in_array($offline_message, $messages['status'])) { if (!isset($messages) || !isset($messages['status']) || !in_array($offline_message, $messages['status'])) {
drupal_set_message($offline_message); drupal_set_message($offline_message);
} }

8
modules/menu/menu.module
View File

@ -389,7 +389,7 @@ function menu_edit_menu(&$form_state, $type, $menu = array()) {
$form['menu_name'] = array( $form['menu_name'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Menu name'), '#title' => t('Menu name'),
'#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the <em>menu overview</em> page for this menu. This name may consist of only of lowercase letters, numbers and hypens and must be unique.'), '#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the <em>menu overview</em> page for this menu. This name may consist of only of lowercase letters, numbers, and hyphens, and must be unique.'),
'#required' => TRUE, '#required' => TRUE,
); );
$form['#insert'] = TRUE; $form['#insert'] = TRUE;
@ -420,7 +420,7 @@ function menu_edit_menu(&$form_state, $type, $menu = array()) {
function menu_edit_menu_validate($form, &$form_state) { function menu_edit_menu_validate($form, &$form_state) {
$item = $form_state['values']; $item = $form_state['values'];
if (preg_match('/[^a-z0-9-]/', $item['menu_name'])) { if (preg_match('/[^a-z0-9-]/', $item['menu_name'])) {
form_set_error('menu_name', t('Menu name may consist only of lowercase letters, numbers and hypens.')); form_set_error('menu_name', t('Menu name may consist only of lowercase letters, numbers, and hyphens.'));
} }
if ($form['#insert'] && if ($form['#insert'] &&
(db_result(db_query("SELECT menu_name FROM {menu_custom} WHERE menu_name = '%s'", $item['menu_name'])) || (db_result(db_query("SELECT menu_name FROM {menu_custom} WHERE menu_name = '%s'", $item['menu_name'])) ||
@ -592,7 +592,7 @@ function menu_form_alter(&$form, $form_state, $form_id) {
$item = $form['#node']->menu; $item = $form['#node']->menu;
if ($item['mlid']) { if ($item['mlid']) {
// There is an existing link // There is an existing link.
$form['menu']['delete'] = array( $form['menu']['delete'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Check to remove this item from the menu.'), '#title' => t('Check to remove this item from the menu.'),
@ -640,7 +640,7 @@ function menu_form_alter(&$form, $form_state, $form_id) {
* titles as the values. * titles as the values.
*/ */
function menu_get_menus($all = FALSE) { function menu_get_menus($all = FALSE) {
$sql = 'SELECT * FROM {menu_custom}'. ($all ? '' : " WHERE menu_name NOT IN ('navigation', 'primary-links', 'secondary-links')") . ' ORDER BY title'; $sql = 'SELECT * FROM {menu_custom}'. ($all ? '' : " WHERE menu_name NOT IN ('navigation', 'primary-links', 'secondary-links')") .' ORDER BY title';
$result = db_query($sql); $result = db_query($sql);
$rows = array(); $rows = array();