Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.165 diff -u -p -r1.165 menu.inc --- includes/menu.inc 6 May 2007 05:47:51 -0000 1.165 +++ includes/menu.inc 10 May 2007 07:25:47 -0000 @@ -343,6 +343,9 @@ function menu_get_item($path = NULL, $it */ function menu_execute_active_handler() { if ($item = menu_get_item()) { + if ($item->file) { + include_once($item->file); + } return $item->access ? call_user_func_array($item->page_callback, $item->page_arguments) : MENU_ACCESS_DENIED; } return MENU_NOT_FOUND; @@ -626,7 +629,18 @@ function menu_path_is_external($path) { */ function menu_rebuild() { // TODO: split menu and menu links storage. - $menu = module_invoke_all('menu'); + + // We need to manually call each module so that we can know which module a given item came from. + $menu = array(); + foreach (module_implements('menu') as $module) { + $items = call_user_func($module . '_menu'); + if (isset($items) && is_array($items)) { + foreach (array_keys($items) as $path) { + $items[$path]['module'] = $module; + } + $menu = array_merge($menu, $items); + } + } // Alter the menu as defined in modules, keys are like user/%user. drupal_alter('menu', $menu, MENU_ALTER_MODULE_DEFINED); @@ -711,6 +725,7 @@ function menu_rebuild() { else { $new_path = $path; } + $menu_path_map[$path] = $new_path; $menu[$new_path] = $item; } @@ -811,6 +826,12 @@ function menu_rebuild() { $item['page callback'] = $parent['page callback']; if (!isset($item['page arguments']) && isset($parent['page arguments'])) { $item['page arguments'] = $parent['page arguments']; + if (!isset($item['file']) && isset($parent['file'])) { + $item['file'] = $parent['file']; + } + if (!isset($item['file path']) && isset($parent['file path'])) { + $item['file path'] = $parent['file path']; + } } } } @@ -859,6 +880,7 @@ function menu_rebuild() { 'fragment' => '', 'absolute' => '', 'html' => '', + 'file' => '', ); $link_path = $item['to_arg_functions'] ? $path : drupal_get_path_alias($path); @@ -881,16 +903,26 @@ function menu_rebuild() { if (!empty($item['disabled'])) { $item['_visible'] = FALSE; } + + // Calculate out the file to be included for each callback, if any. + if (isset($item['file']) && $item['file']) { + $file_path = (isset($item['file path']) && $item['file path']) ? $item['file path'] : drupal_get_path('module', $item['module']); + $item['include file'] = $file_path . '/' . $item['file']; + } + else { + $item['include file'] = ''; + } + db_query("INSERT INTO {menu} ( mid, pid, path, load_functions, to_arg_functions, access_callback, access_arguments, page_callback, page_arguments, title_callback, title_arguments, fit, number_parts, visible, parents, depth, has_children, tab, title, parent, type, mleft, mright, block_callback, description, position, - link_path, attributes, query, fragment, absolute, html) + link_path, attributes, query, fragment, absolute, html, file) VALUES (%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', %d, %d, %d, '%s', '%s', '%s', %d, %d, '%s', '%s', - '%s', '%s', '%s', '%s', '%s', %d, %d)", + '%s', '%s', '%s', '%s', '%s', %d, %d, '%s')", $item['_mid'], $item['_pid'], $path, $item['load_functions'], $item['to_arg_functions'], $item['access callback'], serialize($item['access arguments']), $item['page callback'], @@ -902,7 +934,7 @@ function menu_rebuild() { $item['_mright'], $item['block callback'], $item['description'], $item['position'], $link_path, $item['attributes'], $item['query'], $item['fragment'], - $item['absolute'], $item['html']); + $item['absolute'], $item['html'], $item['include file']); } } Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.807 diff -u -p -r1.807 node.module --- modules/node/node.module 8 May 2007 17:08:14 -0000 1.807 +++ modules/node/node.module 10 May 2007 07:25:48 -0000 @@ -1134,6 +1134,8 @@ function node_menu() { 'weight' => -10, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('administer site configuration'), + 'file' => 'system.admin.inc', + 'file path' => drupaL_get_path('module', 'system'), ); $items['admin/content/node'] = array( Index: modules/system/system.admin.inc =================================================================== RCS file: modules/system/system.admin.inc diff -N modules/system/system.admin.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/system/system.admin.inc 10 May 2007 07:25:48 -0000 @@ -0,0 +1,1011 @@ +status report for more information.', array('@status' => url('admin/logs/status'))), 'error'); + } + + $map = arg(NULL); + $result = db_query("SELECT * FROM {menu} WHERE path LIKE 'admin/%%' AND depth = 2 AND visible = 1 AND path != 'admin/help' ORDER BY mleft"); + while ($item = db_fetch_object($result)) { + _menu_translate($item, $map, MENU_RENDER_LINK); + if (!$item->access) { + continue; + } + $block = (array)$item; + $block['content'] = ''; + if ($item->block_callback && function_exists($item->block_callback)) { + $function = $item->block_callback; + $block['content'] .= $function(); + } + $block['content'] .= theme('admin_block_content', system_admin_menu_block($item)); + $blocks[] = $block; + } + return theme('admin_page', $blocks); +} + +function system_admin_compact_page($mode = 'off') { + global $user; + user_save($user, array('admin_compact_mode' => ($mode == 'on'))); + drupal_goto('admin'); +} + +/** + * Menu callback; prints a listing of admin tasks for each installed module. + */ +function system_admin_by_module() { + return 'This page awaits rewrite'; // TODO: this needs to be rewritten for the new menu system. + $modules = module_rebuild_cache(); + $menu_items = array(); + foreach ($modules as $file) { + $module = $file->name; + if ($module == 'help') { + continue; + } + + $admin_tasks = system_get_module_admin_tasks($module); + + // Only display a section if there are any available tasks. + if (count($admin_tasks)) { + + // Check for help links. + if (module_invoke($module, 'help', "admin/help#$module")) { + $admin_tasks[100] = l(t('Get help'), "admin/help/$module"); + } + + // Sort. + ksort($admin_tasks); + + $menu_items[$file->info['name']] = array($file->info['description'], $admin_tasks); + } + } + return theme('system_admin_by_module', $menu_items); +} + +/** + * Menu callback; displays a module's settings page. + */ +function system_settings_overview() { + // Check database setup if necessary + if (function_exists('db_check_setup') && empty($_POST)) { + db_check_setup(); + } + + $item = menu_get_item('admin/settings'); + $content = system_admin_menu_block($item); + + $output = theme('admin_block_content', $content); + + return $output; +} + +/** + * Provide a single block from the administration menu as a page. + * This function is often a destination for these blocks. + * For example, 'admin/content/types' needs to have a destination to be valid + * in the Drupal menu system, but too much information there might be + * hidden, so we supply the contents of the block. + */ +function system_admin_menu_block_page() { + $item = menu_get_item(); + $content = system_admin_menu_block($item); + + $output = theme('admin_block_content', $content); + return $output; +} + + +/** + * Provide a single block on the administration overview page. + */ +function system_admin_menu_block($item) { + $map = arg(NULL); + $content = array(); + $result = db_query('SELECT * FROM {menu} WHERE depth = %d AND %d < mleft AND mright < %d AND visible = 1 ORDER BY mleft', $item->depth + 1, $item->mleft, $item->mright); + while ($item = db_fetch_object($result)) { + _menu_translate($item, $map, MENU_RENDER_LINK); + if (!$item->access) { + continue; + } + $content[] = (array)$item; + } + return $content; +} + +/** + * Menu callback; provides module enable/disable interface. + * + * Modules can be enabled or disabled and set for throttling if the throttle module is enabled. + * The list of modules gets populated by module.info files, which contain each module's name, + * description and dependencies. + * @sa drupal_parse_info_file for information on module.info descriptors. + * + * Dependency checking is performed to ensure that a module cannot be enabled if the module has + * disabled dependencies and also to ensure that the module cannot be disabled if the module has + * enabled dependents. + * + * @return + * The form array. + */ +function system_modules($form_values = NULL) { + // Get current list of modules. + $files = module_rebuild_cache(); + if ($confirm_form = system_modules_confirm_form($files, $form_values)) { + return $confirm_form; + } + + // Store module list for validation callback. + $form['validation_modules'] = array('#type' => 'value', '#value' => $files); + + // Create storage for disabled modules as browser will disable checkboxes. + $form['disabled_modules'] = array('#type' => 'value', '#value' => array()); + + // Array for disabling checkboxes in callback system_module_disable. + $disabled = array(); + $throttle = array(); + // Traverse the files retrieved and build the form. + foreach ($files as $filename => $file) { + $form['name'][$filename] = array('#value' => $file->info['name']); + $form['version'][$filename] = array('#value' => $file->info['version']); + $form['description'][$filename] = array('#value' => t($file->info['description'])); + $options[$filename] = ''; + if ($file->status) { + $status[] = $file->name; + } + if ($file->throttle) { + $throttle[] = $file->name; + } + + $dependencies = array(); + // Check for missing dependencies. + if (is_array($file->info['dependencies'])) { + foreach ($file->info['dependencies'] as $dependency) { + if (!isset($files[$dependency]) || !$files[$dependency]->status) { + if (isset($files[$dependency])) { + $dependencies[] = $files[$dependency]->info['name'] . t(' (disabled)'); + } + else { + $dependencies[] = drupal_ucfirst($dependency) . t(' (missing)'); + $disabled[] = $filename; + $form['disabled_modules']['#value'][$filename] = FALSE; + } + } + else { + $dependencies[] = $files[$dependency]->info['name'] . t(' (enabled)'); + } + } + + // Add text for dependencies. + if (!empty($dependencies)) { + $form['description'][$filename]['dependencies'] = array( + '#value' => t('Depends on: !dependencies', array('!dependencies' => implode(', ', $dependencies))), + '#prefix' => '
', + '#suffix' => '
', + ); + } + } + + // Mark dependents disabled so user can not remove modules being depended on. + $dependents = array(); + foreach ($file->info['dependents'] as $dependent) { + if ($files[$dependent]->status == 1) { + $dependents[] = $files[$dependent]->info['name'] . t(' (enabled)'); + $disabled[] = $filename; + $form['disabled_modules']['#value'][$filename] = TRUE; + } + else { + $dependents[] = $files[$dependent]->info['name'] . t(' (disabled)'); + } + } + + // Add text for enabled dependents. + if (!empty($dependents)) { + $form['description'][$filename]['required'] = array( + '#value' => t('Required by: !required', array('!required' => implode(', ', $dependents))), + '#prefix' => '
', + '#suffix' => '
', + ); + } + } + + $modules_required = drupal_required_modules(); + // Merge in required modules. + foreach ($modules_required as $required) { + $disabled[] = $required; + $form['disabled_modules']['#value'][$required] = TRUE; + } + + // Handle status checkboxes, including overriding + // the generated checkboxes for required modules. + $form['status'] = array( + '#type' => 'checkboxes', + '#default_value' => $status, + '#options' => $options, + '#process' => array( + 'expand_checkboxes' => array(), + 'system_modules_disable' => array($disabled), + ), + ); + + // Handle throttle checkboxes, including overriding the + // generated checkboxes for required modules. + if (module_exists('throttle')) { + $form['throttle'] = array( + '#type' => 'checkboxes', + '#default_value' => $throttle, + '#options' => $options, + '#process' => array( + 'expand_checkboxes' => array(), + 'system_modules_disable' => array(array_merge($modules_required, array('throttle'))), + ), + ); + } + + $form['buttons']['submit'] = array( + '#type' => 'submit', + '#value' => t('Save configuration'), + ); + $form['#multistep'] = TRUE; + $form['#action'] = url('admin/build/modules/list/confirm'); + + return $form; +} + +/** + * Submit callback; handles modules form submission. + */ +function system_modules_submit($form_id, $form_values) { + include_once './includes/install.inc'; + $new_modules = array(); + + // Merge in disabled active modules since they should be enabled. + // They don't appear because disabled checkboxes are not submitted + // by browsers. + $form_values['status'] = array_merge($form_values['status'], $form_values['disabled_modules']); + + // Check values for dependency that we can't install. + if ($dependencies = system_module_build_dependencies($form_values['validation_modules'], $form_values)) { + // These are the modules that depend on existing modules. + foreach (array_keys($dependencies) as $name) { + $form_values['status'][$name] = 0; + } + } + + $enable_modules = array(); + $disable_modules = array(); + foreach ($form_values['status'] as $key => $choice) { + if ($choice) { + if (drupal_get_installed_schema_version($key) == SCHEMA_UNINSTALLED) { + $new_modules[] = $key; + } + else { + $enable_modules[] = $key; + } + } + else { + $disable_modules[] = $key; + } + } + + $old_module_list = module_list(); + + if (!empty($enable_modules)) { + module_enable($enable_modules); + } + if (!empty($disable_modules)) { + module_disable($disable_modules); + } + + // Install new modules. + foreach ($new_modules as $key => $module) { + if (!drupal_check_module($module)) { + unset($new_modules[$key]); + } + } + drupal_install_modules($new_modules); + + $current_module_list = module_list(TRUE, FALSE); + + if (isset($form_values['throttle'])) { + foreach ($form_values['throttle'] as $key => $choice) { + db_query("UPDATE {system} SET throttle = %d WHERE type = 'module' and name = '%s'", $choice ? 1 : 0, $key); + } + } + + if ($old_module_list != $current_module_list) { + drupal_rebuild_theme_registry(); + menu_rebuild(); + node_types_rebuild(); + drupal_set_message(t('The configuration options have been saved.')); + } + + // If there where unmet dependencies and they haven't confirmed don't redirect. + if ($dependencies && !isset($form_values['confirm'])) { + return FALSE; + } + + drupal_clear_css_cache(); + + return 'admin/build/modules'; +} + +/** + * Theme call back for the modules form. + */ +function theme_system_modules($form) { + if (isset($form['confirm'])) { + return drupal_render($form); + } + + // Individual table headers. + $header = array(t('Enabled')); + if (module_exists('throttle')) { + $header[] = t('Throttle'); + } + $header[] = t('Name'); + $header[] = t('Version'); + $header[] = t('Description'); + + // Pull package information from module list and start grouping modules. + $modules = $form['validation_modules']['#value']; + foreach ($modules as $module) { + if (!isset($module->info['package']) || !$module->info['package']) { + $module->info['package'] = t('Other'); + } + $packages[$module->info['package']][$module->name] = $module->info; + } + ksort($packages); + + // Display packages. + $output = ''; + foreach ($packages as $package => $modules) { + $rows = array(); + foreach ($modules as $key => $module) { + $row = array(); + $row[] = array('data' => drupal_render($form['status'][$key]), 'align' => 'center'); + + if (module_exists('throttle')) { + $row[] = array('data' => drupal_render($form['throttle'][$key]), 'align' => 'center'); + } + $row[] = ''. drupal_render($form['name'][$key]) .''; + $row[] = drupal_render($form['version'][$key]); + $row[] = array('data' => drupal_render($form['description'][$key]), 'class' => 'description'); + $rows[] = $row; + } + $fieldset = array( + '#title' => t($package), + '#collapsible' => TRUE, + '#collapsed' => ($package == 'Core - required'), + '#value' => theme('table', $header, $rows, array('class' => 'package')), + ); + $output .= theme('fieldset', $fieldset); + } + + $output .= drupal_render($form); + return $output; +} + +/** + * Form process callback function to disable check boxes. + */ +function system_modules_disable($form, $edit, $disabled) { + foreach ($disabled as $key) { + $form[$key]['#attributes']['disabled'] = 'disabled'; + } + return $form; +} + +function system_modules_confirm_form($modules, $form_values = array()) { + $form = array(); + $items = array(); + + // Check values for submitted dependency errors. + if ($dependencies = system_module_build_dependencies($modules, $form_values)) { + // preserve the already switched on modules + foreach ($modules as $name => $module) { + if ($module->status) { + $form['status'][$name] = array('#type' => 'hidden', '#value' => 1); + } + } + + $form['validation_modules'] = array('#type' => 'value', '#value' => $modules); + $form['status']['#tree'] = TRUE; + foreach ($dependencies as $name => $missing_dependencies) { + $form['status'][$name] = array('#type' => 'hidden', '#value' => 1); + foreach ($missing_dependencies as $k => $dependency) { + $form['status'][$dependency] = array('#type' => 'hidden', '#value' => 1); + $info = $modules[$dependency]->info; + $missing_dependencies[$k] = $info['name'] ? $info['name'] : drupal_ucfirst($dependency); + } + $t_argument = array( + '@module' => $modules[$name]->info['name'], + '@dependencies' => implode(', ', $missing_dependencies), + ); + $items[] = format_plural(count($missing_dependencies), 'You must enable the @dependencies module to install @module.', 'You must enable the @dependencies modules to install @module.', $t_argument); + } + $form['text'] = array('#value' => theme('item_list', $items)); + } + + if ($form) { + // Set some default form values + $form = confirm_form( + $form, + t('Some required modules must be enabled'), + 'admin/build/modules', + t('Would you like to continue with enabling the above?'), + t('Continue'), + t('Cancel')); + return $form; + } +} + +/** + * Uninstall functions + */ + +/** + * Builds a form of currently disabled modules. + * + * @param + * $form_values Submitted form values. + * @return + * A form array representing the currently disabled modules. + */ +function system_modules_uninstall($form_values = NULL) { + // Make sure the install API is available. + include_once './includes/install.inc'; + + // Display the confirm form if any modules have been submitted. + if ($confirm_form = system_modules_uninstall_confirm_form($form_values)) { + return $confirm_form; + } + + $form = array(); + + // Pull all disabled modules from the system table. + $disabled_modules = db_query("SELECT name, filename, info FROM {system} WHERE type = 'module' AND status = 0 AND schema_version > %d ORDER BY name", SCHEMA_UNINSTALLED); + while ($module = db_fetch_object($disabled_modules)) { + + // Grab the module info + $info = unserialize($module->info); + + // Load the .install file, and check for an uninstall hook. + // If the hook exists, the module can be uninstalled. + module_load_install($module->name); + if (module_hook($module->name, 'uninstall')) { + $form['modules'][$module->name]['name'] = array('#value' => $info['name'] ? $info['name'] : $module->name); + $form['modules'][$module->name]['description'] = array('#value' => t($info['description'])); + $options[$module->name] = ''; + } + } + + // Only build the rest of the form if there are any modules available to uninstall. + if (!empty($options)) { + $form['uninstall'] = array( + '#type' => 'checkboxes', + '#options' => $options, + ); + $form['buttons']['submit'] = array( + '#type' => 'button', + '#value' => t('Uninstall'), + ); + $form['#multistep'] = TRUE; + $form['#action'] = url('admin/build/modules/uninstall/confirm'); + } + else { + $form['modules'] = array(); + } + + return $form; +} + +/** + * Confirm uninstall of selected modules. + * + * @param + * $form_values Submitted form values. + * @return + * A form array representing modules to confirm. + */ +function system_modules_uninstall_confirm_form($form_values) { + // Nothing to build. + if (!isset($form_values)) { + return; + } + + // Construct the hidden form elements and list items. + foreach (array_filter($form_values['uninstall']) as $module => $value) { + $info = drupal_parse_info_file(dirname(drupal_get_filename('module', $module)) .'/'. $module .'.info'); + $uninstall[] = $info['name']; + $form['uninstall'][$module] = array('#type' => 'hidden', + '#value' => 1, + ); + } + + // Display a confirm form if modules have been selected. + if (isset($uninstall)) { + $form['uninstall']['#tree'] = TRUE; + $form['#multistep'] = TRUE; + $form['modules'] = array('#value' => '

'. t('The following modules will be completely uninstalled from your site, and all data from these modules will be lost!') .'

'. theme('item_list', $uninstall)); + $form = confirm_form( + $form, + t('Confirm uninstall'), + 'admin/build/modules/uninstall', + t('Would you like to continue with uninstalling the above?'), + t('Uninstall'), + t('Cancel')); + return $form; + } +} + +/** + * Themes a table of currently disabled modules. + * + * @param + * $form The form array representing the currently disabled modules. + * @return + * An HTML string representing the table. + */ +function theme_system_modules_uninstall($form) { + // No theming for the confirm form. + if (isset($form['confirm'])) { + return drupal_render($form); + } + + // Table headers. + $header = array(t('Uninstall'), + t('Name'), + t('Description'), + ); + + // Display table. + $rows = array(); + foreach (element_children($form['modules']) as $module) { + $rows[] = array( + array('data' => drupal_render($form['uninstall'][$module]), 'align' => 'center'), + ''. drupal_render($form['modules'][$module]['name']) .'', + array('data' => drupal_render($form['modules'][$module]['description']), 'class' => 'description'), + ); + } + + // Only display table if there are modules that can be uninstalled. + if (empty($rows)) { + $rows[] = array(array('data' => t('No modules are available to uninstall.'), 'colspan' => '3', 'align' => 'center', 'class' => 'message')); + } + + $output = theme('table', $header, $rows); + $output .= drupal_render($form); + + return $output; +} + +/** + * Validates the submitted uninstall form. + * + * @param + * $form_id The form ID. + * @param + * $form_values Submitted form values. + */ +function system_modules_uninstall_validate($form_id, $form_values) { + // Form submitted, but no modules selected. + if (!count(array_filter($form_values['uninstall']))) { + drupal_set_message(t('No modules selected.'), 'error'); + drupal_goto('admin/build/modules/uninstall'); + } +} + +/** + * Processes the submitted uninstall form. + * + * @param + * $form_id The form ID. + * @param + * $form_values Submitted form values. + */ +function system_modules_uninstall_submit($form_id, $form_values) { + // Make sure the install API is available. + include_once './includes/install.inc'; + + // Call the uninstall routine for each selected module. + foreach (array_filter($form_values['uninstall']) as $module => $value) { + drupal_uninstall_module($module); + } + drupal_set_message(t('The selected modules have been uninstalled.')); + drupal_goto('admin/build/modules/uninstall'); +} + +function system_site_information_settings() { + $form['site_name'] = array( + '#type' => 'textfield', + '#title' => t('Name'), + '#default_value' => variable_get('site_name', 'Drupal'), + '#description' => t('The name of this website.'), + '#required' => TRUE + ); + $form['site_mail'] = array( + '#type' => 'textfield', + '#title' => t('E-mail address'), + '#default_value' => variable_get('site_mail', ini_get('sendmail_from')), + '#description' => t('A valid e-mail address to be used as the "From" address by the auto-mailer during registration, new password requests, notifications, etc. To lessen the likelihood of e-mail being marked as spam, this e-mail address should use the same domain as the website.'), + '#required' => TRUE, + ); + $form['site_slogan'] = array( + '#type' => 'textfield', + '#title' => t('Slogan'), + '#default_value' => variable_get('site_slogan', ''), + '#description' => t('The slogan of this website. Some themes display a slogan when available.') + ); + + $form['site_mission'] = array( + '#type' => 'textarea', + '#title' => t('Mission'), + '#default_value' => variable_get('site_mission', ''), + '#description' => t('Your site\'s mission statement or focus.') + ); + $form['site_footer'] = array( + '#type' => 'textarea', + '#title' => t('Footer message'), + '#default_value' => variable_get('site_footer', ''), + '#description' => t('This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages.') + ); + $form['anonymous'] = array( + '#type' => 'textfield', + '#title' => t('Anonymous user'), + '#default_value' => variable_get('anonymous', t('Anonymous')), + '#description' => t('The name used to indicate anonymous users.') + ); + $form['site_frontpage'] = array( + '#type' => 'textfield', + '#title' => t('Default front page'), + '#default_value' => variable_get('site_frontpage', 'node'), + '#size' => 40, + '#description' => t('The home page displays content from this relative URL. If unsure, specify "node".'), + '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=') + ); + + return system_settings_form($form); +} + +function system_error_reporting_settings() { + + $form['site_403'] = array( + '#type' => 'textfield', + '#title' => t('Default 403 (access denied) page'), + '#default_value' => variable_get('site_403', ''), + '#size' => 40, + '#description' => t('This page is displayed when the requested document is denied to the current user. If unsure, specify nothing.'), + '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=') + ); + + $form['site_404'] = array( + '#type' => 'textfield', + '#title' => t('Default 404 (not found) page'), + '#default_value' => variable_get('site_404', ''), + '#size' => 40, + '#description' => t('This page is displayed when no other content matches the requested document. If unsure, specify nothing.'), + '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=') + ); + + $form['error_level'] = array( + '#type' => 'select', '#title' => t('Error reporting'), '#default_value' => variable_get('error_level', 1), + '#options' => array(t('Write errors to the log'), t('Write errors to the log and to the screen')), + '#description' => t('Where Drupal, PHP and SQL errors are logged. On a production server it is recommended that errors are only written to the error log. On a test server it can be helpful to write logs to the screen.') + ); + + return system_settings_form($form); +} + +function system_performance_settings() { + + $description = '

'. t("The normal cache mode is suitable for most sites and does not cause any side effects. The aggressive cache mode causes Drupal to skip the loading (init) and unloading (exit) of enabled modules when serving a cached page. This results in an additional performance boost but can cause unwanted side effects.") .'

'; + + $problem_modules = array_unique(array_merge(module_implements('init'), module_implements('exit'))); + sort($problem_modules); + + if (count($problem_modules) > 0) { + $description .= '

'. t('The following enabled modules are incompatible with aggressive mode caching and will not function properly: %modules', array('%modules' => implode(', ', $problem_modules))) .'.

'; + } + else { + $description .= '

'. t('Currently, all enabled modules are compatible with the aggressive caching policy. Please note, if you use aggressive caching and enable new modules, you will need to check this page again to ensure compatibility.') .'

'; + } + $form['page_cache'] = array( + '#type' => 'fieldset', + '#title' => t('Page cache'), + '#description' => t('Enabling the cache will offer a significant performance boost. Drupal can store and send compressed cached pages requested by anonymous users. By caching a web page, Drupal does not have to construct the page each time someone wants to view it.'), + ); + + $form['page_cache']['cache'] = array( + '#type' => 'radios', + '#title' => t('Caching mode'), + '#default_value' => variable_get('cache', CACHE_DISABLED), + '#options' => array(CACHE_DISABLED => t('Disabled'), CACHE_NORMAL => t('Normal (recommended, no side effects)'), CACHE_AGGRESSIVE => t('Aggressive (experts only, possible side effects)')), + '#description' => $description + ); + + $period = drupal_map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400), 'format_interval'); + $period[0] = t('none'); + $form['page_cache']['cache_lifetime'] = array( + '#type' => 'select', + '#title' => t('Minimum cache lifetime'), + '#default_value' => variable_get('cache_lifetime', 0), + '#options' => $period, + '#description' => t('On high-traffic sites it can become necessary to enforce a minimum cache lifetime. The minimum cache lifetime is the minimum amount of time that will go by before the cache is emptied and recreated. A larger minimum cache lifetime offers better performance, but users will not see new content for a longer period of time.') + ); + + $form['bandwidth_optimizations'] = array( + '#type' => 'fieldset', + '#title' => t('Bandwidth optimizations'), + '#description' => t('These options can help reduce both the size and number of requests made to your website. This can reduce the server load, the bandwidth used, and the average page loading time for your visitors.') + ); + + $directory = file_directory_path(); + $is_writable = is_dir($directory) && is_writable($directory) && (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PUBLIC); + $form['bandwidth_optimizations']['preprocess_css'] = array( + '#type' => 'radios', + '#title' => t('Aggregate and compress CSS files'), + '#default_value' => variable_get('preprocess_css', FALSE) && $is_writable, + '#disabled' => !$is_writable, + '#options' => array(t('Disabled'), t('Enabled')), + '#description' => t("Some Drupal modules include their own CSS files. When these modules are enabled, each module's CSS file adds an additional HTTP request to the page, which can increase the load time of each page. These HTTP requests can also slightly increase server load. It is recommended to only turn this option on when your site is in production, as it can interfere with theme development. This option is disabled if you have not set up your files directory, or if your download method is set to private."), + ); + + $form['#submit']['system_settings_form_submit'] = array(); + $form['#submit']['drupal_clear_css_cache'] = array(); + + return system_settings_form($form); +} + +function system_file_system_settings() { + + $form['file_directory_path'] = array( + '#type' => 'textfield', + '#title' => t('File system path'), + '#default_value' => file_directory_path(), + '#maxlength' => 255, + '#description' => t('A file system path where the files will be stored. This directory has to exist and be writable by Drupal. If the download method is set to public this directory has to be relative to the Drupal installation directory, and be accessible over the web. When download method is set to private this directory should not be accessible over the web. Changing this location after the site has been in use will cause problems so only change this setting on an existing site if you know what you are doing.'), + '#after_build' => array('system_check_directory'), + ); + + $form['file_directory_temp'] = array( + '#type' => 'textfield', + '#title' => t('Temporary directory'), + '#default_value' => file_directory_temp(), + '#maxlength' => 255, + '#description' => t('Location where uploaded files will be kept during previews. Relative paths will be resolved relative to the Drupal installation directory.'), + '#after_build' => array('system_check_directory'), + ); + + $form['file_downloads'] = array( + '#type' => 'radios', + '#title' => t('Download method'), + '#default_value' => variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC), + '#options' => array(FILE_DOWNLOADS_PUBLIC => t('Public - files are available using HTTP directly.'), FILE_DOWNLOADS_PRIVATE => t('Private - files are transferred by Drupal.')), + '#description' => t('If you want any sort of access control on the downloading of files, this needs to be set to private. You can change this at any time, however all download URLs will change and there may be unexpected problems so it is not recommended.') + ); + + return system_settings_form($form); +} + +function system_image_toolkit_settings() { + $toolkits_available = image_get_available_toolkits(); + if (count($toolkits_available) > 1) { + $form['image_toolkit'] = array( + '#type' => 'radios', + '#title' => t('Select an image processing toolkit'), + '#default_value' => variable_get('image_toolkit', image_get_toolkit()), + '#options' => $toolkits_available + ); + } + else { + $form['image_toolkit'] = array('#value' => '

'. t("No image toolkits found. Drupal will use PHP's built-in GD library for image handling.") .'

'); + } + $form['image_toolkit_settings'] = image_toolkit_invoke('settings'); + return system_settings_form($form); +} + +function system_rss_feeds_settings() { + + $form['feed_default_items'] = array( + '#type' => 'select', + '#title' => t('Number of items per feed'), + '#default_value' => variable_get('feed_default_items', 10), + '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), + '#description' => t('The default number of items to include in a feed.') + ); + $form['feed_item_length'] = array( + '#type' => 'select', + '#title' => t('Display of XML feed items'), + '#default_value' => variable_get('feed_item_length', 'teaser'), + '#options' => array('title' => t('Titles only'), 'teaser' => t('Titles plus teaser'), 'fulltext' => t('Full text')), + '#description' => t('Global setting for the length of XML feed items that are output by default.') + ); + + return system_settings_form($form); +} + +function system_date_time_settings() { + // Date settings: + $zones = _system_zonelist(); + + // Date settings: possible date formats + $dateshort = array('Y-m-d H:i', 'm/d/Y - H:i', 'd/m/Y - H:i', 'Y/m/d - H:i', + 'd.m.Y - H:i', 'm/d/Y - g:ia', 'd/m/Y - g:ia', 'Y/m/d - g:ia', + 'M j Y - H:i', 'j M Y - H:i', 'Y M j - H:i', + 'M j Y - g:ia', 'j M Y - g:ia', 'Y M j - g:ia'); + $datemedium = array('D, Y-m-d H:i', 'D, m/d/Y - H:i', 'D, d/m/Y - H:i', + 'D, Y/m/d - H:i', 'F j, Y - H:i', 'j F, Y - H:i', 'Y, F j - H:i', + 'D, m/d/Y - g:ia', 'D, d/m/Y - g:ia', 'D, Y/m/d - g:ia', + 'F j, Y - g:ia', 'j F Y - g:ia', 'Y, F j - g:ia', 'j. F Y - G:i'); + $datelong = array('l, F j, Y - H:i', 'l, j F, Y - H:i', 'l, Y, F j - H:i', + 'l, F j, Y - g:ia', 'l, j F Y - g:ia', 'l, Y, F j - g:ia', 'l, j. F Y - G:i'); + + // Date settings: construct choices for user + foreach ($dateshort as $f) { + $dateshortchoices[$f] = format_date(time(), 'custom', $f); + } + foreach ($datemedium as $f) { + $datemediumchoices[$f] = format_date(time(), 'custom', $f); + } + foreach ($datelong as $f) { + $datelongchoices[$f] = format_date(time(), 'custom', $f); + } + + $form['date_default_timezone'] = array( + '#type' => 'select', + '#title' => t('Default time zone'), + '#default_value' => variable_get('date_default_timezone', 0), + '#options' => $zones, + '#description' => t('Select the default site time zone.') + ); + + $form['configurable_timezones'] = array( + '#type' => 'radios', + '#title' => t('Configurable time zones'), + '#default_value' => variable_get('configurable_timezones', 1), + '#options' => array(t('Disabled'), t('Enabled')), + '#description' => t('Enable or disable user-configurable time zones. When enabled, users can set their own time zone and dates will be updated accordingly.') + ); + + $form['date_format_short'] = array( + '#type' => 'select', + '#title' => t('Short date format'), + '#default_value' => variable_get('date_format_short', $dateshort[1]), + '#options' => $dateshortchoices, + '#description' => t('The short format of date display.') + ); + + $form['date_format_medium'] = array( + '#type' => 'select', + '#title' => t('Medium date format'), + '#default_value' => variable_get('date_format_medium', $datemedium[1]), + '#options' => $datemediumchoices, + '#description' => t('The medium sized date display.') + ); + + $form['date_format_long'] = array( + '#type' => 'select', + '#title' => t('Long date format'), + '#default_value' => variable_get('date_format_long', $datelong[0]), + '#options' => $datelongchoices, + '#description' => t('Longer date format used for detailed display.') + ); + + $form['date_first_day'] = array( + '#type' => 'select', + '#title' => t('First day of week'), + '#default_value' => variable_get('date_first_day', 0), + '#options' => array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), + '#description' => t('The first day of the week for calendar views.') + ); + + return system_settings_form($form); +} + +function system_site_maintenance_settings() { + + $form['site_offline'] = array( + '#type' => 'radios', + '#title' => t('Site status'), + '#default_value' => variable_get('site_offline', 0), + '#options' => array(t('Online'), t('Off-line')), + '#description' => t('When set to "Online", all visitors will be able to browse your site normally. When set to "Off-line", only users with the "administer site configuration" permission will be able to access your site to perform maintenance; all other visitors will see the site off-line message configured below. Authorized users can log in during "Off-line" mode directly via the user login page.', array('@user-login' => url('user'))), + ); + + $form['site_offline_message'] = array( + '#type' => 'textarea', + '#title' => t('Site off-line message'), + '#default_value' => variable_get('site_offline_message', t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal')))), + '#description' => t('Message to show visitors when the site is in off-line mode.') + ); + + return system_settings_form($form); +} + + +function system_clean_url_settings() { + $form['clean_url'] = array( + '#type' => 'radios', + '#title' => t('Clean URLs'), + '#default_value' => variable_get('clean_url', 0), + '#options' => array(t('Disabled'), t('Enabled')), + '#description' => t('This option makes Drupal emit "clean" URLs (i.e. without ?q= in the URL).'), + ); + + if (!variable_get('clean_url', 0)) { + if (strpos(request_uri(), '?q=') !== FALSE) { + drupal_add_js(array('cleanURL' => array('success' => t('Your server has been successfully tested to support this feature.'), 'failure' => t('Your system configuration does not currently support this feature. The handbook page on Clean URLs has additional troubleshooting information.'), 'testing' => t('Testing clean URLs...'))), 'setting'); + drupal_add_js(drupal_get_path('module', 'system') .'/system.js', 'module'); + drupal_add_js(' +// Global Killswitch +if (Drupal.jsEnabled) { + $(document).ready(function() { + Drupal.cleanURLsSettingsCheck(); + }); +}', 'inline'); + + $form['clean_url']['#description'] .= ' '. t('Before enabling clean URLs, you must perform a test to determine if your server is properly configured. If you are able to see this page again after clicking the "Run the clean URL test" link, the test has succeeded and the radio buttons above will be available. If instead you are directed to a "Page not found" error, you will need to change the configuration of your server. The handbook page on Clean URLs has additional troubleshooting information.', array('@handbook' => 'http://drupal.org/node/15365')) .''; + + $form['clean_url']['#disabled'] = TRUE; + $form['clean_url']['#prefix'] = '
'; + $form['clean_url']['#suffix'] = '

'. t('Run the clean url test.', array('@clean_url' => base_path() .'admin/settings/clean-urls')) .'

'; + } + else { + $form['clean_url']['#description'] .= ' '. t('Your server has been successfully tested to support this feature.'); + } + } + + return system_settings_form($form); +} + +/** + * Theme output of the dashboard page. + */ +function theme_system_admin_by_module($menu_items) { + $stripe = 0; + $output = ''; + $container = array(); + + // Iterate over all modules + foreach ($menu_items as $module => $block) { + list($description, $items) = $block; + + // Output links + if (count($items)) { + $block = array(); + $block['title'] = $module; + $block['content'] = theme('item_list', $items); + $block['description'] = t($description); + + if ($block_output = theme('admin_block', $block)) { + if (!$block['position']) { + // Perform automatic striping. + $block['position'] = ++$stripe % 2 ? 'left' : 'right'; + } + $container[$block['position']] .= $block_output; + } + } + } + + $output = '
'; + foreach ($container as $id => $data) { + $output .= '
'; + $output .= $data; + $output .= '
'; + } + $output .= '
'; + + return $output; +} Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.103 diff -u -p -r1.103 system.install --- modules/system/system.install 9 May 2007 11:39:23 -0000 1.103 +++ modules/system/system.install 10 May 2007 07:25:49 -0000 @@ -368,6 +368,7 @@ function system_install() { fragment varchar(255) NOT NULL default '', absolute INT NOT NULL default 0, html INT NOT NULL default 0, + file mediumtext NOT NULL default '', PRIMARY KEY (path), KEY fit (fit), KEY visible (visible), @@ -853,6 +854,7 @@ function system_install() { fragment varchar(255) NOT NULL default '', absolute INT NOT NULL default 0, html INT NOT NULL default 0, + file text NOT NULL default '', PRIMARY KEY (path) )"); @@ -3873,6 +3875,25 @@ function system_update_6013() { system_theme_data(); } +/** + * Add module column to menu table + */ +function system_update_6014() { + $ret = array(); + + switch ($GLOBALS['db_type']) { + case 'pgsql': + db_add_column($ret, 'menu', 'file', 'text', array('default' => "''", 'not null' => TRUE)); + break; + case 'mysql': + case 'mysqli': + $ret[] = update_sql("ALTER TABLE {menu} ADD file mediumtext NOT NULL default ''"); + break; + } + + return $ret; +} + /** * @} End of "defgroup updates-5.x-to-6.x" Index: modules/system/system.logs.inc =================================================================== RCS file: modules/system/system.logs.inc diff -N modules/system/system.logs.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/system/system.logs.inc 10 May 2007 07:25:49 -0000 @@ -0,0 +1,149 @@ + $explanation) { + if (isset($data[$key])) { + $rows[] = array(check_plain($key), check_plain($data[$key]), $explanation); + } + } + + return theme('table', array(t('Variable'), t('Value'), t('Description')), $rows); +} + +/** + * Menu callback: return information about PHP. + */ +function system_sql() { + + $result = db_query("SHOW STATUS"); + while ($entry = db_fetch_object($result)) { + $data[$entry->Variable_name] = $entry->Value; + } + + $output = '

'. t('Command counters') .'

'; + $output .= _system_sql($data, array( + 'Com_select' => t('The number of SELECT-statements.'), + 'Com_insert' => t('The number of INSERT-statements.'), + 'Com_update' => t('The number of UPDATE-statements.'), + 'Com_delete' => t('The number of DELETE-statements.'), + 'Com_lock_tables' => t('The number of table locks.'), + 'Com_unlock_tables' => t('The number of table unlocks.') + )); + + $output .= '

'. t('Query performance') .'

'; + $output .= _system_sql($data, array( + 'Select_full_join' => t('The number of joins without an index; should be zero.'), + 'Select_range_check' => t('The number of joins without an index; should be zero.'), + 'Sort_scan' => t('The number of sorts done without using an index; should be zero.'), + 'Table_locks_immediate' => t('The number of times a lock could be acquired immediately.'), + 'Table_locks_waited' => t('The number of times the server had to wait for a lock.') + )); + + $output .= '

'. t('Query cache information') .'

'; + $output .= '

'. t('The MySQL query cache can improve performance of your site by storing the result of queries. Then, if an identical query is received later, the MySQL server retrieves the result from the query cache rather than parsing and executing the statement again.') .'

'; + $output .= _system_sql($data, array( + 'Qcache_queries_in_cache' => t('The number of queries in the query cache.'), + 'Qcache_hits' => t('The number of times that MySQL found previous results in the cache.'), + 'Qcache_inserts' => t('The number of times that MySQL added a query to the cache (misses).'), + 'Qcache_lowmem_prunes' => t('The number of times that MySQL had to remove queries from the cache because it ran out of memory. Ideally should be zero.') + )); + + return $output; +} + +/** + * Theme status report + */ +function theme_status_report(&$requirements) { + $i = 0; + $output = ''; + foreach ($requirements as $requirement) { + if (empty($requirement['#type'])) { + $class = ++$i % 2 == 0 ? 'even' : 'odd'; + + $classes = array( + REQUIREMENT_INFO => 'info', + REQUIREMENT_OK => 'ok', + REQUIREMENT_WARNING => 'warning', + REQUIREMENT_ERROR => 'error', + ); + $class = $classes[isset($requirement['severity']) ? (int)$requirement['severity'] : 0] .' '. $class; + + // Output table row(s) + if (!empty($requirement['description'])) { + $output .= ''; + $output .= ''; + } + else { + $output .= ''; + } + } + } + + $output .= '
'. $requirement['title'] .''. $requirement['value'] .'
'. $requirement['description'] .'
'. $requirement['title'] .''. $requirement['value'] .'
'; + return $output; +} + + + +/** + * Implementation of hook_cron(). + * + * Remove older rows from flood table + */ +function system_cron() { + // Cleanup the flood + db_query('DELETE FROM {flood} WHERE timestamp < %d', time() - 3600); + // Cleanup the batch table + db_query('DELETE FROM {batch} WHERE timestamp < %d', time() - 864000); +} + +/** + * Default page callback for batches. + */ +function system_batch_page() { + require_once './includes/batch.inc'; + $output = _batch_page(); + if ($output === FALSE) { + drupal_access_denied(); + } + else { + // Force a page without blocks or messages to + // display a list of collected messages later. + print theme('page', $output, FALSE, FALSE); + } +} + +function system_logging_overview() { + $item = menu_get_item('admin/settings/logging'); + $content = system_admin_menu_block($item); + + $output = theme('admin_block_content', $content); + + return $output; +} Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.474 diff -u -p -r1.474 system.module --- modules/system/system.module 6 May 2007 05:47:52 -0000 1.474 +++ modules/system/system.module 10 May 2007 07:25:49 -0000 @@ -134,22 +134,26 @@ function system_menu() { 'access arguments' => array('access administration pages'), 'page callback' => 'system_main_admin_page', 'weight' => 9, + 'file' => 'system.admin.inc', ); $items['admin/compact'] = array( 'title' => 'Compact mode', 'page callback' => 'system_admin_compact_page', 'type' => MENU_CALLBACK, + 'file' => 'system.admin.inc', ); $items['admin/by-task'] = array( 'title' => 'By task', 'page callback' => 'system_main_admin_page', 'type' => MENU_DEFAULT_LOCAL_TASK, + 'file' => 'system.admin.inc', ); $items['admin/by-module'] = array( 'title' => 'By module', 'page callback' => 'system_admin_by_module', 'type' => MENU_LOCAL_TASK, 'weight' => 2, + 'file' => 'system.admin.inc', ); // menu items that are basically just menu blocks $items['admin/settings'] = array( @@ -159,6 +163,7 @@ function system_menu() { 'weight' => -5, 'page callback' => 'system_settings_overview', 'access arguments' => array('administer site configuration'), + 'file' => 'system.admin.inc', ); $items['admin/build'] = array( 'title' => 'Site building', @@ -167,6 +172,7 @@ function system_menu() { 'weight' => -10, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('administer site configuration'), + 'file' => 'system.admin.inc', ); $items['admin/settings/admin'] = array( 'title' => 'Administration theme', @@ -175,6 +181,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_admin_theme_settings'), 'block callback' => 'system_admin_theme_settings', + 'file' => 'system.theme.inc', ); // Themes: $items['admin/build/themes'] = array( @@ -182,23 +189,27 @@ function system_menu() { 'description' => 'Change which theme your site uses or allows users to set.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_themes_form'), + 'file' => 'system.theme.inc', ); $items['admin/build/themes/select'] = array( 'title' => 'List', 'description' => 'Select the default theme.', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1, + 'file' => 'system.theme.inc', ); $items['admin/build/themes/settings'] = array( 'title' => 'Configure', 'page arguments' => array('system_theme_settings'), 'type' => MENU_LOCAL_TASK, + 'file' => 'system.theme.inc', ); // Theme configuration subtabs $items['admin/build/themes/settings/global'] = array( 'title' => 'Global settings', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1, + 'file' => 'system.theme.inc', ); foreach (list_themes() as $theme) { @@ -207,6 +218,7 @@ function system_menu() { 'title' => $theme->info['name'], 'page arguments' => array('system_theme_settings', $theme->name), 'type' => MENU_LOCAL_TASK, + 'file' => 'system.theme.inc', ); } } @@ -217,6 +229,7 @@ function system_menu() { 'description' => 'Enable or disable add-on modules for your site.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_modules'), + 'file' => 'system.admin.inc', ); $items['admin/build/modules/list'] = array( 'title' => 'List', @@ -230,6 +243,7 @@ function system_menu() { 'title' => 'Uninstall', 'page arguments' => array('system_modules_uninstall'), 'type' => MENU_LOCAL_TASK, + 'file' => 'system.admin.inc', ); $items['admin/build/modules/uninstall/confirm'] = array( 'title' => 'Uninstall', @@ -242,59 +256,69 @@ function system_menu() { 'description' => 'Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_site_information_settings'), + 'file' => 'system.admin.inc', ); $items['admin/settings/error-reporting'] = array( 'title' => 'Error reporting', 'description' => 'Control how Drupal deals with errors including 403/404 errors as well as PHP error reporting.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_error_reporting_settings'), + 'file' => 'system.admin.inc', ); $items['admin/settings/logging'] = array( 'title' => 'Logging and alerts', 'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destination, such as syslog, database, email, ...etc.", 'page callback' => 'system_logging_overview', + 'file' => 'system.admin.inc', ); $items['admin/settings/performance'] = array( 'title' => 'Performance', 'description' => 'Enable or disable page caching for anonymous users, and enable or disable CSS preprocessor.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_performance_settings'), + 'file' => 'system.admin.inc', ); $items['admin/settings/file-system'] = array( 'title' => 'File system', 'description' => 'Tell Drupal where to store uploaded files and how they are accessed.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_file_system_settings'), + 'file' => 'system.admin.inc', ); $items['admin/settings/image-toolkit'] = array( 'title' => 'Image toolkit', 'description' => 'Choose which image toolkit to use if you have installed optional toolkits.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_image_toolkit_settings'), + 'file' => 'system.admin.inc', ); $items['admin/content/rss-publishing'] = array( 'title' => 'RSS publishing', 'description' => 'Configure the number of items per feed and whether feeds should be titles/teasers/full-text.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_rss_feeds_settings'), + 'file' => 'system.admin.inc', ); $items['admin/settings/date-time'] = array( 'title' => 'Date and time', 'description' => "Settings for how Drupal displays date and time, as well as the system's default timezone.", 'page callback' => 'drupal_get_form', 'page arguments' => array('system_date_time_settings'), + 'file' => 'system.admin.inc', ); $items['admin/settings/site-maintenance'] = array( 'title' => 'Site maintenance', 'description' => 'Take the site off-line for maintenance or bring it back online.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_site_maintenance_settings'), + 'file' => 'system.admin.inc', ); $items['admin/settings/clean-urls'] = array( 'title' => 'Clean URLs', 'description' => 'Enable or disable clean URLs for your site.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_clean_url_settings'), + 'file' => 'system.admin.inc', ); // Logs: @@ -304,6 +328,7 @@ function system_menu() { 'page callback' => 'system_admin_menu_block_page', 'weight' => 5, 'position' => 'left', + 'file' => 'system.admin.inc', ); $items['admin/logs/status'] = array( 'title' => 'Status report', @@ -311,27 +336,32 @@ function system_menu() { 'page callback' => 'system_status', 'weight' => 10, 'access arguments' => array('administer site configuration'), + 'file' => 'system.logs.inc', ); $items['admin/logs/status/run-cron'] = array( 'title' => 'Run cron', 'page callback' => 'system_run_cron', 'type' => MENU_CALLBACK, + 'file' => 'system.logs.inc', ); $items['admin/logs/status/php'] = array( 'title' => 'PHP', 'page callback' => 'system_php', 'type' => MENU_CALLBACK, + 'file' => 'system.logs.inc', ); $items['admin/logs/status/sql'] = array( 'title' => 'SQL', 'page callback' => 'system_sql', 'type' => MENU_CALLBACK, + 'file' => 'system.logs.inc', ); // Default page for batch operations $items['batch'] = array( 'page callback' => 'system_batch_page', 'access callback' => TRUE, 'type' => MENU_CALLBACK, + 'file' => 'system.logs.inc', ); return $items; } @@ -379,117 +409,6 @@ function system_user($type, $edit, &$use } } -/** - * Provide the administration overview page. - */ -function system_main_admin_page($arg = NULL) { - // If we received an argument, they probably meant some other page. - // Let's 404 them since the menu system cannot be told we do not - // accept arguments. - if (isset($arg) && substr($arg, 0, 3) != 'by-') { - return drupal_not_found(); - } - - // Check for status report errors. - if (system_status(TRUE)) { - drupal_set_message(t('One or more problems were detected with your Drupal installation. Check the status report for more information.', array('@status' => url('admin/logs/status'))), 'error'); - } - - $map = arg(NULL); - $result = db_query("SELECT * FROM {menu} WHERE path LIKE 'admin/%%' AND depth = 2 AND visible = 1 AND path != 'admin/help' ORDER BY mleft"); - while ($item = db_fetch_object($result)) { - _menu_translate($item, $map, MENU_RENDER_LINK); - if (!$item->access) { - continue; - } - $block = (array)$item; - $block['content'] = ''; - if ($item->block_callback && function_exists($item->block_callback)) { - $function = $item->block_callback; - $block['content'] .= $function(); - } - $block['content'] .= theme('admin_block_content', system_admin_menu_block($item)); - $blocks[] = $block; - } - return theme('admin_page', $blocks); -} - -/** - * Provide a single block on the administration overview page. - */ -function system_admin_menu_block($item) { - $map = arg(NULL); - $content = array(); - $result = db_query('SELECT * FROM {menu} WHERE depth = %d AND %d < mleft AND mright < %d AND visible = 1 ORDER BY mleft', $item->depth + 1, $item->mleft, $item->mright); - while ($item = db_fetch_object($result)) { - _menu_translate($item, $map, MENU_RENDER_LINK); - if (!$item->access) { - continue; - } - $content[] = (array)$item; - } - return $content; -} - -/** - * Provide a single block from the administration menu as a page. - * This function is often a destination for these blocks. - * For example, 'admin/content/types' needs to have a destination to be valid - * in the Drupal menu system, but too much information there might be - * hidden, so we supply the contents of the block. - */ -function system_admin_menu_block_page() { - $item = menu_get_item(); - $content = system_admin_menu_block($item); - - $output = theme('admin_block_content', $content); - return $output; -} - -function system_admin_compact_page($mode = 'off') { - global $user; - user_save($user, array('admin_compact_mode' => ($mode == 'on'))); - drupal_goto('admin'); -} - -/** - * This function allows selection of the theme to show in administration sections. - */ -function system_admin_theme_settings() { - $themes = system_theme_data(); - ksort($themes); - $options[0] = t('System default'); - foreach ($themes as $theme) { - $options[$theme->name] = $theme->info['name']; - } - - $form['admin_theme'] = array( - '#type' => 'select', - '#options' => $options, - '#title' => t('Administration theme'), - '#description' => t('Choose which theme the administration pages should display in. If you choose "System default" the administration pages will use the same theme as the rest of the site.'), - '#default_value' => variable_get('admin_theme', '0'), - ); - - // In order to give it our own submit, we have to give it the default submit - // too because the presence of a #submit will prevent the default #submit - // from being used. Also we want ours first. - $form['#submit']['system_admin_theme_submit'] = array(); - $form['#submit']['system_settings_form_submit'] = array(); - return system_settings_form($form); -} - - -function system_admin_theme_submit($form_id, $form_values) { - // If we're changing themes, make sure the theme has its blocks initialized. - if ($form_values['admin_theme'] != variable_get('admin_theme', '0')) { - $result = db_query("SELECT status FROM {blocks} WHERE theme = '%s'", $form_values['admin_theme']); - if (!db_num_rows($result)) { - system_initialize_theme_blocks($form_values['admin_theme']); - } - } -} - /* * Returns a fieldset containing the theme select form. * @@ -579,348 +498,6 @@ function _system_zonelist() { return $zones; } -function system_site_information_settings() { - $form['site_name'] = array( - '#type' => 'textfield', - '#title' => t('Name'), - '#default_value' => variable_get('site_name', 'Drupal'), - '#description' => t('The name of this website.'), - '#required' => TRUE - ); - $form['site_mail'] = array( - '#type' => 'textfield', - '#title' => t('E-mail address'), - '#default_value' => variable_get('site_mail', ini_get('sendmail_from')), - '#description' => t('A valid e-mail address to be used as the "From" address by the auto-mailer during registration, new password requests, notifications, etc. To lessen the likelihood of e-mail being marked as spam, this e-mail address should use the same domain as the website.'), - '#required' => TRUE, - ); - $form['site_slogan'] = array( - '#type' => 'textfield', - '#title' => t('Slogan'), - '#default_value' => variable_get('site_slogan', ''), - '#description' => t('The slogan of this website. Some themes display a slogan when available.') - ); - - $form['site_mission'] = array( - '#type' => 'textarea', - '#title' => t('Mission'), - '#default_value' => variable_get('site_mission', ''), - '#description' => t('Your site\'s mission statement or focus.') - ); - $form['site_footer'] = array( - '#type' => 'textarea', - '#title' => t('Footer message'), - '#default_value' => variable_get('site_footer', ''), - '#description' => t('This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages.') - ); - $form['anonymous'] = array( - '#type' => 'textfield', - '#title' => t('Anonymous user'), - '#default_value' => variable_get('anonymous', t('Anonymous')), - '#description' => t('The name used to indicate anonymous users.') - ); - $form['site_frontpage'] = array( - '#type' => 'textfield', - '#title' => t('Default front page'), - '#default_value' => variable_get('site_frontpage', 'node'), - '#size' => 40, - '#description' => t('The home page displays content from this relative URL. If unsure, specify "node".'), - '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=') - ); - - return system_settings_form($form); -} - -function system_clean_url_settings() { - $form['clean_url'] = array( - '#type' => 'radios', - '#title' => t('Clean URLs'), - '#default_value' => variable_get('clean_url', 0), - '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('This option makes Drupal emit "clean" URLs (i.e. without ?q= in the URL).'), - ); - - if (!variable_get('clean_url', 0)) { - if (strpos(request_uri(), '?q=') !== FALSE) { - drupal_add_js(array('cleanURL' => array('success' => t('Your server has been successfully tested to support this feature.'), 'failure' => t('Your system configuration does not currently support this feature. The handbook page on Clean URLs has additional troubleshooting information.'), 'testing' => t('Testing clean URLs...'))), 'setting'); - drupal_add_js(drupal_get_path('module', 'system') .'/system.js', 'module'); - drupal_add_js(' -// Global Killswitch -if (Drupal.jsEnabled) { - $(document).ready(function() { - Drupal.cleanURLsSettingsCheck(); - }); -}', 'inline'); - - $form['clean_url']['#description'] .= ' '. t('Before enabling clean URLs, you must perform a test to determine if your server is properly configured. If you are able to see this page again after clicking the "Run the clean URL test" link, the test has succeeded and the radio buttons above will be available. If instead you are directed to a "Page not found" error, you will need to change the configuration of your server. The handbook page on Clean URLs has additional troubleshooting information.', array('@handbook' => 'http://drupal.org/node/15365')) .''; - - $form['clean_url']['#disabled'] = TRUE; - $form['clean_url']['#prefix'] = '
'; - $form['clean_url']['#suffix'] = '

'. t('Run the clean url test.', array('@clean_url' => base_path() .'admin/settings/clean-urls')) .'

'; - } - else { - $form['clean_url']['#description'] .= ' '. t('Your server has been successfully tested to support this feature.'); - } - } - - return system_settings_form($form); -} - -function system_error_reporting_settings() { - - $form['site_403'] = array( - '#type' => 'textfield', - '#title' => t('Default 403 (access denied) page'), - '#default_value' => variable_get('site_403', ''), - '#size' => 40, - '#description' => t('This page is displayed when the requested document is denied to the current user. If unsure, specify nothing.'), - '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=') - ); - - $form['site_404'] = array( - '#type' => 'textfield', - '#title' => t('Default 404 (not found) page'), - '#default_value' => variable_get('site_404', ''), - '#size' => 40, - '#description' => t('This page is displayed when no other content matches the requested document. If unsure, specify nothing.'), - '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=') - ); - - $form['error_level'] = array( - '#type' => 'select', '#title' => t('Error reporting'), '#default_value' => variable_get('error_level', 1), - '#options' => array(t('Write errors to the log'), t('Write errors to the log and to the screen')), - '#description' => t('Where Drupal, PHP and SQL errors are logged. On a production server it is recommended that errors are only written to the error log. On a test server it can be helpful to write logs to the screen.') - ); - - return system_settings_form($form); -} - -function system_performance_settings() { - - $description = '

'. t("The normal cache mode is suitable for most sites and does not cause any side effects. The aggressive cache mode causes Drupal to skip the loading (init) and unloading (exit) of enabled modules when serving a cached page. This results in an additional performance boost but can cause unwanted side effects.") .'

'; - - $problem_modules = array_unique(array_merge(module_implements('init'), module_implements('exit'))); - sort($problem_modules); - - if (count($problem_modules) > 0) { - $description .= '

'. t('The following enabled modules are incompatible with aggressive mode caching and will not function properly: %modules', array('%modules' => implode(', ', $problem_modules))) .'.

'; - } - else { - $description .= '

'. t('Currently, all enabled modules are compatible with the aggressive caching policy. Please note, if you use aggressive caching and enable new modules, you will need to check this page again to ensure compatibility.') .'

'; - } - $form['page_cache'] = array( - '#type' => 'fieldset', - '#title' => t('Page cache'), - '#description' => t('Enabling the cache will offer a significant performance boost. Drupal can store and send compressed cached pages requested by anonymous users. By caching a web page, Drupal does not have to construct the page each time someone wants to view it.'), - ); - - $form['page_cache']['cache'] = array( - '#type' => 'radios', - '#title' => t('Caching mode'), - '#default_value' => variable_get('cache', CACHE_DISABLED), - '#options' => array(CACHE_DISABLED => t('Disabled'), CACHE_NORMAL => t('Normal (recommended, no side effects)'), CACHE_AGGRESSIVE => t('Aggressive (experts only, possible side effects)')), - '#description' => $description - ); - - $period = drupal_map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400), 'format_interval'); - $period[0] = t('none'); - $form['page_cache']['cache_lifetime'] = array( - '#type' => 'select', - '#title' => t('Minimum cache lifetime'), - '#default_value' => variable_get('cache_lifetime', 0), - '#options' => $period, - '#description' => t('On high-traffic sites it can become necessary to enforce a minimum cache lifetime. The minimum cache lifetime is the minimum amount of time that will go by before the cache is emptied and recreated. A larger minimum cache lifetime offers better performance, but users will not see new content for a longer period of time.') - ); - - $form['bandwidth_optimizations'] = array( - '#type' => 'fieldset', - '#title' => t('Bandwidth optimizations'), - '#description' => t('These options can help reduce both the size and number of requests made to your website. This can reduce the server load, the bandwidth used, and the average page loading time for your visitors.') - ); - - $directory = file_directory_path(); - $is_writable = is_dir($directory) && is_writable($directory) && (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PUBLIC); - $form['bandwidth_optimizations']['preprocess_css'] = array( - '#type' => 'radios', - '#title' => t('Aggregate and compress CSS files'), - '#default_value' => variable_get('preprocess_css', FALSE) && $is_writable, - '#disabled' => !$is_writable, - '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t("Some Drupal modules include their own CSS files. When these modules are enabled, each module's CSS file adds an additional HTTP request to the page, which can increase the load time of each page. These HTTP requests can also slightly increase server load. It is recommended to only turn this option on when your site is in production, as it can interfere with theme development. This option is disabled if you have not set up your files directory, or if your download method is set to private."), - ); - - $form['#submit']['system_settings_form_submit'] = array(); - $form['#submit']['drupal_clear_css_cache'] = array(); - - return system_settings_form($form); -} - -function system_file_system_settings() { - - $form['file_directory_path'] = array( - '#type' => 'textfield', - '#title' => t('File system path'), - '#default_value' => file_directory_path(), - '#maxlength' => 255, - '#description' => t('A file system path where the files will be stored. This directory has to exist and be writable by Drupal. If the download method is set to public this directory has to be relative to the Drupal installation directory, and be accessible over the web. When download method is set to private this directory should not be accessible over the web. Changing this location after the site has been in use will cause problems so only change this setting on an existing site if you know what you are doing.'), - '#after_build' => array('system_check_directory'), - ); - - $form['file_directory_temp'] = array( - '#type' => 'textfield', - '#title' => t('Temporary directory'), - '#default_value' => file_directory_temp(), - '#maxlength' => 255, - '#description' => t('Location where uploaded files will be kept during previews. Relative paths will be resolved relative to the Drupal installation directory.'), - '#after_build' => array('system_check_directory'), - ); - - $form['file_downloads'] = array( - '#type' => 'radios', - '#title' => t('Download method'), - '#default_value' => variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC), - '#options' => array(FILE_DOWNLOADS_PUBLIC => t('Public - files are available using HTTP directly.'), FILE_DOWNLOADS_PRIVATE => t('Private - files are transferred by Drupal.')), - '#description' => t('If you want any sort of access control on the downloading of files, this needs to be set to private. You can change this at any time, however all download URLs will change and there may be unexpected problems so it is not recommended.') - ); - - return system_settings_form($form); -} - -function system_image_toolkit_settings() { - $toolkits_available = image_get_available_toolkits(); - if (count($toolkits_available) > 1) { - $form['image_toolkit'] = array( - '#type' => 'radios', - '#title' => t('Select an image processing toolkit'), - '#default_value' => variable_get('image_toolkit', image_get_toolkit()), - '#options' => $toolkits_available - ); - } - else { - $form['image_toolkit'] = array('#value' => '

'. t("No image toolkits found. Drupal will use PHP's built-in GD library for image handling.") .'

'); - } - $form['image_toolkit_settings'] = image_toolkit_invoke('settings'); - return system_settings_form($form); -} - -function system_rss_feeds_settings() { - - $form['feed_default_items'] = array( - '#type' => 'select', - '#title' => t('Number of items per feed'), - '#default_value' => variable_get('feed_default_items', 10), - '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), - '#description' => t('The default number of items to include in a feed.') - ); - $form['feed_item_length'] = array( - '#type' => 'select', - '#title' => t('Display of XML feed items'), - '#default_value' => variable_get('feed_item_length', 'teaser'), - '#options' => array('title' => t('Titles only'), 'teaser' => t('Titles plus teaser'), 'fulltext' => t('Full text')), - '#description' => t('Global setting for the length of XML feed items that are output by default.') - ); - - return system_settings_form($form); -} - -function system_date_time_settings() { - // Date settings: - $zones = _system_zonelist(); - - // Date settings: possible date formats - $dateshort = array('Y-m-d H:i', 'm/d/Y - H:i', 'd/m/Y - H:i', 'Y/m/d - H:i', - 'd.m.Y - H:i', 'm/d/Y - g:ia', 'd/m/Y - g:ia', 'Y/m/d - g:ia', - 'M j Y - H:i', 'j M Y - H:i', 'Y M j - H:i', - 'M j Y - g:ia', 'j M Y - g:ia', 'Y M j - g:ia'); - $datemedium = array('D, Y-m-d H:i', 'D, m/d/Y - H:i', 'D, d/m/Y - H:i', - 'D, Y/m/d - H:i', 'F j, Y - H:i', 'j F, Y - H:i', 'Y, F j - H:i', - 'D, m/d/Y - g:ia', 'D, d/m/Y - g:ia', 'D, Y/m/d - g:ia', - 'F j, Y - g:ia', 'j F Y - g:ia', 'Y, F j - g:ia', 'j. F Y - G:i'); - $datelong = array('l, F j, Y - H:i', 'l, j F, Y - H:i', 'l, Y, F j - H:i', - 'l, F j, Y - g:ia', 'l, j F Y - g:ia', 'l, Y, F j - g:ia', 'l, j. F Y - G:i'); - - // Date settings: construct choices for user - foreach ($dateshort as $f) { - $dateshortchoices[$f] = format_date(time(), 'custom', $f); - } - foreach ($datemedium as $f) { - $datemediumchoices[$f] = format_date(time(), 'custom', $f); - } - foreach ($datelong as $f) { - $datelongchoices[$f] = format_date(time(), 'custom', $f); - } - - $form['date_default_timezone'] = array( - '#type' => 'select', - '#title' => t('Default time zone'), - '#default_value' => variable_get('date_default_timezone', 0), - '#options' => $zones, - '#description' => t('Select the default site time zone.') - ); - - $form['configurable_timezones'] = array( - '#type' => 'radios', - '#title' => t('Configurable time zones'), - '#default_value' => variable_get('configurable_timezones', 1), - '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('Enable or disable user-configurable time zones. When enabled, users can set their own time zone and dates will be updated accordingly.') - ); - - $form['date_format_short'] = array( - '#type' => 'select', - '#title' => t('Short date format'), - '#default_value' => variable_get('date_format_short', $dateshort[1]), - '#options' => $dateshortchoices, - '#description' => t('The short format of date display.') - ); - - $form['date_format_medium'] = array( - '#type' => 'select', - '#title' => t('Medium date format'), - '#default_value' => variable_get('date_format_medium', $datemedium[1]), - '#options' => $datemediumchoices, - '#description' => t('The medium sized date display.') - ); - - $form['date_format_long'] = array( - '#type' => 'select', - '#title' => t('Long date format'), - '#default_value' => variable_get('date_format_long', $datelong[0]), - '#options' => $datelongchoices, - '#description' => t('Longer date format used for detailed display.') - ); - - $form['date_first_day'] = array( - '#type' => 'select', - '#title' => t('First day of week'), - '#default_value' => variable_get('date_first_day', 0), - '#options' => array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), - '#description' => t('The first day of the week for calendar views.') - ); - - return system_settings_form($form); -} - -function system_site_maintenance_settings() { - - $form['site_offline'] = array( - '#type' => 'radios', - '#title' => t('Site status'), - '#default_value' => variable_get('site_offline', 0), - '#options' => array(t('Online'), t('Off-line')), - '#description' => t('When set to "Online", all visitors will be able to browse your site normally. When set to "Off-line", only users with the "administer site configuration" permission will be able to access your site to perform maintenance; all other visitors will see the site off-line message configured below. Authorized users can log in during "Off-line" mode directly via the user login page.', array('@user-login' => url('user'))), - ); - - $form['site_offline_message'] = array( - '#type' => 'textarea', - '#title' => t('Site off-line message'), - '#default_value' => variable_get('site_offline_message', t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal')))), - '#description' => t('Message to show visitors when the site is in off-line mode.') - ); - - return system_settings_form($form); -} - /** * Checks the existence of the directory specified in $form_element. This * function is called from the system_settings form to check both the @@ -1174,25 +751,6 @@ function system_settings_form($form) { return $form; } -function system_theme_settings_submit($form_id, $form_values) { - $op = isset($_POST['op']) ? $_POST['op'] : ''; - $key = $form_values['var']; - - // Exclude unnecessary elements. - unset($form_values['var'], $form_values['submit'], $form_values['reset'], $form_values['form_id']); - - if ($op == t('Reset to defaults')) { - variable_del($key); - drupal_set_message(t('The configuration options have been reset to their default values.')); - } - else { - variable_set($key, $form_values); - drupal_set_message(t('The configuration options have been saved.')); - } - - cache_clear_all(); -} - /** * Execute the system_settings_form. * @@ -1227,311 +785,6 @@ function system_settings_form_submit($fo drupal_rebuild_theme_registry(); } -/** - * Menu callback; displays a listing of all themes. - */ -function system_themes_form() { - - drupal_clear_css_cache(); - $themes = system_theme_data(); - ksort($themes); - $status = array(); - - foreach ($themes as $theme) { - $screenshot = NULL; - $theme_key = $theme->name; - while ($theme_key) { - if (file_exists($themes[$theme_key]->info['screenshot'])) { - $screenshot = $themes[$theme_key]->info['screenshot']; - break; - } - $theme_key = isset($themes[$theme_key]->info['base theme']) ? $themes[$theme_key]->info['base theme'] : NULL; - } - $screenshot = $screenshot ? theme('image', $screenshot, t('Screenshot for %theme theme', array('%theme' => $theme->info['name'])), '', array('class' => 'screenshot'), FALSE) : t('no screenshot'); - - $form[$theme->name]['screenshot'] = array('#value' => $screenshot); - $form[$theme->name]['info'] = array('#type' => 'value', '#value' => $theme->info); - $options[$theme->name] = ''; - if (!empty($theme->status)) { - $status[] = $theme->name; - } - if (!empty($theme->status)) { - $form[$theme->name]['operations'] = array('#value' => l(t('configure'), 'admin/build/themes/settings/'. $theme->name) ); - } - else { - // Dummy element for drupal_render. Cleaner than adding a check in the theme function. - $form[$theme->name]['operations'] = array(); - } - } - - $form['status'] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => $status); - $form['theme_default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('theme_default', 'garland')); - $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') ); - $form['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') ); - - return $form; -} - -function theme_system_themes_form($form) { - foreach (element_children($form) as $key) { - // Only look for themes - if (!isset($form[$key]['info'])) { - continue; - } - - // Fetch info - $info = $form[$key]['info']['#value']; - - // Style theme info - $theme = '

'. $info['name'] .'

'. $info['description'] .'
'; - - // Build rows - $row = array(); - $row[] = drupal_render($form[$key]['screenshot']); - $row[] = $theme; - $row[] = $info['version']; - $row[] = array('data' => drupal_render($form['status'][$key]), 'align' => 'center'); - if ($form['theme_default']) { - $row[] = array('data' => drupal_render($form['theme_default'][$key]), 'align' => 'center'); - $row[] = array('data' => drupal_render($form[$key]['operations']), 'align' => 'center'); - } - $rows[] = $row; - } - - $header = array(t('Screenshot'), t('Name'), t('Version'), t('Enabled'), t('Default'), t('Operations')); - $output = theme('table', $header, $rows); - $output .= drupal_render($form); - return $output; -} - - -function system_themes_form_submit($form_id, $form_values) { - - db_query("UPDATE {system} SET status = 0 WHERE type = 'theme'"); - - if ($form_values['op'] == t('Save configuration')) { - if (is_array($form_values['status'])) { - foreach ($form_values['status'] as $key => $choice) { - // Always enable the default theme, despite its status checkbox being checked: - if ($choice || $form_values['theme_default'] == $key) { - system_initialize_theme_blocks($key); - db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' and name = '%s'", $key); - } - } - } - if (($admin_theme = variable_get('admin_theme', '0')) != '0' && $admin_theme != $form_values['theme_default']) { - drupal_set_message(t('Please note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', array( - '!admin_theme_page' => url('admin/settings/admin'), - '%admin_theme' => $admin_theme, - '%selected_theme' => $form_values['theme_default'], - ))); - } - variable_set('theme_default', $form_values['theme_default']); - } - else { - variable_del('theme_default'); - db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' AND name = 'garland'"); - } - - list_themes(TRUE); - menu_rebuild(); - drupal_set_message(t('The configuration options have been saved.')); - return 'admin/build/themes'; -} - -/** - * Menu callback; provides module enable/disable interface. - * - * Modules can be enabled or disabled and set for throttling if the throttle module is enabled. - * The list of modules gets populated by module.info files, which contain each module's name, - * description and dependencies. - * @sa drupal_parse_info_file for information on module.info descriptors. - * - * Dependency checking is performed to ensure that a module cannot be enabled if the module has - * disabled dependencies and also to ensure that the module cannot be disabled if the module has - * enabled dependents. - * - * @return - * The form array. - */ -function system_modules($form_values = NULL) { - // Get current list of modules. - $files = module_rebuild_cache(); - if ($confirm_form = system_modules_confirm_form($files, $form_values)) { - return $confirm_form; - } - - // Store module list for validation callback. - $form['validation_modules'] = array('#type' => 'value', '#value' => $files); - - // Create storage for disabled modules as browser will disable checkboxes. - $form['disabled_modules'] = array('#type' => 'value', '#value' => array()); - - // Array for disabling checkboxes in callback system_module_disable. - $disabled = array(); - $throttle = array(); - // Traverse the files retrieved and build the form. - foreach ($files as $filename => $file) { - $form['name'][$filename] = array('#value' => $file->info['name']); - $form['version'][$filename] = array('#value' => $file->info['version']); - $form['description'][$filename] = array('#value' => t($file->info['description'])); - $options[$filename] = ''; - if ($file->status) { - $status[] = $file->name; - } - if ($file->throttle) { - $throttle[] = $file->name; - } - - $dependencies = array(); - // Check for missing dependencies. - if (is_array($file->info['dependencies'])) { - foreach ($file->info['dependencies'] as $dependency) { - if (!isset($files[$dependency]) || !$files[$dependency]->status) { - if (isset($files[$dependency])) { - $dependencies[] = $files[$dependency]->info['name'] . t(' (disabled)'); - } - else { - $dependencies[] = drupal_ucfirst($dependency) . t(' (missing)'); - $disabled[] = $filename; - $form['disabled_modules']['#value'][$filename] = FALSE; - } - } - else { - $dependencies[] = $files[$dependency]->info['name'] . t(' (enabled)'); - } - } - - // Add text for dependencies. - if (!empty($dependencies)) { - $form['description'][$filename]['dependencies'] = array( - '#value' => t('Depends on: !dependencies', array('!dependencies' => implode(', ', $dependencies))), - '#prefix' => '
', - '#suffix' => '
', - ); - } - } - - // Mark dependents disabled so user can not remove modules being depended on. - $dependents = array(); - foreach ($file->info['dependents'] as $dependent) { - if ($files[$dependent]->status == 1) { - $dependents[] = $files[$dependent]->info['name'] . t(' (enabled)'); - $disabled[] = $filename; - $form['disabled_modules']['#value'][$filename] = TRUE; - } - else { - $dependents[] = $files[$dependent]->info['name'] . t(' (disabled)'); - } - } - - // Add text for enabled dependents. - if (!empty($dependents)) { - $form['description'][$filename]['required'] = array( - '#value' => t('Required by: !required', array('!required' => implode(', ', $dependents))), - '#prefix' => '
', - '#suffix' => '
', - ); - } - } - - $modules_required = drupal_required_modules(); - // Merge in required modules. - foreach ($modules_required as $required) { - $disabled[] = $required; - $form['disabled_modules']['#value'][$required] = TRUE; - } - - // Handle status checkboxes, including overriding - // the generated checkboxes for required modules. - $form['status'] = array( - '#type' => 'checkboxes', - '#default_value' => $status, - '#options' => $options, - '#process' => array( - 'expand_checkboxes' => array(), - 'system_modules_disable' => array($disabled), - ), - ); - - // Handle throttle checkboxes, including overriding the - // generated checkboxes for required modules. - if (module_exists('throttle')) { - $form['throttle'] = array( - '#type' => 'checkboxes', - '#default_value' => $throttle, - '#options' => $options, - '#process' => array( - 'expand_checkboxes' => array(), - 'system_modules_disable' => array(array_merge($modules_required, array('throttle'))), - ), - ); - } - - $form['buttons']['submit'] = array( - '#type' => 'submit', - '#value' => t('Save configuration'), - ); - $form['#multistep'] = TRUE; - $form['#action'] = url('admin/build/modules/list/confirm'); - - return $form; -} - -/** - * Form process callback function to disable check boxes. - */ -function system_modules_disable($form, $edit, $disabled) { - foreach ($disabled as $key) { - $form[$key]['#attributes']['disabled'] = 'disabled'; - } - return $form; -} - -function system_modules_confirm_form($modules, $form_values = array()) { - $form = array(); - $items = array(); - - // Check values for submitted dependency errors. - if ($dependencies = system_module_build_dependencies($modules, $form_values)) { - // preserve the already switched on modules - foreach ($modules as $name => $module) { - if ($module->status) { - $form['status'][$name] = array('#type' => 'hidden', '#value' => 1); - } - } - - $form['validation_modules'] = array('#type' => 'value', '#value' => $modules); - $form['status']['#tree'] = TRUE; - foreach ($dependencies as $name => $missing_dependencies) { - $form['status'][$name] = array('#type' => 'hidden', '#value' => 1); - foreach ($missing_dependencies as $k => $dependency) { - $form['status'][$dependency] = array('#type' => 'hidden', '#value' => 1); - $info = $modules[$dependency]->info; - $missing_dependencies[$k] = $info['name'] ? $info['name'] : drupal_ucfirst($dependency); - } - $t_argument = array( - '@module' => $modules[$name]->info['name'], - '@dependencies' => implode(', ', $missing_dependencies), - ); - $items[] = format_plural(count($missing_dependencies), 'You must enable the @dependencies module to install @module.', 'You must enable the @dependencies modules to install @module.', $t_argument); - } - $form['text'] = array('#value' => theme('item_list', $items)); - } - - if ($form) { - // Set some default form values - $form = confirm_form( - $form, - t('Some required modules must be enabled'), - 'admin/build/modules', - t('Would you like to continue with enabling the above?'), - t('Continue'), - t('Cancel')); - return $form; - } -} - function system_module_build_dependencies($modules, $form_values) { static $dependencies; @@ -1555,413 +808,6 @@ function system_module_build_dependencie } /** - * Submit callback; handles modules form submission. - */ -function system_modules_submit($form_id, $form_values) { - include_once './includes/install.inc'; - $new_modules = array(); - - // Merge in disabled active modules since they should be enabled. - // They don't appear because disabled checkboxes are not submitted - // by browsers. - $form_values['status'] = array_merge($form_values['status'], $form_values['disabled_modules']); - - // Check values for dependency that we can't install. - if ($dependencies = system_module_build_dependencies($form_values['validation_modules'], $form_values)) { - // These are the modules that depend on existing modules. - foreach (array_keys($dependencies) as $name) { - $form_values['status'][$name] = 0; - } - } - - $enable_modules = array(); - $disable_modules = array(); - foreach ($form_values['status'] as $key => $choice) { - if ($choice) { - if (drupal_get_installed_schema_version($key) == SCHEMA_UNINSTALLED) { - $new_modules[] = $key; - } - else { - $enable_modules[] = $key; - } - } - else { - $disable_modules[] = $key; - } - } - - $old_module_list = module_list(); - - if (!empty($enable_modules)) { - module_enable($enable_modules); - } - if (!empty($disable_modules)) { - module_disable($disable_modules); - } - - // Install new modules. - foreach ($new_modules as $key => $module) { - if (!drupal_check_module($module)) { - unset($new_modules[$key]); - } - } - drupal_install_modules($new_modules); - - $current_module_list = module_list(TRUE, FALSE); - - if (isset($form_values['throttle'])) { - foreach ($form_values['throttle'] as $key => $choice) { - db_query("UPDATE {system} SET throttle = %d WHERE type = 'module' and name = '%s'", $choice ? 1 : 0, $key); - } - } - - if ($old_module_list != $current_module_list) { - drupal_rebuild_theme_registry(); - menu_rebuild(); - node_types_rebuild(); - drupal_set_message(t('The configuration options have been saved.')); - } - - // If there where unmet dependencies and they haven't confirmed don't redirect. - if ($dependencies && !isset($form_values['confirm'])) { - return FALSE; - } - - drupal_clear_css_cache(); - - return 'admin/build/modules'; -} - -/** - * Theme call back for the modules form. - */ -function theme_system_modules($form) { - if (isset($form['confirm'])) { - return drupal_render($form); - } - - // Individual table headers. - $header = array(t('Enabled')); - if (module_exists('throttle')) { - $header[] = t('Throttle'); - } - $header[] = t('Name'); - $header[] = t('Version'); - $header[] = t('Description'); - - // Pull package information from module list and start grouping modules. - $modules = $form['validation_modules']['#value']; - foreach ($modules as $module) { - if (!isset($module->info['package']) || !$module->info['package']) { - $module->info['package'] = t('Other'); - } - $packages[$module->info['package']][$module->name] = $module->info; - } - ksort($packages); - - // Display packages. - $output = ''; - foreach ($packages as $package => $modules) { - $rows = array(); - foreach ($modules as $key => $module) { - $row = array(); - $row[] = array('data' => drupal_render($form['status'][$key]), 'align' => 'center'); - - if (module_exists('throttle')) { - $row[] = array('data' => drupal_render($form['throttle'][$key]), 'align' => 'center'); - } - $row[] = ''. drupal_render($form['name'][$key]) .''; - $row[] = drupal_render($form['version'][$key]); - $row[] = array('data' => drupal_render($form['description'][$key]), 'class' => 'description'); - $rows[] = $row; - } - $fieldset = array( - '#title' => t($package), - '#collapsible' => TRUE, - '#collapsed' => ($package == 'Core - required'), - '#value' => theme('table', $header, $rows, array('class' => 'package')), - ); - $output .= theme('fieldset', $fieldset); - } - - $output .= drupal_render($form); - return $output; -} - -/** - * Uninstall functions - */ - -/** - * Builds a form of currently disabled modules. - * - * @param - * $form_values Submitted form values. - * @return - * A form array representing the currently disabled modules. - */ -function system_modules_uninstall($form_values = NULL) { - // Make sure the install API is available. - include_once './includes/install.inc'; - - // Display the confirm form if any modules have been submitted. - if ($confirm_form = system_modules_uninstall_confirm_form($form_values)) { - return $confirm_form; - } - - $form = array(); - - // Pull all disabled modules from the system table. - $disabled_modules = db_query("SELECT name, filename, info FROM {system} WHERE type = 'module' AND status = 0 AND schema_version > %d ORDER BY name", SCHEMA_UNINSTALLED); - while ($module = db_fetch_object($disabled_modules)) { - - // Grab the module info - $info = unserialize($module->info); - - // Load the .install file, and check for an uninstall hook. - // If the hook exists, the module can be uninstalled. - module_load_install($module->name); - if (module_hook($module->name, 'uninstall')) { - $form['modules'][$module->name]['name'] = array('#value' => $info['name'] ? $info['name'] : $module->name); - $form['modules'][$module->name]['description'] = array('#value' => t($info['description'])); - $options[$module->name] = ''; - } - } - - // Only build the rest of the form if there are any modules available to uninstall. - if (!empty($options)) { - $form['uninstall'] = array( - '#type' => 'checkboxes', - '#options' => $options, - ); - $form['buttons']['submit'] = array( - '#type' => 'button', - '#value' => t('Uninstall'), - ); - $form['#multistep'] = TRUE; - $form['#action'] = url('admin/build/modules/uninstall/confirm'); - } - else { - $form['modules'] = array(); - } - - return $form; -} - -/** - * Confirm uninstall of selected modules. - * - * @param - * $form_values Submitted form values. - * @return - * A form array representing modules to confirm. - */ -function system_modules_uninstall_confirm_form($form_values) { - // Nothing to build. - if (!isset($form_values)) { - return; - } - - // Construct the hidden form elements and list items. - foreach (array_filter($form_values['uninstall']) as $module => $value) { - $info = drupal_parse_info_file(dirname(drupal_get_filename('module', $module)) .'/'. $module .'.info'); - $uninstall[] = $info['name']; - $form['uninstall'][$module] = array('#type' => 'hidden', - '#value' => 1, - ); - } - - // Display a confirm form if modules have been selected. - if (isset($uninstall)) { - $form['uninstall']['#tree'] = TRUE; - $form['#multistep'] = TRUE; - $form['modules'] = array('#value' => '

'. t('The following modules will be completely uninstalled from your site, and all data from these modules will be lost!') .'

'. theme('item_list', $uninstall)); - $form = confirm_form( - $form, - t('Confirm uninstall'), - 'admin/build/modules/uninstall', - t('Would you like to continue with uninstalling the above?'), - t('Uninstall'), - t('Cancel')); - return $form; - } -} - -/** - * Themes a table of currently disabled modules. - * - * @param - * $form The form array representing the currently disabled modules. - * @return - * An HTML string representing the table. - */ -function theme_system_modules_uninstall($form) { - // No theming for the confirm form. - if (isset($form['confirm'])) { - return drupal_render($form); - } - - // Table headers. - $header = array(t('Uninstall'), - t('Name'), - t('Description'), - ); - - // Display table. - $rows = array(); - foreach (element_children($form['modules']) as $module) { - $rows[] = array( - array('data' => drupal_render($form['uninstall'][$module]), 'align' => 'center'), - ''. drupal_render($form['modules'][$module]['name']) .'', - array('data' => drupal_render($form['modules'][$module]['description']), 'class' => 'description'), - ); - } - - // Only display table if there are modules that can be uninstalled. - if (empty($rows)) { - $rows[] = array(array('data' => t('No modules are available to uninstall.'), 'colspan' => '3', 'align' => 'center', 'class' => 'message')); - } - - $output = theme('table', $header, $rows); - $output .= drupal_render($form); - - return $output; -} - -/** - * Validates the submitted uninstall form. - * - * @param - * $form_id The form ID. - * @param - * $form_values Submitted form values. - */ -function system_modules_uninstall_validate($form_id, $form_values) { - // Form submitted, but no modules selected. - if (!count(array_filter($form_values['uninstall']))) { - drupal_set_message(t('No modules selected.'), 'error'); - drupal_goto('admin/build/modules/uninstall'); - } -} - -/** - * Processes the submitted uninstall form. - * - * @param - * $form_id The form ID. - * @param - * $form_values Submitted form values. - */ -function system_modules_uninstall_submit($form_id, $form_values) { - // Make sure the install API is available. - include_once './includes/install.inc'; - - // Call the uninstall routine for each selected module. - foreach (array_filter($form_values['uninstall']) as $module => $value) { - drupal_uninstall_module($module); - } - drupal_set_message(t('The selected modules have been uninstalled.')); - drupal_goto('admin/build/modules/uninstall'); -} - -/** - * Menu callback: run cron manually. - */ -function system_run_cron() { - // Run cron manually - if (drupal_cron_run()) { - drupal_set_message(t('Cron ran successfully')); - } - else { - drupal_set_message(t('Cron run failed')); - } - - drupal_goto('admin/logs/status'); -} - -/** - * Menu callback: return information about PHP. - */ -function system_php() { - phpinfo(INFO_GENERAL | INFO_CONFIGURATION); - exit(); -} - -function _system_sql($data, $keys) { - $rows = array(); - foreach ($keys as $key => $explanation) { - if (isset($data[$key])) { - $rows[] = array(check_plain($key), check_plain($data[$key]), $explanation); - } - } - - return theme('table', array(t('Variable'), t('Value'), t('Description')), $rows); -} - -/** - * Menu callback: return information about PHP. - */ -function system_sql() { - - $result = db_query("SHOW STATUS"); - while ($entry = db_fetch_object($result)) { - $data[$entry->Variable_name] = $entry->Value; - } - - $output = '

'. t('Command counters') .'

'; - $output .= _system_sql($data, array( - 'Com_select' => t('The number of SELECT-statements.'), - 'Com_insert' => t('The number of INSERT-statements.'), - 'Com_update' => t('The number of UPDATE-statements.'), - 'Com_delete' => t('The number of DELETE-statements.'), - 'Com_lock_tables' => t('The number of table locks.'), - 'Com_unlock_tables' => t('The number of table unlocks.') - )); - - $output .= '

'. t('Query performance') .'

'; - $output .= _system_sql($data, array( - 'Select_full_join' => t('The number of joins without an index; should be zero.'), - 'Select_range_check' => t('The number of joins without an index; should be zero.'), - 'Sort_scan' => t('The number of sorts done without using an index; should be zero.'), - 'Table_locks_immediate' => t('The number of times a lock could be acquired immediately.'), - 'Table_locks_waited' => t('The number of times the server had to wait for a lock.') - )); - - $output .= '

'. t('Query cache information') .'

'; - $output .= '

'. t('The MySQL query cache can improve performance of your site by storing the result of queries. Then, if an identical query is received later, the MySQL server retrieves the result from the query cache rather than parsing and executing the statement again.') .'

'; - $output .= _system_sql($data, array( - 'Qcache_queries_in_cache' => t('The number of queries in the query cache.'), - 'Qcache_hits' => t('The number of times that MySQL found previous results in the cache.'), - 'Qcache_inserts' => t('The number of times that MySQL added a query to the cache (misses).'), - 'Qcache_lowmem_prunes' => t('The number of times that MySQL had to remove queries from the cache because it ran out of memory. Ideally should be zero.') - )); - - return $output; -} - -/** - * Menu callback: displays the site status report. Can also be used as a pure check. - * - * @param $check - * If true, only returns a boolean whether there are system status errors. - */ -function system_status($check = FALSE) { - // Load .install files - include_once './includes/install.inc'; - drupal_load_updates(); - - // Check run-time requirements and status information - $requirements = module_invoke_all('requirements', 'runtime'); - usort($requirements, '_system_sort_requirements'); - - if ($check) { - return drupal_requirements_severity($requirements) == REQUIREMENT_ERROR; - } - - return theme('status_report', $requirements); -} - -/** * Helper function to sort requirements. */ function _system_sort_requirements($a, $b) { @@ -1974,250 +820,6 @@ function _system_sort_requirements($a, $ return isset($b['weight']) ? $a['weight'] - $b['weight'] : $a['weight']; } -/** - * Theme status report - */ -function theme_status_report(&$requirements) { - $i = 0; - $output = ''; - foreach ($requirements as $requirement) { - if (empty($requirement['#type'])) { - $class = ++$i % 2 == 0 ? 'even' : 'odd'; - - $classes = array( - REQUIREMENT_INFO => 'info', - REQUIREMENT_OK => 'ok', - REQUIREMENT_WARNING => 'warning', - REQUIREMENT_ERROR => 'error', - ); - $class = $classes[isset($requirement['severity']) ? (int)$requirement['severity'] : 0] .' '. $class; - - // Output table row(s) - if (!empty($requirement['description'])) { - $output .= ''; - $output .= ''; - } - else { - $output .= ''; - } - } - } - - $output .= '
'. $requirement['title'] .''. $requirement['value'] .'
'. $requirement['description'] .'
'. $requirement['title'] .''. $requirement['value'] .'
'; - return $output; -} - -/** - * Menu callback; displays a module's settings page. - */ -function system_settings_overview() { - // Check database setup if necessary - if (function_exists('db_check_setup') && empty($_POST)) { - db_check_setup(); - } - - $item = menu_get_item('admin/settings'); - $content = system_admin_menu_block($item); - - $output = theme('admin_block_content', $content); - - return $output; -} - -function system_logging_overview() { - $item = menu_get_item('admin/settings/logging'); - $content = system_admin_menu_block($item); - - $output = theme('admin_block_content', $content); - - return $output; -} -/** - * Menu callback; display theme configuration for entire site and individual themes. - */ -function system_theme_settings($key = '') { - $directory_path = file_directory_path(); - file_check_directory($directory_path, FILE_CREATE_DIRECTORY, 'file_directory_path'); - - // Default settings are defined in theme_get_settings() in includes/theme.inc - if ($key) { - $settings = theme_get_settings($key); - $var = str_replace('/', '_', 'theme_'. $key .'_settings'); - $themes = system_theme_data(); - $features = $themes[$key]->info['features']; - } - else { - $settings = theme_get_settings(''); - $var = 'theme_settings'; - } - - $form['var'] = array('#type' => 'hidden', '#value' => $var); - - // Check for a new uploaded logo, and use that instead. - if ($file = file_check_upload('logo_upload')) { - if ($info = image_get_info($file->filepath)) { - $parts = pathinfo($file->filename); - $filename = ($key) ? str_replace('/', '_', $key) .'_logo.'. $parts['extension'] : 'logo.'. $parts['extension']; - - if ($file = file_save_upload('logo_upload', $filename, 1)) { - $_POST['default_logo'] = 0; - $_POST['logo_path'] = $file->filepath; - $_POST['toggle_logo'] = 1; - } - } - else { - form_set_error('file_upload', t('Only JPEG, PNG and GIF images are allowed to be used as logos.')); - } - } - - // Check for a new uploaded favicon, and use that instead. - if ($file = file_check_upload('favicon_upload')) { - $parts = pathinfo($file->filename); - $filename = ($key) ? str_replace('/', '_', $key) .'_favicon.'. $parts['extension'] : 'favicon.'. $parts['extension']; - - if ($file = file_save_upload('favicon_upload', $filename, 1)) { - $_POST['default_favicon'] = 0; - $_POST['favicon_path'] = $file->filepath; - $_POST['toggle_favicon'] = 1; - } - } - - // Toggle settings - $toggles = array( - 'logo' => t('Logo'), - 'name' => t('Site name'), - 'slogan' => t('Site slogan'), - 'mission' => t('Mission statement'), - 'node_user_picture' => t('User pictures in posts'), - 'comment_user_picture' => t('User pictures in comments'), - 'search' => t('Search box'), - 'favicon' => t('Shortcut icon') - ); - - // Some features are not always available - $disabled = array(); - if (!variable_get('user_pictures', 0)) { - $disabled['toggle_node_user_picture'] = TRUE; - $disabled['toggle_comment_user_picture'] = TRUE; - } - if (!module_exists('search')) { - $disabled['toggle_search'] = TRUE; - } - - $form['theme_settings'] = array( - '#type' => 'fieldset', - '#title' => t('Toggle display'), - '#description' => t('Enable or disable the display of certain page elements.'), - ); - foreach ($toggles as $name => $title) { - if ((!$key) || in_array($name, $features)) { - // disable search box if search.module is disabled - $form['theme_settings']['toggle_'. $name] = array('#type' => 'checkbox', '#title' => $title, '#default_value' => $settings['toggle_'. $name]); - if (isset($disabled[$name])) { - $form['theme_settings']['toggle_'. $name]['#disabled'] = TRUE; - } - } - } - - // System wide only settings. - if (!$key) { - // Create neat 2-column layout for the toggles - $form['theme_settings'] += array( - '#prefix' => '
', - '#suffix' => '
', - ); - - // Toggle node display. - $node_types = node_get_types('names'); - if ($node_types) { - $form['node_info'] = array( - '#type' => 'fieldset', - '#title' => t('Display post information on'), - '#description' => t('Enable or disable the submitted by Username on date text when displaying posts of the following type.'), - '#prefix' => '
', - '#suffix' => '
', - ); - foreach ($node_types as $type => $name) { - $form['node_info']["toggle_node_info_$type"] = array('#type' => 'checkbox', '#title' => $name, '#default_value' => $settings["toggle_node_info_$type"]); - } - } - } - - // Logo settings - if ((!$key) || in_array('logo', $features)) { - $form['logo'] = array( - '#type' => 'fieldset', - '#title' => t('Logo image settings'), - '#description' => t('If toggled on, the following logo will be displayed.'), - '#attributes' => array('class' => 'theme-settings-bottom'), - ); - $form['logo']["default_logo"] = array( - '#type' => 'checkbox', - '#title' => t('Use the default logo'), - '#default_value' => $settings['default_logo'], - '#tree' => FALSE, - '#description' => t('Check here if you want the theme to use the logo supplied with it.') - ); - $form['logo']['logo_path'] = array( - '#type' => 'textfield', - '#title' => t('Path to custom logo'), - '#default_value' => $settings['logo_path'], - '#description' => t('The path to the file you would like to use as your logo file instead of the default logo.')); - - $form['logo']['logo_upload'] = array( - '#type' => 'file', - '#title' => t('Upload logo image'), - '#maxlength' => 40, - '#description' => t("If you don't have direct file access to the server, use this field to upload your logo.") - ); - } - - if ((!$key) || in_array('favicon', $features)) { - $form['favicon'] = array( - '#type' => 'fieldset', - '#title' => t('Shortcut icon settings'), - '#description' => t("Your shortcut icon or 'favicon' is displayed in the address bar and bookmarks of most browsers.") - ); - $form['favicon']['default_favicon'] = array( - '#type' => 'checkbox', - '#title' => t('Use the default shortcut icon.'), - '#default_value' => $settings['default_favicon'], - '#description' => t('Check here if you want the theme to use the default shortcut icon.') - ); - $form['favicon']['favicon_path'] = array( - '#type' => 'textfield', - '#title' => t('Path to custom icon'), - '#default_value' => $settings['favicon_path'], - '#description' => t('The path to the image file you would like to use as your custom shortcut icon.') - ); - - $form['favicon']['favicon_upload'] = array( - '#type' => 'file', - '#title' => t('Upload icon image'), - '#description' => t("If you don't have direct file access to the server, use this field to upload your shortcut icon.") - ); - } - - if ($key) { - // Template-specific settings - $function = $themes[$key]->prefix .'_settings'; - if (function_exists($function)) { - if ($themes[$key]->template) { - // file is a template or a style of a template - $form['specific'] = array('#type' => 'fieldset', '#title' => t('Engine-specific settings'), '#description' => t('These settings only exist for all the templates and styles based on the %engine theme engine.', array('%engine' => $themes[$key]->prefix))); - } - else { - // file is a theme or a style of a theme - $form['specific'] = array('#type' => 'fieldset', '#title' => t('Theme-specific settings'), '#description' => t('These settings only exist for the %theme theme and all the styles based on it.', array('%theme' => $themes[$key]->prefix))); - } - $group = $function(); - $form['specific'] = array_merge($form['specific'], (is_array($group) ? $group : array())); - } - } - $form['#attributes'] = array('enctype' => 'multipart/form-data'); - - return system_settings_form($form); -} /** * Implementation of hook_node_type(). @@ -2416,38 +1018,6 @@ function theme_admin_block_content($cont return $output; } -/** - * Menu callback; prints a listing of admin tasks for each installed module. - */ -function system_admin_by_module() { - return 'This page awaits rewrite'; // TODO: this needs to be rewritten for the new menu system. - $modules = module_rebuild_cache(); - $menu_items = array(); - foreach ($modules as $file) { - $module = $file->name; - if ($module == 'help') { - continue; - } - - $admin_tasks = system_get_module_admin_tasks($module); - - // Only display a section if there are any available tasks. - if (count($admin_tasks)) { - - // Check for help links. - if (module_invoke($module, 'help', "admin/help#$module")) { - $admin_tasks[100] = l(t('Get help'), "admin/help/$module"); - } - - // Sort. - ksort($admin_tasks); - - $menu_items[$file->info['name']] = array($file->info['description'], $admin_tasks); - } - } - return theme('system_admin_by_module', $menu_items); -} - function system_get_module_admin_tasks($module) { return array(); // TODO: this needs to be rewritten for the new menu system. $admin_access = user_access('administer access control'); @@ -2474,69 +1044,23 @@ function system_get_module_admin_tasks($ } /** - * Theme output of the dashboard page. + * Menu callback: displays the site status report. Can also be used as a pure check. + * + * @param $check + * If true, only returns a boolean whether there are system status errors. */ -function theme_system_admin_by_module($menu_items) { - $stripe = 0; - $output = ''; - $container = array(); +function system_status($check = FALSE) { + // Load .install files + include_once './includes/install.inc'; + drupal_load_updates(); - // Iterate over all modules - foreach ($menu_items as $module => $block) { - list($description, $items) = $block; - - // Output links - if (count($items)) { - $block = array(); - $block['title'] = $module; - $block['content'] = theme('item_list', $items); - $block['description'] = t($description); - - if ($block_output = theme('admin_block', $block)) { - if (!$block['position']) { - // Perform automatic striping. - $block['position'] = ++$stripe % 2 ? 'left' : 'right'; - } - $container[$block['position']] .= $block_output; - } - } - } + // Check run-time requirements and status information + $requirements = module_invoke_all('requirements', 'runtime'); + usort($requirements, '_system_sort_requirements'); - $output = '
'; - foreach ($container as $id => $data) { - $output .= '
'; - $output .= $data; - $output .= '
'; + if ($check) { + return drupal_requirements_severity($requirements) == REQUIREMENT_ERROR; } - $output .= '
'; - - return $output; -} -/** - * Implementation of hook_cron(). - * - * Remove older rows from flood table - */ -function system_cron() { - // Cleanup the flood - db_query('DELETE FROM {flood} WHERE timestamp < %d', time() - 3600); - // Cleanup the batch table - db_query('DELETE FROM {batch} WHERE timestamp < %d', time() - 864000); -} - -/** - * Default page callback for batches. - */ -function system_batch_page() { - require_once './includes/batch.inc'; - $output = _batch_page(); - if ($output === FALSE) { - drupal_access_denied(); - } - else { - // Force a page without blocks or messages to - // display a list of collected messages later. - print theme('page', $output, FALSE, FALSE); - } + return theme('status_report', $requirements); } Index: modules/system/system.theme.inc =================================================================== RCS file: modules/system/system.theme.inc diff -N modules/system/system.theme.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/system/system.theme.inc 10 May 2007 07:25:49 -0000 @@ -0,0 +1,356 @@ +name] = $theme->info['name']; + } + + $form['admin_theme'] = array( + '#type' => 'select', + '#options' => $options, + '#title' => t('Administration theme'), + '#description' => t('Choose which theme the administration pages should display in. If you choose "System default" the administration pages will use the same theme as the rest of the site.'), + '#default_value' => variable_get('admin_theme', '0'), + ); + + // In order to give it our own submit, we have to give it the default submit + // too because the presence of a #submit will prevent the default #submit + // from being used. Also we want ours first. + $form['#submit']['system_admin_theme_submit'] = array(); + $form['#submit']['system_settings_form_submit'] = array(); + return system_settings_form($form); +} + +function system_admin_theme_submit($form_id, $form_values) { + // If we're changing themes, make sure the theme has its blocks initialized. + if ($form_values['admin_theme'] != variable_get('admin_theme', '0')) { + $result = db_query("SELECT status FROM {blocks} WHERE theme = '%s'", $form_values['admin_theme']); + if (!db_num_rows($result)) { + system_initialize_theme_blocks($form_values['admin_theme']); + } + } +} + +/** + * Menu callback; displays a listing of all themes. + */ +function system_themes_form() { + + drupal_clear_css_cache(); + $themes = system_theme_data(); + ksort($themes); + $status = array(); + + foreach ($themes as $theme) { + $screenshot = NULL; + $theme_key = $theme->name; + while ($theme_key) { + if (file_exists($themes[$theme_key]->info['screenshot'])) { + $screenshot = $themes[$theme_key]->info['screenshot']; + break; + } + $theme_key = isset($themes[$theme_key]->info['base theme']) ? $themes[$theme_key]->info['base theme'] : NULL; + } + $screenshot = $screenshot ? theme('image', $screenshot, t('Screenshot for %theme theme', array('%theme' => $theme->info['name'])), '', array('class' => 'screenshot'), FALSE) : t('no screenshot'); + + $form[$theme->name]['screenshot'] = array('#value' => $screenshot); + $form[$theme->name]['info'] = array('#type' => 'value', '#value' => $theme->info); + $options[$theme->name] = ''; + if (!empty($theme->status)) { + $status[] = $theme->name; + } + if (!empty($theme->status)) { + $form[$theme->name]['operations'] = array('#value' => l(t('configure'), 'admin/build/themes/settings/'. $theme->name) ); + } + else { + // Dummy element for drupal_render. Cleaner than adding a check in the theme function. + $form[$theme->name]['operations'] = array(); + } + } + + $form['status'] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => $status); + $form['theme_default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('theme_default', 'garland')); + $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') ); + $form['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') ); + + return $form; +} + +function theme_system_themes_form($form) { + foreach (element_children($form) as $key) { + // Only look for themes + if (!isset($form[$key]['info'])) { + continue; + } + + // Fetch info + $info = $form[$key]['info']['#value']; + + // Style theme info + $theme = '

'. $info['name'] .'

'. $info['description'] .'
'; + + // Build rows + $row = array(); + $row[] = drupal_render($form[$key]['screenshot']); + $row[] = $theme; + $row[] = $info['version']; + $row[] = array('data' => drupal_render($form['status'][$key]), 'align' => 'center'); + if ($form['theme_default']) { + $row[] = array('data' => drupal_render($form['theme_default'][$key]), 'align' => 'center'); + $row[] = array('data' => drupal_render($form[$key]['operations']), 'align' => 'center'); + } + $rows[] = $row; + } + + $header = array(t('Screenshot'), t('Name'), t('Version'), t('Enabled'), t('Default'), t('Operations')); + $output = theme('table', $header, $rows); + $output .= drupal_render($form); + return $output; +} + + +function system_themes_form_submit($form_id, $form_values) { + + db_query("UPDATE {system} SET status = 0 WHERE type = 'theme'"); + + if ($form_values['op'] == t('Save configuration')) { + if (is_array($form_values['status'])) { + foreach ($form_values['status'] as $key => $choice) { + // Always enable the default theme, despite its status checkbox being checked: + if ($choice || $form_values['theme_default'] == $key) { + system_initialize_theme_blocks($key); + db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' and name = '%s'", $key); + } + } + } + if (($admin_theme = variable_get('admin_theme', '0')) != '0' && $admin_theme != $form_values['theme_default']) { + drupal_set_message(t('Please note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', array( + '!admin_theme_page' => url('admin/settings/admin'), + '%admin_theme' => $admin_theme, + '%selected_theme' => $form_values['theme_default'], + ))); + } + variable_set('theme_default', $form_values['theme_default']); + } + else { + variable_del('theme_default'); + db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' AND name = 'garland'"); + } + + list_themes(TRUE); + menu_rebuild(); + drupal_set_message(t('The configuration options have been saved.')); + return 'admin/build/themes'; +} + +/** + * Menu callback; display theme configuration for entire site and individual themes. + */ +function system_theme_settings($key = '') { + $directory_path = file_directory_path(); + file_check_directory($directory_path, FILE_CREATE_DIRECTORY, 'file_directory_path'); + + // Default settings are defined in theme_get_settings() in includes/theme.inc + if ($key) { + $settings = theme_get_settings($key); + $var = str_replace('/', '_', 'theme_'. $key .'_settings'); + $themes = system_theme_data(); + $features = $themes[$key]->info['features']; + } + else { + $settings = theme_get_settings(''); + $var = 'theme_settings'; + } + + $form['var'] = array('#type' => 'hidden', '#value' => $var); + + // Check for a new uploaded logo, and use that instead. + if ($file = file_check_upload('logo_upload')) { + if ($info = image_get_info($file->filepath)) { + $parts = pathinfo($file->filename); + $filename = ($key) ? str_replace('/', '_', $key) .'_logo.'. $parts['extension'] : 'logo.'. $parts['extension']; + + if ($file = file_save_upload('logo_upload', $filename, 1)) { + $_POST['default_logo'] = 0; + $_POST['logo_path'] = $file->filepath; + $_POST['toggle_logo'] = 1; + } + } + else { + form_set_error('file_upload', t('Only JPEG, PNG and GIF images are allowed to be used as logos.')); + } + } + + // Check for a new uploaded favicon, and use that instead. + if ($file = file_check_upload('favicon_upload')) { + $parts = pathinfo($file->filename); + $filename = ($key) ? str_replace('/', '_', $key) .'_favicon.'. $parts['extension'] : 'favicon.'. $parts['extension']; + + if ($file = file_save_upload('favicon_upload', $filename, 1)) { + $_POST['default_favicon'] = 0; + $_POST['favicon_path'] = $file->filepath; + $_POST['toggle_favicon'] = 1; + } + } + + // Toggle settings + $toggles = array( + 'logo' => t('Logo'), + 'name' => t('Site name'), + 'slogan' => t('Site slogan'), + 'mission' => t('Mission statement'), + 'node_user_picture' => t('User pictures in posts'), + 'comment_user_picture' => t('User pictures in comments'), + 'search' => t('Search box'), + 'favicon' => t('Shortcut icon') + ); + + // Some features are not always available + $disabled = array(); + if (!variable_get('user_pictures', 0)) { + $disabled['toggle_node_user_picture'] = TRUE; + $disabled['toggle_comment_user_picture'] = TRUE; + } + if (!module_exists('search')) { + $disabled['toggle_search'] = TRUE; + } + + $form['theme_settings'] = array( + '#type' => 'fieldset', + '#title' => t('Toggle display'), + '#description' => t('Enable or disable the display of certain page elements.'), + ); + foreach ($toggles as $name => $title) { + if ((!$key) || in_array($name, $features)) { + // disable search box if search.module is disabled + $form['theme_settings']['toggle_'. $name] = array('#type' => 'checkbox', '#title' => $title, '#default_value' => $settings['toggle_'. $name]); + if (isset($disabled[$name])) { + $form['theme_settings']['toggle_'. $name]['#disabled'] = TRUE; + } + } + } + + // System wide only settings. + if (!$key) { + // Create neat 2-column layout for the toggles + $form['theme_settings'] += array( + '#prefix' => '
', + '#suffix' => '
', + ); + + // Toggle node display. + $node_types = node_get_types('names'); + if ($node_types) { + $form['node_info'] = array( + '#type' => 'fieldset', + '#title' => t('Display post information on'), + '#description' => t('Enable or disable the submitted by Username on date text when displaying posts of the following type.'), + '#prefix' => '
', + '#suffix' => '
', + ); + foreach ($node_types as $type => $name) { + $form['node_info']["toggle_node_info_$type"] = array('#type' => 'checkbox', '#title' => $name, '#default_value' => $settings["toggle_node_info_$type"]); + } + } + } + + // Logo settings + if ((!$key) || in_array('logo', $features)) { + $form['logo'] = array( + '#type' => 'fieldset', + '#title' => t('Logo image settings'), + '#description' => t('If toggled on, the following logo will be displayed.'), + '#attributes' => array('class' => 'theme-settings-bottom'), + ); + $form['logo']["default_logo"] = array( + '#type' => 'checkbox', + '#title' => t('Use the default logo'), + '#default_value' => $settings['default_logo'], + '#tree' => FALSE, + '#description' => t('Check here if you want the theme to use the logo supplied with it.') + ); + $form['logo']['logo_path'] = array( + '#type' => 'textfield', + '#title' => t('Path to custom logo'), + '#default_value' => $settings['logo_path'], + '#description' => t('The path to the file you would like to use as your logo file instead of the default logo.')); + + $form['logo']['logo_upload'] = array( + '#type' => 'file', + '#title' => t('Upload logo image'), + '#maxlength' => 40, + '#description' => t("If you don't have direct file access to the server, use this field to upload your logo.") + ); + } + + if ((!$key) || in_array('favicon', $features)) { + $form['favicon'] = array( + '#type' => 'fieldset', + '#title' => t('Shortcut icon settings'), + '#description' => t("Your shortcut icon or 'favicon' is displayed in the address bar and bookmarks of most browsers.") + ); + $form['favicon']['default_favicon'] = array( + '#type' => 'checkbox', + '#title' => t('Use the default shortcut icon.'), + '#default_value' => $settings['default_favicon'], + '#description' => t('Check here if you want the theme to use the default shortcut icon.') + ); + $form['favicon']['favicon_path'] = array( + '#type' => 'textfield', + '#title' => t('Path to custom icon'), + '#default_value' => $settings['favicon_path'], + '#description' => t('The path to the image file you would like to use as your custom shortcut icon.') + ); + + $form['favicon']['favicon_upload'] = array( + '#type' => 'file', + '#title' => t('Upload icon image'), + '#description' => t("If you don't have direct file access to the server, use this field to upload your shortcut icon.") + ); + } + + if ($key) { + // Template-specific settings + $function = $themes[$key]->prefix .'_settings'; + if (function_exists($function)) { + if ($themes[$key]->template) { + // file is a template or a style of a template + $form['specific'] = array('#type' => 'fieldset', '#title' => t('Engine-specific settings'), '#description' => t('These settings only exist for all the templates and styles based on the %engine theme engine.', array('%engine' => $themes[$key]->prefix))); + } + else { + // file is a theme or a style of a theme + $form['specific'] = array('#type' => 'fieldset', '#title' => t('Theme-specific settings'), '#description' => t('These settings only exist for the %theme theme and all the styles based on it.', array('%theme' => $themes[$key]->prefix))); + } + $group = $function(); + $form['specific'] = array_merge($form['specific'], (is_array($group) ? $group : array())); + } + } + $form['#attributes'] = array('enctype' => 'multipart/form-data'); + + return system_settings_form($form); +} + +function system_theme_settings_submit($form_id, $form_values) { + $op = isset($_POST['op']) ? $_POST['op'] : ''; + $key = $form_values['var']; + + // Exclude unnecessary elements. + unset($form_values['var'], $form_values['submit'], $form_values['reset'], $form_values['form_id']); + + if ($op == t('Reset to defaults')) { + variable_del($key); + drupal_set_message(t('The configuration options have been reset to their default values.')); + } + else { + variable_set($key, $form_values); + drupal_set_message(t('The configuration options have been saved.')); + } + + cache_clear_all(); +} Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.777 diff -u -p -r1.777 user.module --- modules/user/user.module 30 Apr 2007 17:03:29 -0000 1.777 +++ modules/user/user.module 10 May 2007 07:25:50 -0000 @@ -821,6 +821,8 @@ function user_menu() { 'position' => 'left', 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('administer site configuration'), + 'file' => 'system.admin.inc', + 'file path' => drupal_get_path('module', 'system'), ); $items['admin/user/user'] = array( 'title' => 'Users',