Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.572
diff -u -r1.572 common.inc
--- includes/common.inc 1 Sep 2006 08:44:25 -0000 1.572
+++ includes/common.inc 7 Sep 2006 06:37:05 -0000
@@ -318,16 +318,27 @@
*/
function drupal_not_found() {
drupal_set_header('HTTP/1.0 404 Not Found');
-
watchdog('page not found', check_plain($_GET['q']), WATCHDOG_WARNING);
+ $return = '';
+
+ if (variable_get('site_404_message_display', TRUE)) {
+ $message = variable_get('site_404_message', t('
The requested content was not found on this site. The content might have been removed or had its location changed.
+
+- If you typed the URL manually, please check the spelling.
+- Visit the front page of and browse for the information you want.
+- Click the "Back" button of your browser to try another link.
+
'));
+ drupal_set_message(filter_xss_admin($message));
+ }
+
// Keep old path for reference
if (!isset($_REQUEST['destination'])) {
$_REQUEST['destination'] = $_GET['q'];
}
$path = drupal_get_normal_path(variable_get('site_404', ''));
- if ($path && $path != $_GET['q']) {
+ if (!empty($path) && $path != $_GET['q']) {
menu_set_active_item($path);
$return = menu_execute_active_handler();
}
@@ -336,8 +347,9 @@
menu_set_active_item('');
}
- if (empty($return)) {
- drupal_set_title(t('Page not found'));
+ if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
+ drupal_set_title(t('404 - File not found'));
+ $return = ' ';
}
// To conserve CPU and bandwidth, omit the blocks
print theme('page', $return, FALSE);
@@ -350,13 +362,25 @@
drupal_set_header('HTTP/1.0 403 Forbidden');
watchdog('access denied', check_plain($_GET['q']), WATCHDOG_WARNING);
-// Keep old path for reference
+ $return = '';
+
+ if (variable_get('site_403_message_display', TRUE)) {
+ $message = variable_get('site_403_message', t('You do not have permission to view this content.
+
+- You may need to log in.
+- Visit the front page of and browse for the information you want.
+- Click the "Back" button of your browser to try another link.
+
'));
+ drupal_set_message(filter_xss_admin($message));
+ }
+
+ // Keep old path for reference
if (!isset($_REQUEST['destination'])) {
$_REQUEST['destination'] = $_GET['q'];
}
$path = drupal_get_normal_path(variable_get('site_403', ''));
- if ($path && $path != $_GET['q']) {
+ if (!empty($path) && $path != $_GET['q']) {
menu_set_active_item($path);
$return = menu_execute_active_handler();
}
@@ -365,9 +389,9 @@
menu_set_active_item('');
}
- if (empty($return)) {
- drupal_set_title(t('Access denied'));
- $return = t('You are not authorized to access this page.');
+ if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
+ drupal_set_title(t('403 - Access denied'));
+ $return = ' ';
}
print theme('page', $return);
}
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.364
diff -u -r1.364 system.module
--- modules/system/system.module 2 Sep 2006 08:02:05 -0000 1.364
+++ modules/system/system.module 7 Sep 2006 06:37:06 -0000
@@ -579,27 +579,65 @@
}
function system_error_reporting_settings() {
-
- $form['site_403'] = array(
+ $form['403'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Access denied page'),
+ '#description' => t('These settings apply when the requested document is denied to the current user, i.e. a 403 error.'),
+ );
+ $form['403']['site_403'] = array(
'#type' => 'textfield',
- '#title' => t('Default 403 (access denied) page'),
+ '#title' => t('Page to display'),
'#default_value' => variable_get('site_403', ''),
- '#description' => t('This page is displayed when the requested document is denied to the current user. If you are not using clean URLs, specify the part after "?q=
". If unsure, specify nothing.')
+ '#description' => t('This page is displayed when the requested document is denied to the current user. If you are not using clean URLs, specify the part after "?q=
". If unsure, leave blank.'),
);
-
- $form['site_404'] = array(
+ $form['403']['site_403_message_display'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Display error message'),
+ '#description' => t('Enabling this feature will display the message below when the requested document is denied to the current user, even if "Page to display" is set.'),
+ '#default_value' => variable_get('site_403_message_display', TRUE),
+ );
+ $form['403']['site_403_message'] = array(
+ '#type' => 'textarea',
+ '#title' => t('Message'),
+ '#default_value' => variable_get('site_403_message', t('You do not have permission to view this content.
+
+- You may need to log in.
+- Visit the front page of and browse for the information you want.
+- Click the "Back" button of your browser to try another link.
+
')),
+ );
+ $form['404'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('File not found page'),
+ '#description' => t('These settings apply when the requested document could not be found, i.e. a 404 error.'),
+ );
+ $form['404']['site_404'] = array(
'#type' => 'textfield',
- '#title' => t('Default 404 (not found) page'),
+ '#title' => t('Page to display'),
'#default_value' => variable_get('site_404', ''),
- '#description' => t('This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after "?q=
". If unsure, specify nothing.')
+ '#description' => t('This page is displayed when the requested document could not be found. If you are not using clean URLs, specify the part after "?q=
". If unsure, leave blank.'),
+ );
+ $form['404']['site_404_message_display'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Display error message'),
+ '#description' => t('Enabling this feature will display the message below when the requested document could not be found, even if "Page to display" is set.'),
+ '#default_value' => variable_get('site_404_message_display', TRUE),
+ );
+ $form['404']['site_404_message'] = array(
+ '#type' => 'textarea',
+ '#title' => t('Message'),
+ '#default_value' => variable_get('site_404_message', t('The requested content was not found on this site. The content might have been removed or had its location changed.
+
+- If you typed the URL manually, please check the spelling.
+- Visit the front page of and browse for the information you want.
+- Click the "Back" button of your browser to try another link.
+
')),
);
-
$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.')
+ '#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.'),
);
-
$period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval');
$period['1000000000'] = t('Never');
$form['watchdog_clear'] = array(
@@ -607,7 +645,7 @@
'#title' => t('Discard log entries older than'),
'#default_value' => variable_get('watchdog_clear', 604800),
'#options' => $period,
- '#description' => t('The time log entries should be kept. Older entries will be automatically discarded. Requires crontab.')
+ '#description' => t('The time log entries should be kept. Older entries will be automatically discarded. Requires crontab.'),
);
return system_settings_form($form);