web: if web stopped, get_logged_in_user() should return null (not show error page).

Otherwise e.g. the home page will be a single line.
Must at least show message of the day.
This commit is contained in:
David Anderson 2017-02-08 11:54:40 -08:00
parent 51f73ebce8
commit b59f0da617
2 changed files with 11 additions and 11 deletions

View File

@ -387,16 +387,16 @@ $astro_phys_chem = array(
"",
tra("Improve the design of the Large Hadron Collider")
),
array(
"vLHCathome",
"http://lhcathome2.cern.ch/vLHCathome/",
tra("CERN (European Organization for Nuclear Research)"),
tra("Physics"),
tra("This project uses CERN-developed virtual machine technology for LHC event physics simulation on volunteer computers. Requires that you install VirtualBox on your computer"),
"t4t.png",
"",
tra("Simulate high-energy particle collisions")
),
// array(
// "vLHCathome",
// "http://lhcathome2.cern.ch/vLHCathome/",
// tra("CERN (European Organization for Nuclear Research)"),
// tra("Physics"),
// tra("This project uses CERN-developed virtual machine technology for LHC event physics simulation on volunteer computers. Requires that you install VirtualBox on your computer"),
// "t4t.png",
// "",
// tra("Simulate high-energy particle collisions")
// ),
array(
"ATLAS@Home",
"http://atlasathome.cern.ch/",

View File

@ -139,7 +139,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;
check_web_stopped();
if (web_stopped()) return null;
$authenticator = null;
if (isset($_COOKIE['auth'])) $authenticator = $_COOKIE['auth'];