Index: index.php
===================================================================
RCS file: /cvs/drupal/drupal/index.php,v
retrieving revision 1.87
diff -u -r1.87 index.php
--- index.php	28 Aug 2005 18:26:20 -0000	1.87
+++ index.php	6 Oct 2005 14:13:28 -0000
@@ -20,6 +20,9 @@
   case MENU_ACCESS_DENIED:
     drupal_access_denied();
     break;
+  case MENU_SITE_OFFLINE:
+    drupal_site_offline();
+    break;
   default:
     if (!empty($return)) {
       print theme('page', $return);
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.85
diff -u -r1.85 menu.inc
--- includes/menu.inc	18 Sep 2005 17:03:26 -0000	1.85
+++ includes/menu.inc	6 Oct 2005 14:13:29 -0000
@@ -164,6 +164,7 @@
 define('MENU_FOUND', 1);
 define('MENU_NOT_FOUND', 2);
 define('MENU_ACCESS_DENIED', 3);
+define('MENU_SITE_OFFLINE', 4);
 
 /**
  * @} End of "Menu status codes".
@@ -324,6 +325,10 @@
  * act as if the user were in a different location on the site.
  */
 function menu_execute_active_handler() {
+  if (_menu_check_if_offline()) {
+    return MENU_SITE_OFFLINE;
+  }
+
   $menu = menu_get_menu();
 
   // Determine the menu item containing the callback.
@@ -1040,3 +1045,17 @@
   return $forked;
 }
 
+
+function _menu_check_if_offline() {
+  // Check if site is set to offline mode
+  if (variable_get('site_offline', 0)) {
+    // Check if the user has administration privileges
+    if (!user_access('administer site configuration')) {
+      // Check if this is an attempt to login
+      if (drupal_get_normal_path($_GET['q']) != 'user/login') {
+        return TRUE;
+      }
+    }
+  }
+  return FALSE;
+}
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.481
diff -u -r1.481 common.inc
--- includes/common.inc	6 Oct 2005 08:51:05 -0000	1.481
+++ includes/common.inc	6 Oct 2005 14:13:30 -0000
@@ -252,6 +252,17 @@
   exit();
 }
 
+
+/**
+ * Generates a site offline message
+ */
+function drupal_site_offline() {
+  header('HTTP/1.0 503 Service unavailable');
+  drupal_set_title(t('Site offline'));
+  print theme('maintenance_page', 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', 'This site')))));
+}
+
 /**
  * Generates a 404 error if the request can not be handled.
  */
Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.235
diff -u -r1.235 system.module
--- modules/system.module	18 Sep 2005 10:37:57 -0000	1.235
+++ modules/system.module	6 Oct 2005 14:13:31 -0000
@@ -279,6 +279,13 @@
 
   $output .= form_group_collapsible(t('Date settings'), $group, TRUE);
 
+  // Site Offline/Maintenance settings
+  $group = '';
+  $group .= form_radios(t('Site status'), 'site_offline', variable_get('site_offline', 0), array(t('Online'), t('Offline')), t('When set to "Online", all visitors will be able to browse your site normally. When set to "Offline", only users with "administer site configuration" permission will be able to access your site to perform maintenance, all other visitors will see the site offline message configured below.'));
+ 
+  $group .= form_textarea(t('Site offline message'), 'site_offline_message', 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', 'This site')))), 60, 5, t('Message to show visitors when site is offline.'));
+  $output .= form_group_collapsible(t('Site maintenance'), $group, TRUE);
+
   // String handling: report status and errors.
   $output .= form_group_collapsible(t('String handling'), unicode_settings(), TRUE);