From bfa6747467ee53696c8025fa928ca5e61d4fc5aa Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 17 Jun 2008 17:38:02 +0000
Subject: [PATCH] - web: shuffle code to eliminate redundancy

svn path=/trunk/boinc/; revision=15419
---
 checkin_notes         | 10 +++++++++-
 html/inc/boinc_db.inc | 10 ++--------
 html/inc/bossa_db.inc |  2 +-
 html/inc/util.inc     | 18 +++++++++++-------
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index f59a7cf4d4..0fae8b6845 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4888,9 +4888,17 @@ David  16 June 2008
     client/
         client_state.C
 
-David  16 June 2008
+David  17 June 2008
     - scheduler: if host.n_bwdown is zero, skip the bandwidth check;
         the host hasn't been measured yet.
 
     sched/
         sched_send.C
+
+David  17 June 2008
+    - web: shuffle code to eliminate redundancy
+
+    html/inc/
+        boinc_db.inc
+        bossa_db.inc
+        util.inc
diff --git a/html/inc/boinc_db.inc b/html/inc/boinc_db.inc
index 178d0a11ea..d91e41d6a1 100644
--- a/html/inc/boinc_db.inc
+++ b/html/inc/boinc_db.inc
@@ -1,7 +1,7 @@
 <?php
 
 require_once("../inc/db_conn.inc");
-require_once("../inc/util_basic.inc");
+require_once("../inc/util.inc");
 
 class BoincDb extends DbConn {
     static $instance;
@@ -12,14 +12,8 @@ class BoincDb extends DbConn {
             if ($generating_xml) {
                 xml_error(-183);
             } else {
-                show_page(
-                    "Page not available",
-                    "This page requires database access.
-                    Our database server is temporarily shut down for maintenance.
-                    Please try again later."
-                );
+                db_maintenance();
             }
-            exit();
         }
         if (!isset($instance)) {
             $config = get_config();
diff --git a/html/inc/bossa_db.inc b/html/inc/bossa_db.inc
index 0e0d36d5f6..44e36d8230 100644
--- a/html/inc/bossa_db.inc
+++ b/html/inc/bossa_db.inc
@@ -1,7 +1,7 @@
 <?php
 
 require_once("../inc/db_conn.inc");
-require_once("../inc/util.inc");
+require_once("../inc/util_basic.inc");
 
 define ('VALIDATE_STATE_INIT', 0);
 define ('VALIDATE_STATE_VALID', 1);
diff --git a/html/inc/util.inc b/html/inc/util.inc
index b103852139..c30dab5757 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -15,19 +15,23 @@ date_default_timezone_set("UTC");
 $generating_xml = false;
 $caching = false;
 
+function db_maintenance() {
+    page_head("Not available");
+    echo "This page requires database access.
+        Our database server is temporarily shut down for maintenance.
+        Please try again later.
+    ";
+    page_tail();
+    exit();
+}
+
 // Connects to database server and selects database as noted in config.xml
 // If only read-only access is necessary,
 // tries instead to connect to <replica_db_host> if tag exists.
 //
 function db_init($try_replica=false) {
     if (web_stopped()) {
-        page_head("Not available");
-        echo "This page requires database access.
-            Our database server is temporarily shut down for maintenance.
-            Please try again later.
-        ";
-        page_tail();
-        exit();
+        db_maintenance();
     }
     $retval = db_init_aux($try_replica);
     if ($retval == 1) {