? sites/default/files ? sites/default/settings.php Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.284 diff -u -p -r1.284 system.admin.inc --- modules/system/system.admin.inc 21 May 2010 11:37:55 -0000 1.284 +++ modules/system/system.admin.inc 24 May 2010 03:18:01 -0000 @@ -1500,40 +1500,83 @@ function system_ip_blocking_delete_submi * @see system_settings_form() */ function system_site_information_settings() { - $form['site_name'] = array( + $form['site_information'] = array( + '#type' => 'fieldset', + '#title' => t('Site Details'), + ); + $form['site_information']['site_name'] = array( '#type' => 'textfield', '#title' => t('Site name'), '#default_value' => variable_get('site_name', 'Drupal'), '#required' => TRUE ); - $form['site_slogan'] = array( + $form['site_information']['site_slogan'] = array( '#type' => 'textfield', '#title' => t('Slogan'), '#default_value' => variable_get('site_slogan', ''), '#description' => t("How this is used depends on your site's theme."), ); - $form['site_mail'] = array( + $form['site_information']['site_mail'] = array( '#type' => 'textfield', '#title' => t('E-mail address'), '#default_value' => variable_get('site_mail', ini_get('sendmail_from')), '#description' => t("The From address in automated e-mails sent during registration and new password requests, and other notifications. (Use an address ending in your site's domain to help prevent this e-mail being flagged as spam.)"), '#required' => TRUE, ); - $form['site_frontpage'] = array( - '#type' => 'textfield', - '#title' => t('Default front page'), - '#default_value' => drupal_get_path_alias(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='), - '#required' => TRUE, + $form['front_page'] = array( + '#type' => 'fieldset', + '#title' => t('Front Page'), ); - $form['default_nodes_main'] = array( + $form['front_page']['default_nodes_main'] = array( '#type' => 'select', '#title' => t('Number of posts on front page'), '#default_value' => variable_get('default_nodes_main', 10), '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), '#description' => t('The maximum number of posts displayed on overview pages such as the front page.') ); + $form['front_page']['site_frontpage'] = array( + '#type' => 'textfield', + '#title' => t('Default front page'), + '#default_value' => (variable_get('site_frontpage')!='node'?drupal_get_path_alias(variable_get('site_frontpage', 'node')):''), + '#size' => 40, + '#description' => t('Optionally, specify a relative URL to display as the front page. Leave blank to display the default content feed.'), + '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='), + ); + + $form['#validate'][] = 'system_site_information_settings_validate'; + + return system_settings_form($form, FALSE); +} + +/** + * Validate the submitted site-information form. + */ +function system_site_information_settings_validate($form, &$form_state) { + // Validate the e-mail address. + if ($error = user_validate_mail($form_state['values']['site_mail'])) { + form_set_error('site_mail', $error); + } + // Check for empty front page path. + if (empty($form_state['values']['site_frontpage'])) { + // Set to default "node" + form_set_value($form['front_page']['site_frontpage'], 'node', $form_state); + } + else { + // Get the normal path of the front page. + form_set_value($form['front_page']['site_frontpage'], drupal_get_normal_path($form_state['values']['site_frontpage']), $form_state); + } + // Validate front page path. + if (!drupal_valid_path($form_state['values']['site_frontpage'])) { + form_set_error('site_frontpage', t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $form_state['values']['site_frontpage']))); + } +} + +/** + * Form builder; Error pages form. + * + * @ingroup forms + * @see system_settings_form() + */ +function system_error_pages_settings() { $form['site_403'] = array( '#type' => 'textfield', '#title' => t('Default 403 (access denied) page'), @@ -1550,33 +1593,80 @@ function system_site_information_setting '#description' => t('This page is displayed when no other content matches the requested document. Leave blank to display a generic "page not found" page.'), '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=') ); - $form['cron_safe_threshold'] = array( + + $form['#validate'][] = 'system_error_pages_settings_validate'; + + return system_settings_form($form, FALSE); +} + +/** + * Validate the submitted error pages form. + */ +function system_error_pages_settings_validate($form, &$form_state) { + // Get the normal paths of both error pages. + if (!empty($form_state['values']['site_403'])) { + form_set_value($form['site_403'], drupal_get_normal_path($form_state['values']['site_403']), $form_state); + } + if (!empty($form_state['values']['site_404'])) { + form_set_value($form['site_404'], drupal_get_normal_path($form_state['values']['site_404']), $form_state); + } + // Validate 403 error path. + if (!empty($form_state['values']['site_403']) && !drupal_valid_path($form_state['values']['site_403'])) { + form_set_error('site_403', t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $form_state['values']['site_403']))); + } + // Validate 404 error path. + if (!empty($form_state['values']['site_404']) && !drupal_valid_path($form_state['values']['site_404'])) { + form_set_error('site_404', t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $form_state['values']['site_404']))); + } +} + +/** + * Form builder; Cron form. + * + * @ingroup forms + * @see system_settings_form() + */ +function system_cron_settings() { + $form['run_cron'] = array( + '#type' => 'fieldset', + '#title' => t('Run Cron'), + ); + $form['run_cron']['run'] = array( + '#type' => 'submit', + '#value' => t('Run cron'), + '#submit' => array('system_run_cron_submit'), + ); + + $form['automatic_cron'] = array( + '#type' => 'fieldset', + '#title' => t('Automatic Settings'), + ); + $form['automatic_cron']['cron_safe_threshold'] = array( '#type' => 'select', '#title' => t('Automatically run cron'), '#default_value' => variable_get('cron_safe_threshold', DRUPAL_CRON_DEFAULT_THRESHOLD), '#options' => array(0 => t('Never')) + drupal_map_assoc(array(3600, 10800, 21600, 43200, 86400, 604800), 'format_interval'), '#description' => t('When enabled, the site will check whether cron has been run in the configured interval and automatically run it upon the next page request. For more information visit the status report page.', array('@status-report-url' => url('admin/reports/status'))), ); - - $form['#validate'][] = 'system_site_information_settings_validate'; - + return system_settings_form($form, FALSE); } /** - * Validate the submitted site-information form. + * Submit callback; run cron. + * + * @ingroup forms */ -function system_site_information_settings_validate($form, &$form_state) { - // Validate the e-mail address. - if ($error = user_validate_mail($form_state['values']['site_mail'])) { - form_set_error('site_mail', $error); +function system_run_cron_submit($form, &$form_state) { + // Run cron manually from Cron form. + if (drupal_cron_run()) { + drupal_set_message(t('Cron ran successfully.')); } - // Get the normal path of the front page. - form_set_value($form['site_frontpage'], drupal_get_normal_path($form_state['values']['site_frontpage']), $form_state); - // Validate front page path. - if (!drupal_valid_path($form_state['values']['site_frontpage'])) { - form_set_error('site_frontpage', t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $form_state['values']['site_frontpage']))); + else { + drupal_set_message(t('Cron run failed.'), 'error'); } + + drupal_goto('admin/config/system/cron'); } /** Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.933 diff -u -p -r1.933 system.module --- modules/system/system.module 20 May 2010 08:47:00 -0000 1.933 +++ modules/system/system.module 24 May 2010 03:18:03 -0000 @@ -138,6 +138,8 @@ function system_help($path, $arg) { return '

' . t('IP addresses listed here are blocked from your site before any modules are loaded. You may add IP addresses to the list, or delete existing entries.') . '

'; case 'admin/reports/status': return '

' . t("Here you can find a short overview of your site's parameters as well as any problems detected with your installation. It may be useful to copy and paste this information into support requests filed on drupal.org's support forums and project issue queues.") . '

'; + case 'admin/config/user-interface/error-pages': + return '

' . t("Specify paths to be displayed as errors to site visitors when the content cannot be found (404) or when access has been denied to the user (403). Leave each field blank to use generic error pages.") . '

'; } } @@ -957,15 +959,24 @@ function system_menu() { ); $items['admin/config/system/site-information'] = array( 'title' => 'Site information', - 'description' => 'Change site name, e-mail address, slogan, default front page, number of posts per page, error pages and cron.', + 'description' => 'Change site name, e-mail address, slogan, default front page, and number of posts per page.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_site_information_settings'), 'access arguments' => array('administer site configuration'), 'file' => 'system.admin.inc', 'weight' => -20, ); + $items['admin/config/system/cron'] = array( + 'title' => 'Cron', + 'description' => 'Configure scheduled jobs.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('system_cron_settings'), + 'access arguments' => array('administer site configuration'), + 'file' => 'system.admin.inc', + 'weight' => 20, + ); - // Additional categories + // User interface. $items['admin/config/user-interface'] = array( 'title' => 'User interface', 'description' => 'Tools that enhance the user interface.', @@ -975,6 +986,16 @@ function system_menu() { 'file' => 'system.admin.inc', 'weight' => -15, ); + $items['admin/config/user-interface/error-pages'] = array( + 'title' => 'Error Pages', + 'description' => 'Configure custom error pages.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('system_error_pages_settings'), + 'access arguments' => array('access administration pages'), + 'file' => 'system.admin.inc', + ); + + // Additional categories $items['admin/config/workflow'] = array( 'title' => 'Workflow', 'description' => 'Content workflow, editorial workflow tools.',