|
|
@@ -9,30 +9,27 @@
|
|
|
/**
|
|
|
* Implementation of hook_menu().
|
|
|
*/
|
|
|
-function simplemenu_menu($may_cache) {
|
|
|
+function simplemenu_menu() {
|
|
|
$items = array();
|
|
|
|
|
|
- if ($may_cache) {
|
|
|
- $items[] = array(
|
|
|
- 'path' => 'admin/settings/simplemenu',
|
|
|
- 'title' => t('SimpleMenu'),
|
|
|
- 'description' => t('Select the menu to display.'),
|
|
|
- 'callback' => 'drupal_get_form',
|
|
|
- 'callback arguments' => array('simplemenu_admin_settings'),
|
|
|
- 'access' => user_access('administer simplemenu')
|
|
|
+ $items['admin/settings/simplemenu'] = array(
|
|
|
+ 'title' => 'SimpleMenu',
|
|
|
+ 'description' => 'Select the menu to display.',
|
|
|
+ 'page callback' => 'drupal_get_form',
|
|
|
+ 'page arguments' => array('simplemenu_admin_settings'),
|
|
|
+ 'access arguments' => array('administer simplemenu')
|
|
|
);
|
|
|
- }
|
|
|
|
|
|
return $items;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Implementation of hook_footer()
|
|
|
+ * Implementation of hook_init()
|
|
|
*/
|
|
|
-function simplemenu_footer() {
|
|
|
+function simplemenu_init() {
|
|
|
global $theme;
|
|
|
$exclusions = variable_get('simplemenu_exclusions', array());
|
|
|
- if (user_access('view simplemenu') && !$exclusions[$theme]) {
|
|
|
+ if (user_access('view simplemenu') && (!isset($exclusions[$theme])) ) {
|
|
|
global $theme, $custom_theme;
|
|
|
$path = drupal_get_path('module', 'simplemenu');
|
|
|
$simplemenu_theme = variable_get('simplemenu_theme', 'original');
|
|
|
@@ -43,9 +40,6 @@ function simplemenu_footer() {
|
|
|
}
|
|
|
|
|
|
$settings = array(
|
|
|
- // pass in base path to the JS file
|
|
|
- // url() handles appending ?q= but in this case, we need to pass in the variable so the menus work when mod_rewrite is off
|
|
|
- 'basePath' => base_path() . (variable_get('clean_url', 0) ? '' : '?q='),
|
|
|
'effect' => variable_get('simplemenu_effect', 'opacity'),
|
|
|
'effectSpeed' => variable_get('simplemenu_effect_speed', 'fast'),
|
|
|
'element' => variable_get('simplemenu_element', 'body'),
|
|
|
@@ -56,6 +50,7 @@ function simplemenu_footer() {
|
|
|
drupal_add_js(array('simplemenu' => $settings), 'setting');
|
|
|
drupal_add_js('var simplemenu = '. drupal_to_js(simplemenu_get_menu()) .';', 'inline');
|
|
|
drupal_add_js($path .'/simplemenu.js');
|
|
|
+ drupal_add_js($path .'/superfish.js');
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -74,21 +69,12 @@ function simplemenu_admin_settings() {
|
|
|
$form['default_menu']['simplemenu_menu'] = array(
|
|
|
'#type' => 'select',
|
|
|
'#title' => t('Menu'),
|
|
|
- '#options' => menu_parent_options(0),
|
|
|
- '#default_value' => variable_get('simplemenu_menu', 1),
|
|
|
+ '#options' => menu_parent_options(menu_get_menus(), array( 'mlid' => 0 )), // return complete tree;
|
|
|
+ '#default_value' => variable_get('simplemenu_menu', 'navigation:0'),
|
|
|
'#description' => t('Select the menu to display.')
|
|
|
);
|
|
|
}
|
|
|
|
|
|
- if (module_exists('devel')) {
|
|
|
- $form['default_menu']['simplemenu_devel'] = array(
|
|
|
- '#type' => 'checkbox',
|
|
|
- '#title' => t('Add devel module links'),
|
|
|
- '#default_value' => variable_get('simplemenu_devel', 0),
|
|
|
- '#description' => t('Add devel module links for those users that can access the devel module.')
|
|
|
- );
|
|
|
- }
|
|
|
-
|
|
|
$form['default_menu']['simplemenu_theme'] = array(
|
|
|
'#type' => 'select',
|
|
|
'#title' => t('Theme'),
|
|
|
@@ -164,18 +150,13 @@ function simplemenu_get_menu() {
|
|
|
|
|
|
// if a user turned off menu module but SimpleMenu was previously set
|
|
|
// reset variable so a menu appears
|
|
|
- if (module_exists('menu')) {
|
|
|
- $menu = simplemenu_menu_tree(variable_get('simplemenu_menu', 1));
|
|
|
- }
|
|
|
- else {
|
|
|
- $menu = simplemenu_menu_tree(1);
|
|
|
- }
|
|
|
+ $menu_name = module_exists('menu') ? variable_get('simplemenu_menu', 'navigation:0') : 'navigation:0';
|
|
|
+ $menu = simplemenu_menu_tree($menu_name);
|
|
|
|
|
|
if (!$menu) {
|
|
|
$menu = '<li><a href="'. url('admin/settings/simplemenu') .'">'. t('No menu items found. Try a different menu as the default.') .'</a></li>';
|
|
|
}
|
|
|
|
|
|
- $output .= simplemenu_get_devel();
|
|
|
$output .= $menu;
|
|
|
|
|
|
return $output;
|
|
|
@@ -186,58 +167,74 @@ function simplemenu_get_menu() {
|
|
|
* We want to retrieve the entire menu structure for a given menu,
|
|
|
* regardless of whether or not the menu item is expanded or not.
|
|
|
*/
|
|
|
-function simplemenu_menu_tree($pid = 1) {
|
|
|
- $menu = menu_get_menu();
|
|
|
- $output = '';
|
|
|
-
|
|
|
- if (isset($menu['visible'][$pid]) && $menu['visible'][$pid]['children']) {
|
|
|
- foreach ($menu['visible'][$pid]['children'] as $mid) {
|
|
|
- $type = isset($menu['visible'][$mid]['type']) ? $menu['visible'][$mid]['type'] : NULL;
|
|
|
- $children = isset($menu['visible'][$mid]['children']) ? $menu['visible'][$mid]['children'] : NULL;
|
|
|
- $output .= theme('menu_item', $mid, simplemenu_theme_menu_tree($mid), count($children) == 0);
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
- return $output;
|
|
|
-}
|
|
|
+function simplemenu_menu_tree($menu_name = 'navigation:0') {
|
|
|
+ static $menu_output = array();
|
|
|
|
|
|
-/**
|
|
|
- * Custom implementation of theme_menu_tree() to call our custom menu above.
|
|
|
- */
|
|
|
-function simplemenu_theme_menu_tree($pid = 1) {
|
|
|
- if ($tree = simplemenu_menu_tree($pid)) {
|
|
|
- return '<ul>'. $tree .'</ul>';
|
|
|
+ if (!isset($menu_output[$menu_name])) {
|
|
|
+ $tree = simplemenu_tree_all_data($menu_name);
|
|
|
+ $menu_output[$menu_name] = menu_tree_output($tree);
|
|
|
}
|
|
|
+ return $menu_output[$menu_name];
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Return a list of devel module links if the module is enabled
|
|
|
- * and the user has access to this module.
|
|
|
+ * Modified menu_tree_all_data(), providing the complete menu tree below $root_menu
|
|
|
+ * (which can be *any* menu item, not just the root of a custom menu).
|
|
|
+ *
|
|
|
+ * @param $root_menu
|
|
|
+ * root menu item of the tree to return as "menu_name:mlid" (mlid = menu link id)
|
|
|
+ *
|
|
|
+ * @todo we don't actually need $menu_name, $mlid would be sufficient
|
|
|
*/
|
|
|
-function simplemenu_get_devel() {
|
|
|
- $output = '';
|
|
|
+function simplemenu_tree_all_data($root_menu = 'navigation:0') {
|
|
|
+ static $tree = array();
|
|
|
+
|
|
|
+ list($menu_name, $mlid) = explode(':', $root_menu);
|
|
|
|
|
|
- if (variable_get('simplemenu_devel', 0) && module_exists('devel')) {
|
|
|
- if (user_access('access devel information')) {
|
|
|
- $links[] = l('Devel settings', 'admin/settings/devel', array('title' => t('Adjust module settings for devel module')));
|
|
|
- $links[] = l('Empty cache', 'devel/cache/clear', array('title' => t('Clear the database cache tables which store page, menu, node, and variable caches.')), drupal_get_destination());
|
|
|
- $links[] = l('Phpinfo()', 'admin/logs/status/php');
|
|
|
- $links[] = l('Function reference', 'devel/reference', array('title' => t('View a list of currently defined user functions with documentation links')));
|
|
|
- $links[] = l('Reinstall modules', 'devel/reinstall', array('title' => t('Re-run hook_install() for a given module')));
|
|
|
- $links[] = l('Reset menus', 'devel/menu/reset', array('title' => t('Resets all menu items to their default settings')));
|
|
|
- $links[] = l('Variable editor', 'devel/variable', array('title' => t('Edit and delete site variables')));
|
|
|
- $links[] = l('Session viewer', 'devel/session', array('title' => t('List the contents of $_SESSION')));
|
|
|
-
|
|
|
- if (function_exists('devel_node_access_perm') && user_access(DNA_ACCESS_VIEW)) {
|
|
|
- // True only if devel_node_access enabled.
|
|
|
- $links[] = l('Node access summary', 'devel/node_access/summary');
|
|
|
- }
|
|
|
+ // Generate the cache ID.
|
|
|
+ // "links:navigation:all:2" means "all from root to 2" (what the ...), so for "all from 2 down" we do "links:navigation:all:2:all"
|
|
|
+ $cid = "links:$menu_name:all:$mlid". ($mlid ? ':all' : '');
|
|
|
|
|
|
- $output = '<li class="expanded"><a href="'. url('admin/settings/devel') .'">'. t('Devel module') .'</a><ul>';
|
|
|
- $output .= '<li class="leaf">'. implode($links, '</li><li class="leaf">') .'</li>';
|
|
|
- $output .= '</ul></li>';
|
|
|
+ if (!isset($tree[$cid])) {
|
|
|
+ // If the static variable doesn't have the data, check {cache_menu}.
|
|
|
+ $cache = cache_get($cid, 'cache_menu');
|
|
|
+ if ($cache && isset($cache->data)) {
|
|
|
+ $data = $cache->data;
|
|
|
}
|
|
|
+ else {
|
|
|
+ // Build and run the query, and build the tree.
|
|
|
+ if ($mlid > 0) {
|
|
|
+ $item = menu_link_load($mlid);
|
|
|
+ // The tree is a subtree of $menu_name, so we need to restrict the query to
|
|
|
+ // this subtree.
|
|
|
+ $px = "p$item[depth]";
|
|
|
+ $where = " AND ml.$px = %d AND ml.mlid != %d";
|
|
|
+ $args = array($item[$px], $mlid);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ // Get all links in this menu.
|
|
|
+ $where = '';
|
|
|
+ $args = array();
|
|
|
+ }
|
|
|
+ array_unshift($args, $menu_name);
|
|
|
+ // 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.
|
|
|
+ $data['tree'] = menu_tree_data(db_query("
|
|
|
+ SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.type, m.description, ml.*
|
|
|
+ FROM {menu_links} ml LEFT JOIN {menu_router} m ON m.path = ml.router_path
|
|
|
+ WHERE ml.menu_name = '%s'". $where ."
|
|
|
+ ORDER BY p1 ASC, p2 ASC, p3 ASC, p4 ASC, p5 ASC, p6 ASC, p7 ASC, p8 ASC, p9 ASC", $args));
|
|
|
+ $data['node_links'] = array();
|
|
|
+ menu_tree_collect_node_links($data['tree'], $data['node_links']);
|
|
|
+ // Cache the data.
|
|
|
+ cache_set($cid, $data, 'cache_menu');
|
|
|
+ }
|
|
|
+ // Check access for the current user to each item in the tree.
|
|
|
+ menu_tree_check_access($data['tree'], $data['node_links']);
|
|
|
+ $tree[$cid] = $data['tree'];
|
|
|
}
|
|
|
|
|
|
- return $output;
|
|
|
+ return $tree[$cid];
|
|
|
}
|
Ted Serbinski