'. format_plural($num_links, 'Warning: there is currently 1 menu item in %title. It will be deleted (or reset for a system-defined item).', 'Warning: there are currently @count menu items in %title. They will be deleted (or reset for system-defined items).', array('%title' => $menu['title'])) .'
'; + } + $caption .= ''. t('This action cannot be undone.') .'
'; + return confirm_form($form, t('Are you sure you want to delete the custom menu %title?', array('%title' => $menu['title'])), 'admin/build/menu-customize/'. $menu['menu_name'], $caption, t('Delete')); +} + +/** + * Delete a custom menu and all items in it. + */ +function menu_delete_menu_confirm_submit($form, &$form_state) { + $menu = $form['#menu']; + $form_state['redirect'] = 'admin/build/menu'; + if (in_array($menu['menu_name'], menu_list_system_menus())) { + return; + } + $result = db_query("SELECT * FROM {menu_links} ml INNER JOIN {menu_router} m ON ml.router_path = m.path WHERE ml.menu_name = '%s' AND ml.module = 'system' ORDER BY m.number_parts ASC", $menu['menu_name']); + while ($item = db_fetch_array($result)) { + menu_reset_item($item); + } + db_query("DELETE FROM {menu_links} WHERE menu_name = '%s'", $menu['menu_name']); + db_query("DELETE FROM {menu_custom} WHERE menu_name = '%s'", $menu['menu_name']); + db_query("DELETE FROM {blocks} WHERE module = 'menu' AND delta = '%s'", $menu['menu_name']); + db_query("DELETE FROM {blocks_roles} WHERE module = 'menu' AND delta = '%s'", $menu['menu_name']); + menu_cache_clear_all(); + cache_clear_all(); +} + +/** * Validates the human and machine-readable names when adding or editing a menu. */ function menu_edit_menu_validate($form, &$form_state) { @@ -484,7 +542,7 @@ function menu_item_delete_form_submit($f /** * Menu callback; reset a single modified item. */ -function menu_reset_item(&$form_state, $item) { +function menu_reset_item_confirm(&$form_state, $item) { $form['item'] = array('#type' => 'value', '#value' => $item); return confirm_form($form, t('Are you sure you want to reset the item %item to its default values?', array('%item' => $item['link_title'])), 'admin/build/menu-customize/'. $item['menu_name'], t('Any customizations will be lost. This action cannot be undone.'), t('Reset')); } @@ -492,16 +550,24 @@ function menu_reset_item(&$form_state, $ /** * Process menu reset item form submissions. */ -function menu_reset_item_submit($form, &$form_state) { +function menu_reset_item_confirm_submit($form, &$form_state) { $item = $form_state['values']['item']; + $new_item = menu_reset_item($item); + drupal_set_message(t('The menu item was reset to its default settings.')); + $form_state['redirect'] = 'admin/build/menu-customize/'. $new_item['menu_name']; +} + +/** + * Reset a system-defined menu item. + */ +function menu_reset_item($item) { $router = menu_router_build(); $new_item = _menu_link_build($router[$item['router_path']]); foreach (array('mlid', 'has_children') as $key) { $new_item[$key] = $item[$key]; } menu_link_save($new_item); - drupal_set_message(t('The menu item was reset to its default settings.')); - $form_state['redirect'] = 'admin/build/menu-customize/'. $new_item['menu_name']; + return $new_item; } /** @@ -640,9 +706,13 @@ function menu_form_alter(&$form, $form_s * titles as the values. */ 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'; - $result = db_query($sql); - + $system_menus = menu_list_system_menus(); + $sql = 'SELECT * FROM {menu_custom}'; + if (!$all) { + $sql .= ' WHERE menu_name NOT IN ('. implode(',', array_fill(0, count($system_menus), "'%s'")) .')'; + } + $sql .= ' ORDER BY title'; + $result = db_query($sql, $system_menus); $rows = array(); while ($r = db_fetch_array($result)) { $rows[$r['menu_name']] = $r['title'];