diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/blog.module | 2 | ||||
| -rw-r--r-- | modules/blog/blog.module | 2 | ||||
| -rw-r--r-- | modules/comment.module | 6 | ||||
| -rw-r--r-- | modules/comment/comment.module | 6 | ||||
| -rw-r--r-- | modules/filter.module | 2 | ||||
| -rw-r--r-- | modules/filter/filter.module | 2 | ||||
| -rw-r--r-- | modules/locale.module | 4 | ||||
| -rw-r--r-- | modules/locale/locale.module | 4 | ||||
| -rw-r--r-- | modules/menu.module | 417 | ||||
| -rw-r--r-- | modules/menu/menu.module | 417 | ||||
| -rw-r--r-- | modules/node.module | 4 | ||||
| -rw-r--r-- | modules/node/node.module | 4 | ||||
| -rw-r--r-- | modules/profile.module | 6 | ||||
| -rw-r--r-- | modules/profile/profile.module | 6 | ||||
| -rw-r--r-- | modules/taxonomy.module | 2 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 2 | ||||
| -rw-r--r-- | modules/title.module | 2 | ||||
| -rw-r--r-- | modules/user.module | 10 | ||||
| -rw-r--r-- | modules/user/user.module | 10 | ||||
| -rw-r--r-- | modules/watchdog.module | 10 | ||||
| -rw-r--r-- | modules/watchdog/watchdog.module | 10 |
21 files changed, 881 insertions, 47 deletions
diff --git a/modules/blog.module b/modules/blog.module index bd1c00fe7..796df58ab 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -219,7 +219,7 @@ function blog_link($type, $node = 0, $main) { if ($type == "system") { if (user_access("maintain personal blog")) { menu("node/add/blog", t("blog entry"), "node_page", 0); - menu("blog/". $user->uid, t("my blog"), "blog_page", 1); + menu("blog/". $user->uid, t("my blog"), "blog_page", 1, MENU_SHOW, MENU_LOCKED); } if (user_access("access content")) { menu("blog", t("blogs"), "blog_page", 0, MENU_HIDE); diff --git a/modules/blog/blog.module b/modules/blog/blog.module index bd1c00fe7..796df58ab 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -219,7 +219,7 @@ function blog_link($type, $node = 0, $main) { if ($type == "system") { if (user_access("maintain personal blog")) { menu("node/add/blog", t("blog entry"), "node_page", 0); - menu("blog/". $user->uid, t("my blog"), "blog_page", 1); + menu("blog/". $user->uid, t("my blog"), "blog_page", 1, MENU_SHOW, MENU_LOCKED); } if (user_access("access content")) { menu("blog", t("blogs"), "blog_page", 0, MENU_HIDE); diff --git a/modules/comment.module b/modules/comment.module index 24e2a232b..b99f7a269 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -794,8 +794,8 @@ function comment_link($type, $node = 0, $main = 0) { menu("admin/comment/comments/0", t("new/updated"), "comment_admin", 1); menu("admin/comment/comments/1", t("approval queue"), "comment_admin", 2); menu("admin/comment/help", t("help"), "comment_help_page", 9); - menu("admin/comment/edit", t("edit comment"), "comment_admin", 0, MENU_HIDE); - menu("admin/comment/delete", t("delete comment"), "comment_admin", 0, MENU_HIDE); + menu("admin/comment/edit", t("edit comment"), "comment_admin", 0, MENU_HIDE, MENU_LOCKED); + menu("admin/comment/delete", t("delete comment"), "comment_admin", 0, MENU_HIDE, MENU_LOCKED); if (module_exist('search')) { menu("admin/comment/search", t("search"), "comment_admin", 8); } @@ -809,7 +809,7 @@ function comment_link($type, $node = 0, $main = 0) { menu("admin/comment/moderation/roles", t("initial scores"), "comment_admin", 6); } } - menu("comment", t("comments"), "comment_page", 0, MENU_HIDE); + menu("comment", t("comments"), "comment_page", 0, MENU_HIDE, MENU_LOCKED); } return $links; diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 24e2a232b..b99f7a269 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -794,8 +794,8 @@ function comment_link($type, $node = 0, $main = 0) { menu("admin/comment/comments/0", t("new/updated"), "comment_admin", 1); menu("admin/comment/comments/1", t("approval queue"), "comment_admin", 2); menu("admin/comment/help", t("help"), "comment_help_page", 9); - menu("admin/comment/edit", t("edit comment"), "comment_admin", 0, MENU_HIDE); - menu("admin/comment/delete", t("delete comment"), "comment_admin", 0, MENU_HIDE); + menu("admin/comment/edit", t("edit comment"), "comment_admin", 0, MENU_HIDE, MENU_LOCKED); + menu("admin/comment/delete", t("delete comment"), "comment_admin", 0, MENU_HIDE, MENU_LOCKED); if (module_exist('search')) { menu("admin/comment/search", t("search"), "comment_admin", 8); } @@ -809,7 +809,7 @@ function comment_link($type, $node = 0, $main = 0) { menu("admin/comment/moderation/roles", t("initial scores"), "comment_admin", 6); } } - menu("comment", t("comments"), "comment_page", 0, MENU_HIDE); + menu("comment", t("comments"), "comment_page", 0, MENU_HIDE, MENU_LOCKED); } return $links; diff --git a/modules/filter.module b/modules/filter.module index 3ff107f4d..4fa0547e5 100644 --- a/modules/filter.module +++ b/modules/filter.module @@ -47,7 +47,7 @@ function filter_link($type) { menu("admin/system/filters", t("filters"), "filter_admin", 5); menu("admin/system/filters/order", t("ordering"), "filter_admin", 5); } - menu("filter/tips", t("Compose tips"), "filter_tips_long", 0, MENU_HIDE); + menu("filter/tips", t("compose tips"), "filter_tips_long", 0, MENU_HIDE); } } diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 3ff107f4d..4fa0547e5 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -47,7 +47,7 @@ function filter_link($type) { menu("admin/system/filters", t("filters"), "filter_admin", 5); menu("admin/system/filters/order", t("ordering"), "filter_admin", 5); } - menu("filter/tips", t("Compose tips"), "filter_tips_long", 0, MENU_HIDE); + menu("filter/tips", t("compose tips"), "filter_tips_long", 0, MENU_HIDE); } } diff --git a/modules/locale.module b/modules/locale.module index 907c99834..47706292f 100644 --- a/modules/locale.module +++ b/modules/locale.module @@ -60,8 +60,8 @@ function locale_link($type) { menu("admin/locale", t("localization"), "locale_admin", 5); menu("admin/locale/search", t("search string"), "locale_admin", 8); menu("admin/locale/help", t("help"), "locale_help_page", 9); - menu("admin/locale/edit", t("edit string"), "locale_admin", 0, MENU_HIDE); - menu("admin/locale/delete", t("delete string"), "locale_admin", 0, MENU_HIDE); + menu("admin/locale/edit", t("edit string"), "locale_admin", 0, MENU_HIDE, MENU_LOCKED); + menu("admin/locale/delete", t("delete string"), "locale_admin", 0, MENU_HIDE, MENU_LOCKED); foreach ($languages as $key => $value) { menu("admin/locale/$key", "$value", "locale_admin"); diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 907c99834..47706292f 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -60,8 +60,8 @@ function locale_link($type) { menu("admin/locale", t("localization"), "locale_admin", 5); menu("admin/locale/search", t("search string"), "locale_admin", 8); menu("admin/locale/help", t("help"), "locale_help_page", 9); - menu("admin/locale/edit", t("edit string"), "locale_admin", 0, MENU_HIDE); - menu("admin/locale/delete", t("delete string"), "locale_admin", 0, MENU_HIDE); + menu("admin/locale/edit", t("edit string"), "locale_admin", 0, MENU_HIDE, MENU_LOCKED); + menu("admin/locale/delete", t("delete string"), "locale_admin", 0, MENU_HIDE, MENU_LOCKED); foreach ($languages as $key => $value) { menu("admin/locale/$key", "$value", "locale_admin"); diff --git a/modules/menu.module b/modules/menu.module new file mode 100644 index 000000000..236278950 --- /dev/null +++ b/modules/menu.module @@ -0,0 +1,417 @@ +<?php +// $Id$ + +/** + * Implementation of hook_link(). + */ +function menu_link($type, $node = 0, $main) { + if ($type == 'system' && user_access('administer menu')) { + menu('admin/menu', t('menus'), 'menu_overview', 0, MENU_SHOW); + menu('admin/menu/reset', t('reset all menus'), 'menu_reset', 0, MENU_SHOW); + menu('admin/menu/menu/add', t('add menu'), 'menu_add_menu', 0, MENU_SHOW); + menu('admin/menu/item/add', t('add menu item'), 'menu_edit_item', 0, MENU_SHOW); + menu('admin/menu/item/edit', t('edit menu item'), 'menu_edit_item', 0, MENU_HIDE, MENU_LOCKED); + menu('admin/menu/item/reset', t('reset menu item'), 'menu_reset_item', 0, MENU_HIDE, MENU_LOCKED); + menu('admin/menu/item/disable', t('disable menu item'), 'menu_disable_item', 0, MENU_HIDE, MENU_LOCKED); + menu('admin/menu/item/delete', t('delete menu item'), 'menu_delete_item', 0, MENU_HIDE, MENU_LOCKED); + } +} + +/** + * Implementation of hook_help(). + */ +function menu_help($section) { + switch ($section) { + case 'admin/system/modules#description': + return t('Allows administrators to customize the site navigation menu.'); + case 'admin/menu': + return t('Select an operation from the list to move, change, or delete a menu item. To add a new menu, add a new menu item, or reset all menu items to default values, choose an option from the main menu.'); + case 'admin/menu/menu/add': + return t('Enter the name for your new menu. Remember to enable the newly created block in the %blocks administration page.', array('%blocks' => l(t('blocks'), 'admin/system/block'))); + } +} + +/** + * Implementation of hook_block(). + */ +function menu_block($op = 'list', $delta = 0) { + $menu = menu_get_menu(); + + if ($op == 'list') { + $blocks = array(); + foreach ($menu['items'][0]['children'] as $mid) { + // Default "Navigation" block is handled by user.module. + if ($mid != 1) { + $blocks[$mid]['info'] = $menu['items'][$mid]['title']; + } + } + return $blocks; + } + else { + $data['subject'] = $menu['items'][$delta]['title']; + $data['content'] = menu_tree($delta); + return $data; + } +} + +/** + * Implementation of hook_perm(). + */ +function menu_perm() { + return array('administer menu'); +} + +/** + * Present the main menu management page. + */ +function menu_overview() { + menu_rebuild(); + + print theme('page', menu_overview_tree()); +} + +/** + * Clear the database, resetting the menu to factory defaults. + */ +function menu_reset() { + $op = $_POST['op']; + switch ($op) { + case t('Reset'): + db_query('DELETE FROM {menu}'); + menu_rebuild(); + drupal_set_message(t('all menu items reset.')); + print theme('page', menu_overview_tree()); + break; + case t('Cancel'): + print theme('page', menu_overview_tree()); + break; + default: + $output = '<p>'. t('Are you sure you want to reset all menu items to their default settings? Any custom menu items will be lost.') .'</p>'; + $output .= form(form_submit(t('Reset')) . form_submit(t('Cancel'))); + print theme('page', $output); + } +} + +/** + * Handle the adding of a new menu. + */ +function menu_add_menu() { + $op = $_POST['op']; + $edit = $_POST['edit']; + $output = ''; + + switch ($op) { + case t('Submit'): + menu_edit_item_save($edit); + $output .= menu_overview_tree(); + break; + default: + $edit['pid'] = 0; + $edit['status'] = MENU_CUSTOM; + $output .= menu_edit_item_form($edit); + } + + print theme('page', $output); +} + +/** + * Reset a single modified item. + */ +function menu_reset_item($mid) { + $op = $_POST['op']; + switch ($op) { + case t('Reset'): + db_query('DELETE FROM {menu} WHERE mid = %d', $mid); + menu_rebuild(); + drupal_set_message(t('menu item reset.')); + print theme('page', menu_overview_tree()); + break; + case t('Cancel'): + print theme('page', menu_overview_tree()); + break; + default: + $output = '<p>'. t('Are you sure you want to reset this item to its default values?') .'</p>'; + $output .= form(form_submit(t('Reset')) . form_submit(t('Cancel'))); + print theme('page', $output); + } +} + +/** + * Delete a single custom item. + */ +function menu_delete_item($mid) { + $op = $_POST['op']; + switch ($op) { + case t('Delete'): + db_query('DELETE FROM {menu} WHERE mid = %d', $mid); + menu_rebuild(); + drupal_set_message(t('menu item deleted.')); + print theme('page', menu_overview_tree()); + break; + case t('Cancel'): + print theme('page', menu_overview_tree()); + break; + default: + $output = '<p>'. t('Are you sure you want to delete this custom menu item?') .'</p>'; + $output .= form(form_submit(t('Delete')) . form_submit(t('Cancel'))); + print theme('page', $output); + } +} + +/** + * Hide a menu item. + */ +function menu_disable_item($mid) { + db_query("UPDATE {menu} SET visibility = %d, status = %d WHERE mid = %d", MENU_HIDE, MENU_MODIFIED, $mid); + menu_rebuild(); + drupal_set_message(t('menu item disabled.')); + print theme('page', menu_overview_tree()); +} + +/** + * Dispatch to the appropriate menu item edit function. + */ +function menu_edit_item($mid) { + $op = $_POST['op']; + $edit = $_POST['edit']; + $output = ''; + + switch ($op) { + case t('Submit'): + menu_edit_item_save($edit); + $output .= menu_overview_tree(); + break; + case t('Delete'): + menu_edit_item_delete($edit); + $output .= menu_overview_tree(); + break; + default: + if ($mid > 0) { + $item = db_fetch_object(db_query('SELECT * FROM {menu} WHERE mid = %d', $mid)); + + $edit['mid'] = $item->mid; + $edit['pid'] = $item->pid; + $edit['path'] = $item->path; + $edit['title'] = $item->title; + $edit['weight'] = $item->weight; + $edit['visibility'] = $item->visibility; + $edit['status'] = $item->status; + } + else { + $edit['mid'] = 0; // In case a negative ID was passed in. + $edit['pid'] = 1; // default to "Navigation" menu. + $edit['status'] = MENU_CUSTOM; + } + $output .= menu_edit_item_form($edit); + } + + print theme('page', $output); +} + +/** + * Present the menu item editing form. + */ +function menu_edit_item_form($edit) { + $menu = menu_get_menu(); + + $form .= form_textfield(t('Title'), 'title', $edit['title'], 60, 128); + + if ($edit['pid'] == 0) { + // Display a limited set of fields for menus (not items). + $form .= form_hidden('path', ''); + $form .= form_hidden('pid', 0); + $form .= form_hidden('weight', 0); + } + else { + if ($edit['status'] == MENU_CUSTOM) { + $form .= form_textfield(t('Path'), 'path', $edit['path'], 60, 128); + } + else { + $form .= form_item(t('Path'), l($edit['path'], $edit['path'])); + } + + // Generate a list of possible parents (not including this item or descendants). + $options = menu_parent_options($edit['mid']); + $form .= form_select(t('Parent item'), 'pid', $edit['pid'], $options); + + $form .= form_weight(t('Weight'), 'weight', $edit['weight'], 10, t('Optional. In the menu, the heavier items will sink and the lighter items will be positioned nearer the top.')); + } + + $form .= form_submit(t('Submit')); + + $form .= form_hidden('mid', $edit['mid']); + $form .= form_hidden('status', $edit['status']); + if ($edit['visibility'] == MENU_HIDE) { + // always enable on edit + $form .= form_hidden('visibility', MENU_SHOW); + } + else { + $form .= form_hidden('visibility', $edit['visibility']); + } + + return form($form); +} + +/** + * Save changes to a menu item into the database. + */ +function menu_edit_item_save($edit) { + if ($edit['mid']) { + if ($edit['status'] == MENU_CUSTOM) { + db_query("UPDATE {menu} SET pid = %d, path = '%s', title = '%s', weight = %d, visibility = %d WHERE mid = %d", $edit['pid'], $edit['path'], $edit['title'], $edit['weight'], $edit['visibility'], $edit['mid']); + } + else { + db_query("UPDATE {menu} SET pid = %d, title = '%s', weight = %d, visibility = %d, status = %d WHERE mid = %d", $edit['pid'], $edit['title'], $edit['weight'], $edit['visibility'], MENU_MODIFIED, $edit['mid']); + } + drupal_set_message(t('updated menu item "%title".', array('%title' => $edit['title']))); + } + else { + $mid = db_next_id('menu_mid'); + db_query("INSERT INTO {menu} (mid, pid, path, title, weight, visibility, status) VALUES (%d, %d, '%s', '%s', %d, %d, %d)", $mid, $edit['pid'], $edit['path'], $edit['title'], $edit['weight'], $edit['visibility'], $edit['status']); + drupal_set_message(t('created new menu item "%title".', array('%title' => $edit['title']))); + } + + menu_rebuild(); +} + +/** + * Present the menu tree, rendered along with links to edit menu items. + */ +function menu_overview_tree() { + $menu = menu_get_menu(); + $header = array(t('menu item'), array('data' => t('operations'), 'colspan' => 3)); + $output = ''; + + foreach ($menu['items'][0]['children'] as $mid) { + $operations = array(); + if ($menu['items'][$mid]['status'] != MENU_LOCKED) { + $operations[] = l(t('edit'), 'admin/menu/item/edit/'. $mid); + } + if ($menu['items'][$mid]['status'] == MENU_CUSTOM) { + $operations[] = l(t('delete'), 'admin/menu/item/delete/'. $mid); + } + $table = theme('item_list', $operations); + $table .= theme('table', $header, menu_overview_tree_rows($mid)); + $output .= theme('box', $menu['items'][$mid]['title'], $table); + } + return $output; +} + +function menu_overview_tree_rows($pid = 0, $depth = 0) { + $menu = menu_get_menu(); + + $rows = array(); + + if (isset($menu['items'][$pid]) && $menu['items'][$pid]['children']) { + + usort($menu['items'][$pid]['children'], '_menu_sort'); + foreach ($menu['items'][$pid]['children'] as $mid) { + // Populate the title field. + $title = ''; + if ($pid == 0) { + // Top-level items are menu names, and don't have an associated path. + $title .= t($menu['items'][$mid]['title']); + } + else { + $title .= l(t($menu['items'][$mid]['title']), $menu['items'][$mid]['path']); + } + if ($depth > 0) { + $title = '- '. $title; + } + for ($i = 1; $i < $depth; $i++) { + $title = ' '. $title; + } + + // Populate the operations field. + $operations = array(); + if ($menu['items'][$mid]['status'] == MENU_LOCKED) { + $operations[] = array('data' => t('locked'), 'colspan' => 3, 'align' => 'center'); + } + else { + if ($menu['items'][$mid]['visibility'] == MENU_HIDE) { + $operations[] = array('data' => ''); + $operations[] = array('data' => l(t('enable'), 'admin/menu/item/edit/'. $mid)); + } + else { + $operations[] = array('data' => l(t('edit'), 'admin/menu/item/edit/'. $mid)); + if ($pid == 0) { + // Disabling entire menus is done from block admin page. + $operations[] = array('data' => ''); + } + else { + $operations[] = array('data' => l(t('disable'), 'admin/menu/item/disable/'. $mid)); + } + } + + if ($menu['items'][$mid]['status'] == MENU_MODIFIED) { + $operations[] = array('data' => l(t('reset'), 'admin/menu/item/reset/'. $mid)); + } + else if ($menu['items'][$mid]['status'] == MENU_CUSTOM) { + $operations[] = array('data' => l(t('delete'), 'admin/menu/item/delete/'. $mid)); + } + else { + $operations[] = array('data' => ''); + } + } + + // Call out disabled items. + if ($menu['items'][$mid]['visibility'] == MENU_HIDE) { + $title .= ' ('. t('disabled') .')'; + $class = 'menu-disabled'; + } + else { + $class = 'menu-enabled'; + } + + if ($menu['items'][$mid]['visibility'] == MENU_HIDE && $menu['items'][$mid]['status'] == MENU_LOCKED) { + // Skip items that are hidden and locked; admins will never care about them. + $rows = array_merge($rows, menu_overview_tree_rows($mid, $depth)); + } + else { + $row = array(array('data' => $title, 'class' => $class)); + foreach ($operations as $operation) { + $operation['class'] = $class; + $row[] = $operation; + } + $rows[] = $row; + $rows = array_merge($rows, menu_overview_tree_rows($mid, $depth + 1)); + } + } + + } + + return $rows; +} + +/** + * Return a list of menu items that are valid possible parents for the + * given menu item. + */ +function menu_parent_options($mid, $pid = 0, $depth = 0) { + $menu = menu_get_menu(); + + $options = array(); + + if (isset($menu['items'][$pid]) && $menu['items'][$pid]['children']) { + usort($menu['items'][$pid]['children'], '_menu_sort'); + foreach ($menu['items'][$pid]['children'] as $child) { + if ($child != $mid) { + if ($child == 1 || ($child > 0 && $menu['items'][$child]['status'] != MENU_LOCKED)) { + $title = ' '. $menu['items'][$child]['title']; + for ($i = 0; $i < $depth; $i++) { + $title = '--'. $title; + } + if ($menu['items'][$child]['visibility'] == MENU_HIDE) { + $title .= ' ('. t('disabled') .')'; + } + $options[$child] = $title; + } + $options += menu_parent_options($mid, $child, $depth + 1); + } + } + } + + return $options; +} + +?> diff --git a/modules/menu/menu.module b/modules/menu/menu.module new file mode 100644 index 000000000..236278950 --- /dev/null +++ b/modules/menu/menu.module @@ -0,0 +1,417 @@ +<?php +// $Id$ + +/** + * Implementation of hook_link(). + */ +function menu_link($type, $node = 0, $main) { + if ($type == 'system' && user_access('administer menu')) { + menu('admin/menu', t('menus'), 'menu_overview', 0, MENU_SHOW); + menu('admin/menu/reset', t('reset all menus'), 'menu_reset', 0, MENU_SHOW); + menu('admin/menu/menu/add', t('add menu'), 'menu_add_menu', 0, MENU_SHOW); + menu('admin/menu/item/add', t('add menu item'), 'menu_edit_item', 0, MENU_SHOW); + menu('admin/menu/item/edit', t('edit menu item'), 'menu_edit_item', 0, MENU_HIDE, MENU_LOCKED); + menu('admin/menu/item/reset', t('reset menu item'), 'menu_reset_item', 0, MENU_HIDE, MENU_LOCKED); + menu('admin/menu/item/disable', t('disable menu item'), 'menu_disable_item', 0, MENU_HIDE, MENU_LOCKED); + menu('admin/menu/item/delete', t('delete menu item'), 'menu_delete_item', 0, MENU_HIDE, MENU_LOCKED); + } +} + +/** + * Implementation of hook_help(). + */ +function menu_help($section) { + switch ($section) { + case 'admin/system/modules#description': + return t('Allows administrators to customize the site navigation menu.'); + case 'admin/menu': + return t('Select an operation from the list to move, change, or delete a menu item. To add a new menu, add a new menu item, or reset all menu items to default values, choose an option from the main menu.'); + case 'admin/menu/menu/add': + return t('Enter the name for your new menu. Remember to enable the newly created block in the %blocks administration page.', array('%blocks' => l(t('blocks'), 'admin/system/block'))); + } +} + +/** + * Implementation of hook_block(). + */ +function menu_block($op = 'list', $delta = 0) { + $menu = menu_get_menu(); + + if ($op == 'list') { + $blocks = array(); + foreach ($menu['items'][0]['children'] as $mid) { + // Default "Navigation" block is handled by user.module. + if ($mid != 1) { + $blocks[$mid]['info'] = $menu['items'][$mid]['title']; + } + } + return $blocks; + } + else { + $data['subject'] = $menu['items'][$delta]['title']; + $data['content'] = menu_tree($delta); + return $data; + } +} + +/** + * Implementation of hook_perm(). + */ +function menu_perm() { + return array('administer menu'); +} + +/** + * Present the main menu management page. + */ +function menu_overview() { + menu_rebuild(); + + print theme('page', menu_overview_tree()); +} + +/** + * Clear the database, resetting the menu to factory defaults. + */ +function menu_reset() { + $op = $_POST['op']; + switch ($op) { + case t('Reset'): + db_query('DELETE FROM {menu}'); + menu_rebuild(); + drupal_set_message(t('all menu items reset.')); + print theme('page', menu_overview_tree()); + break; + case t('Cancel'): + print theme('page', menu_overview_tree()); + break; + default: + $output = '<p>'. t('Are you sure you want to reset all menu items to their default settings? Any custom menu items will be lost.') .'</p>'; + $output .= form(form_submit(t('Reset')) . form_submit(t('Cancel'))); + print theme('page', $output); + } +} + +/** + * Handle the adding of a new menu. + */ +function menu_add_menu() { + $op = $_POST['op']; + $edit = $_POST['edit']; + $output = ''; + + switch ($op) { + case t('Submit'): + menu_edit_item_save($edit); + $output .= menu_overview_tree(); + break; + default: + $edit['pid'] = 0; + $edit['status'] = MENU_CUSTOM; + $output .= menu_edit_item_form($edit); + } + + print theme('page', $output); +} + +/** + * Reset a single modified item. + */ +function menu_reset_item($mid) { + $op = $_POST['op']; + switch ($op) { + case t('Reset'): + db_query('DELETE FROM {menu} WHERE mid = %d', $mid); + menu_rebuild(); + drupal_set_message(t('menu item reset.')); + print theme('page', menu_overview_tree()); + break; + case t('Cancel'): + print theme('page', menu_overview_tree()); + break; + default: + $output = '<p>'. t('Are you sure you want to reset this item to its default values?') .'</p>'; + $output .= form(form_submit(t('Reset')) . form_submit(t('Cancel'))); + print theme('page', $output); + } +} + +/** + * Delete a single custom item. + */ +function menu_delete_item($mid) { + $op = $_POST['op']; + switch ($op) { + case t('Delete'): + db_query('DELETE FROM {menu} WHERE mid = %d', $mid); + menu_rebuild(); + drupal_set_message(t('menu item deleted.')); + print theme('page', menu_overview_tree()); + break; + case t('Cancel'): + print theme('page', menu_overview_tree()); + break; + default: + $output = '<p>'. t('Are you sure you want to delete this custom menu item?') .'</p>'; + $output .= form(form_submit(t('Delete')) . form_submit(t('Cancel'))); + print theme('page', $output); + } +} + +/** + * Hide a menu item. + */ +function menu_disable_item($mid) { + db_query("UPDATE {menu} SET visibility = %d, status = %d WHERE mid = %d", MENU_HIDE, MENU_MODIFIED, $mid); + menu_rebuild(); + drupal_set_message(t('menu item disabled.')); + print theme('page', menu_overview_tree()); +} + +/** + * Dispatch to the appropriate menu item edit function. + */ +function menu_edit_item($mid) { + $op = $_POST['op']; + $edit = $_POST['edit']; + $output = ''; + + switch ($op) { + case t('Submit'): + menu_edit_item_save($edit); + $output .= menu_overview_tree(); + break; + case t('Delete'): + menu_edit_item_delete($edit); + $output .= menu_overview_tree(); + break; + default: + if ($mid > 0) { + $item = db_fetch_object(db_query('SELECT * FROM {menu} WHERE mid = %d', $mid)); + + $edit['mid'] = $item->mid; + $edit['pid'] = $item->pid; + $edit['path'] = $item->path; + $edit['title'] = $item->title; + $edit['weight'] = $item->weight; + $edit['visibility'] = $item->visibility; + $edit['status'] = $item->status; + } + else { + $edit['mid'] = 0; // In case a negative ID was passed in. + $edit['pid'] = 1; // default to "Navigation" menu. + $edit['status'] = MENU_CUSTOM; + } + $output .= menu_edit_item_form($edit); + } + + print theme('page', $output); +} + +/** + * Present the menu item editing form. + */ +function menu_edit_item_form($edit) { + $menu = menu_get_menu(); + + $form .= form_textfield(t('Title'), 'title', $edit['title'], 60, 128); + + if ($edit['pid'] == 0) { + // Display a limited set of fields for menus (not items). + $form .= form_hidden('path', ''); + $form .= form_hidden('pid', 0); + $form .= form_hidden('weight', 0); + } + else { + if ($edit['status'] == MENU_CUSTOM) { + $form .= form_textfield(t('Path'), 'path', $edit['path'], 60, 128); + } + else { + $form .= form_item(t('Path'), l($edit['path'], $edit['path'])); + } + + // Generate a list of possible parents (not including this item or descendants). + $options = menu_parent_options($edit['mid']); + $form .= form_select(t('Parent item'), 'pid', $edit['pid'], $options); + + $form .= form_weight(t('Weight'), 'weight', $edit['weight'], 10, t('Optional. In the menu, the heavier items will sink and the lighter items will be positioned nearer the top.')); + } + + $form .= form_submit(t('Submit')); + + $form .= form_hidden('mid', $edit['mid']); + $form .= form_hidden('status', $edit['status']); + if ($edit['visibility'] == MENU_HIDE) { + // always enable on edit + $form .= form_hidden('visibility', MENU_SHOW); + } + else { + $form .= form_hidden('visibility', $edit['visibility']); + } + + return form($form); +} + +/** + * Save changes to a menu item into the database. + */ +function menu_edit_item_save($edit) { + if ($edit['mid']) { + if ($edit['status'] == MENU_CUSTOM) { + db_query("UPDATE {menu} SET pid = %d, path = '%s', title = '%s', weight = %d, visibility = %d WHERE mid = %d", $edit['pid'], $edit['path'], $edit['title'], $edit['weight'], $edit['visibility'], $edit['mid']); + } + else { + db_query("UPDATE {menu} SET pid = %d, title = '%s', weight = %d, visibility = %d, status = %d WHERE mid = %d", $edit['pid'], $edit['title'], $edit['weight'], $edit['visibility'], MENU_MODIFIED, $edit['mid']); + } + drupal_set_message(t('updated menu item "%title".', array('%title' => $edit['title']))); + } + else { + $mid = db_next_id('menu_mid'); + db_query("INSERT INTO {menu} (mid, pid, path, title, weight, visibility, status) VALUES (%d, %d, '%s', '%s', %d, %d, %d)", $mid, $edit['pid'], $edit['path'], $edit['title'], $edit['weight'], $edit['visibility'], $edit['status']); + drupal_set_message(t('created new menu item "%title".', array('%title' => $edit['title']))); + } + + menu_rebuild(); +} + +/** + * Present the menu tree, rendered along with links to edit menu items. + */ +function menu_overview_tree() { + $menu = menu_get_menu(); + $header = array(t('menu item'), array('data' => t('operations'), 'colspan' => 3)); + $output = ''; + + foreach ($menu['items'][0]['children'] as $mid) { + $operations = array(); + if ($menu['items'][$mid]['status'] != MENU_LOCKED) { + $operations[] = l(t('edit'), 'admin/menu/item/edit/'. $mid); + } + if ($menu['items'][$mid]['status'] == MENU_CUSTOM) { + $operations[] = l(t('delete'), 'admin/menu/item/delete/'. $mid); + } + $table = theme('item_list', $operations); + $table .= theme('table', $header, menu_overview_tree_rows($mid)); + $output .= theme('box', $menu['items'][$mid]['title'], $table); + } + return $output; +} + +function menu_overview_tree_rows($pid = 0, $depth = 0) { + $menu = menu_get_menu(); + + $rows = array(); + + if (isset($menu['items'][$pid]) && $menu['items'][$pid]['children']) { + + usort($menu['items'][$pid]['children'], '_menu_sort'); + foreach ($menu['items'][$pid]['children'] as $mid) { + // Populate the title field. + $title = ''; + if ($pid == 0) { + // Top-level items are menu names, and don't have an associated path. + $title .= t($menu['items'][$mid]['title']); + } + else { + $title .= l(t($menu['items'][$mid]['title']), $menu['items'][$mid]['path']); + } + if ($depth > 0) { + $title = '- '. $title; + } + for ($i = 1; $i < $depth; $i++) { + $title = ' '. $title; + } + + // Populate the operations field. + $operations = array(); + if ($menu['items'][$mid]['status'] == MENU_LOCKED) { + $operations[] = array('data' => t('locked'), 'colspan' => 3, 'align' => 'center'); + } + else { + if ($menu['items'][$mid]['visibility'] == MENU_HIDE) { + $operations[] = array('data' => ''); + $operations[] = array('data' => l(t('enable'), 'admin/menu/item/edit/'. $mid)); + } + else { + $operations[] = array('data' => l(t('edit'), 'admin/menu/item/edit/'. $mid)); + if ($pid == 0) { + // Disabling entire menus is done from block admin page. + $operations[] = array('data' => ''); + } + else { + $operations[] = array('data' => l(t('disable'), 'admin/menu/item/disable/'. $mid)); + } + } + + if ($menu['items'][$mid]['status'] == MENU_MODIFIED) { + $operations[] = array('data' => l(t('reset'), 'admin/menu/item/reset/'. $mid)); + } + else if ($menu['items'][$mid]['status'] == MENU_CUSTOM) { + $operations[] = array('data' => l(t('delete'), 'admin/menu/item/delete/'. $mid)); + } + else { + $operations[] = array('data' => ''); + } + } + + // Call out disabled items. + if ($menu['items'][$mid]['visibility'] == MENU_HIDE) { + $title .= ' ('. t('disabled') .')'; + $class = 'menu-disabled'; + } + else { + $class = 'menu-enabled'; + } + + if ($menu['items'][$mid]['visibility'] == MENU_HIDE && $menu['items'][$mid]['status'] == MENU_LOCKED) { + // Skip items that are hidden and locked; admins will never care about them. + $rows = array_merge($rows, menu_overview_tree_rows($mid, $depth)); + } + else { + $row = array(array('data' => $title, 'class' => $class)); + foreach ($operations as $operation) { + $operation['class'] = $class; + $row[] = $operation; + } + $rows[] = $row; + $rows = array_merge($rows, menu_overview_tree_rows($mid, $depth + 1)); + } + } + + } + + return $rows; +} + +/** + * Return a list of menu items that are valid possible parents for the + * given menu item. + */ +function menu_parent_options($mid, $pid = 0, $depth = 0) { + $menu = menu_get_menu(); + + $options = array(); + + if (isset($menu['items'][$pid]) && $menu['items'][$pid]['children']) { + usort($menu['items'][$pid]['children'], '_menu_sort'); + foreach ($menu['items'][$pid]['children'] as $child) { + if ($child != $mid) { + if ($child == 1 || ($child > 0 && $menu['items'][$child]['status'] != MENU_LOCKED)) { + $title = ' '. $menu['items'][$child]['title']; + for ($i = 0; $i < $depth; $i++) { + $title = '--'. $title; + } + if ($menu['items'][$child]['visibility'] == MENU_HIDE) { + $title .= ' ('. t('disabled') .')'; + } + $options[$child] = $title; + } + $options += menu_parent_options($mid, $child, $depth + 1); + } + } + } + + return $options; +} + +?> diff --git a/modules/node.module b/modules/node.module index bb487e077..12209ca0d 100644 --- a/modules/node.module +++ b/modules/node.module @@ -366,7 +366,7 @@ function node_load($conditions, $revision = -1) { ** Return the desired revision */ if ($revision != -1 && isset($node->revisions[$revision])) { - $node = $node->revisions[$revision]['node']; + $node = $node->revisions[$revision]['node']; } return $node; @@ -617,7 +617,7 @@ function node_link($type, $node = 0, $main = 0) { if (user_access('administer nodes')) { menu('admin/node', t('content'), 'node_admin'); menu('admin/node/help', t('help'), 'node_help_page', 9); - menu('admin/node/edit', t('edit post'), 'node_admin', 0, MENU_HIDE); + menu('admin/node/edit', t('edit post'), 'node_admin', 0, MENU_HIDE, MENU_LOCKED); menu('admin/node/settings', t('settings'), 'node_admin', 8); if (module_exist('search')) { menu('admin/node/search', t('search'), 'node_admin', 8); diff --git a/modules/node/node.module b/modules/node/node.module index bb487e077..12209ca0d 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -366,7 +366,7 @@ function node_load($conditions, $revision = -1) { ** Return the desired revision */ if ($revision != -1 && isset($node->revisions[$revision])) { - $node = $node->revisions[$revision]['node']; + $node = $node->revisions[$revision]['node']; } return $node; @@ -617,7 +617,7 @@ function node_link($type, $node = 0, $main = 0) { if (user_access('administer nodes')) { menu('admin/node', t('content'), 'node_admin'); menu('admin/node/help', t('help'), 'node_help_page', 9); - menu('admin/node/edit', t('edit post'), 'node_admin', 0, MENU_HIDE); + menu('admin/node/edit', t('edit post'), 'node_admin', 0, MENU_HIDE, MENU_LOCKED); menu('admin/node/settings', t('settings'), 'node_admin', 8); if (module_exist('search')) { menu('admin/node/search', t('search'), 'node_admin', 8); diff --git a/modules/profile.module b/modules/profile.module index 3a2ebe48a..cbeaccd1e 100644 --- a/modules/profile.module +++ b/modules/profile.module @@ -20,9 +20,9 @@ function profile_link($type) { if (user_access('administer users')) { menu('admin/system/modules/profile', t('profile'), 'profile_admin_overview'); - menu('admin/system/modules/profile/add', NULL, 'profile_admin_add', 0, MENU_HIDE); - menu('admin/system/modules/profile/edit', NULL, 'profile_admin_edit', 0, MENU_HIDE); - menu('admin/system/modules/profile/delete', NULL, 'profile_admin_delete', 0, MENU_HIDE); + menu('admin/system/modules/profile/add', NULL, 'profile_admin_add', 0, MENU_HIDE, MENU_LOCKED); + menu('admin/system/modules/profile/edit', NULL, 'profile_admin_edit', 0, MENU_HIDE, MENU_LOCKED); + menu('admin/system/modules/profile/delete', NULL, 'profile_admin_delete', 0, MENU_HIDE, MENU_LOCKED); } } } diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 3a2ebe48a..cbeaccd1e 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -20,9 +20,9 @@ function profile_link($type) { if (user_access('administer users')) { menu('admin/system/modules/profile', t('profile'), 'profile_admin_overview'); - menu('admin/system/modules/profile/add', NULL, 'profile_admin_add', 0, MENU_HIDE); - menu('admin/system/modules/profile/edit', NULL, 'profile_admin_edit', 0, MENU_HIDE); - menu('admin/system/modules/profile/delete', NULL, 'profile_admin_delete', 0, MENU_HIDE); + menu('admin/system/modules/profile/add', NULL, 'profile_admin_add', 0, MENU_HIDE, MENU_LOCKED); + menu('admin/system/modules/profile/edit', NULL, 'profile_admin_edit', 0, MENU_HIDE, MENU_LOCKED); + menu('admin/system/modules/profile/delete', NULL, 'profile_admin_delete', 0, MENU_HIDE, MENU_LOCKED); } } } diff --git a/modules/taxonomy.module b/modules/taxonomy.module index 1c73ba543..e29359351 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -29,7 +29,7 @@ function taxonomy_link($type, $node = NULL) { menu("admin/taxonomy/help", t("help"), "taxonomy_admin", 9); } if (user_access("access content")) { - menu("taxonomy", t("taxonomy"), "taxonomy_page", 0, MENU_HIDE); + menu("taxonomy", t("taxonomy"), "taxonomy_page", 0, MENU_HIDE, MENU_LOCKED); } } else if ($type == "taxonomy terms" && $node != NULL) { diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 1c73ba543..e29359351 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -29,7 +29,7 @@ function taxonomy_link($type, $node = NULL) { menu("admin/taxonomy/help", t("help"), "taxonomy_admin", 9); } if (user_access("access content")) { - menu("taxonomy", t("taxonomy"), "taxonomy_page", 0, MENU_HIDE); + menu("taxonomy", t("taxonomy"), "taxonomy_page", 0, MENU_HIDE, MENU_LOCKED); } } else if ($type == "taxonomy terms" && $node != NULL) { diff --git a/modules/title.module b/modules/title.module index fd02de0c7..df7e20b9e 100644 --- a/modules/title.module +++ b/modules/title.module @@ -16,7 +16,7 @@ function title_help($section) { function title_link($type) { if ($type == "system") { if (user_access("access content")) { - menu("title", t("search"), "title_page", 0, MENU_HIDE); + menu("title", t("search"), "title_page", 0, MENU_HIDE, MENU_LOCKED); } } } diff --git a/modules/user.module b/modules/user.module index 01ba43601..e6a940f2c 100644 --- a/modules/user.module +++ b/modules/user.module @@ -539,8 +539,10 @@ function user_link($type) { menu("logout", t("log out"), "user_logout", 10); } else { - menu('user', t("my account"), "user_page", 8, MENU_HIDE); + menu("user/login", t("log in"), "user_page", 0, MENU_HIDE); } + menu("user/password", t("e-mail new password"), "user_page", 0, MENU_HIDE); + menu("user/register", t("create new account"), "user_page", 0, MENU_HIDE); if (user_access("administer users")) { menu("admin/user", t("accounts"), "user_admin", 2); @@ -551,7 +553,7 @@ function user_link($type) { menu("admin/user/role", t("roles"), "user_admin", 4); menu("admin/user/permission", t("permissions"), "user_admin", 5); menu("admin/user/help", t("help"), "user_help_page", 9); - menu("admin/user/edit", t("edit user account"), "user_admin", 0, MENU_HIDE); + menu("admin/user/edit", t("edit user account"), "user_admin", 0, MENU_HIDE, MENU_LOCKED); if (module_exist('search')) { menu("admin/user/search", t("search"), "user_admin", 8); } @@ -764,7 +766,7 @@ function user_login($edit = array(), $msg = "") { $output = form_group(t('User login'), $output); - return form($output, "post", url('user')); + return form($output, "post", url('user/login')); } function _user_authenticated_id() { @@ -851,7 +853,7 @@ function user_pass($edit = array()) { } $output .= theme("item_list", $items); $output = form_group(t('Request new password'), $output); - return form($output, "post", url('user')); + return form($output, "post", url('user/password')); } } diff --git a/modules/user/user.module b/modules/user/user.module index 01ba43601..e6a940f2c 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -539,8 +539,10 @@ function user_link($type) { menu("logout", t("log out"), "user_logout", 10); } else { - menu('user', t("my account"), "user_page", 8, MENU_HIDE); + menu("user/login", t("log in"), "user_page", 0, MENU_HIDE); } + menu("user/password", t("e-mail new password"), "user_page", 0, MENU_HIDE); + menu("user/register", t("create new account"), "user_page", 0, MENU_HIDE); if (user_access("administer users")) { menu("admin/user", t("accounts"), "user_admin", 2); @@ -551,7 +553,7 @@ function user_link($type) { menu("admin/user/role", t("roles"), "user_admin", 4); menu("admin/user/permission", t("permissions"), "user_admin", 5); menu("admin/user/help", t("help"), "user_help_page", 9); - menu("admin/user/edit", t("edit user account"), "user_admin", 0, MENU_HIDE); + menu("admin/user/edit", t("edit user account"), "user_admin", 0, MENU_HIDE, MENU_LOCKED); if (module_exist('search')) { menu("admin/user/search", t("search"), "user_admin", 8); } @@ -764,7 +766,7 @@ function user_login($edit = array(), $msg = "") { $output = form_group(t('User login'), $output); - return form($output, "post", url('user')); + return form($output, "post", url('user/login')); } function _user_authenticated_id() { @@ -851,7 +853,7 @@ function user_pass($edit = array()) { } $output .= theme("item_list", $items); $output = form_group(t('Request new password'), $output); - return form($output, "post", url('user')); + return form($output, "post", url('user/password')); } } diff --git a/modules/watchdog.module b/modules/watchdog.module index e0b1c38d2..e7ac001c1 100644 --- a/modules/watchdog.module +++ b/modules/watchdog.module @@ -52,13 +52,11 @@ function watchdog_perm() { function watchdog_link($type) { if ($type == "system") { if (user_access("administer watchdog")) { - if (arg(0) == 'admin') { // avoid SQL queries if possible - menu("admin/watchdog", t("logs"), "watchdog_admin", 7); - menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, MENU_HIDE); + menu("admin/watchdog", t("logs"), "watchdog_admin", 7); + menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, MENU_HIDE, MENU_LOCKED); - foreach (_watchdog_get_message_types() as $type) { - menu("admin/watchdog/$type", t($type), "watchdog_admin"); - } + foreach (_watchdog_get_message_types() as $type) { + menu("admin/watchdog/$type", t($type), "watchdog_admin"); } } } diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module index e0b1c38d2..e7ac001c1 100644 --- a/modules/watchdog/watchdog.module +++ b/modules/watchdog/watchdog.module @@ -52,13 +52,11 @@ function watchdog_perm() { function watchdog_link($type) { if ($type == "system") { if (user_access("administer watchdog")) { - if (arg(0) == 'admin') { // avoid SQL queries if possible - menu("admin/watchdog", t("logs"), "watchdog_admin", 7); - menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, MENU_HIDE); + menu("admin/watchdog", t("logs"), "watchdog_admin", 7); + menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, MENU_HIDE, MENU_LOCKED); - foreach (_watchdog_get_message_types() as $type) { - menu("admin/watchdog/$type", t($type), "watchdog_admin"); - } + foreach (_watchdog_get_message_types() as $type) { + menu("admin/watchdog/$type", t($type), "watchdog_admin"); } } } |