From 5e858aca976cc1641a34dd77ee5c22ef976e6d10 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 5 Jan 2017 13:25:52 -0800
Subject: [PATCH] web: if project down for maintenance, say so and quit

---
 doc/project.inc        | 2 +-
 html/inc/bootstrap.inc | 4 +---
 html/inc/util.inc      | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/doc/project.inc b/doc/project.inc
index a242618164..f0f6f5df7d 100644
--- a/doc/project.inc
+++ b/doc/project.inc
@@ -12,7 +12,7 @@ define("IMAGE_URL", "user_profile/images/");
 define("PROFILE_PATH", "../user_profile/");
 define("PROFILE_URL", "user_profile/");
 define("LANGUAGE_FILE", "languages.txt");
-define("STYLESHEET", "custom.css");
+define("STYLESHEET", "dev_custom.css");
 define("COPYRIGHT_HOLDER", "UC Berkeley");
 define("SYS_ADMIN_EMAIL", "davea@ssl.berkeley.edu");
 define("POST_REPORT_EMAILS", "elst93@gmail.com, ksmarkspsych@gmail.com, trog_dog@hotmail.com, DjangoFett@gmx.net");
diff --git a/html/inc/bootstrap.inc b/html/inc/bootstrap.inc
index 8e218314cc..4ee41841ce 100644
--- a/html/inc/bootstrap.inc
+++ b/html/inc/bootstrap.inc
@@ -299,9 +299,7 @@ function form_input_textarea($label, $name, $value='') {
         <div class="form-group">
             <label class="control-label col-sm-2" for="'.$name.'">'.$label.'</label>
             <div class="col-sm-10">
-                <textarea rows="6" class="form-control" id="'.$name.'" name="'.$name.'">
-                '.$value.'
-                </textarea>
+                <textarea rows="6" class="form-control" id="'.$name.'" name="'.$name.'">'.$value.'</textarea>
             </div>
         </div>
     ';
diff --git a/html/inc/util.inc b/html/inc/util.inc
index 29521fef05..c045398d6e 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -128,9 +128,7 @@ function get_logged_in_user($must_be_logged_in=true) {
     global $g_logged_in_user, $got_logged_in_user;
     if ($got_logged_in_user) return $g_logged_in_user;
 
-    if (web_stopped()) {
-        return null;
-    }
+    check_web_stopped();
 
     $authenticator = null;
     if (isset($_COOKIE['auth'])) $authenticator = $_COOKIE['auth'];