Rename $CFG->siteclosed to $CFG->siteclosedforupgrade

Bug 1526101: This should help make it clearer what's going
on in init.php and the related auth code, by making the
distinction between $CFG->siteclosed and $CFG->siteclosedbyadmin
clearer.

behatnotneeded: Covered by existing tests

Change-Id: I8bc728622ae965ce25b55ee4b55278771fc1eedc

htdocs/auth/saml/index.php

@@ -444,7 +444,7 @@ function login_test_all_user_authinstance($username, $password) {
     }
 
     // stop right here if the site is closed for any reason
-    $siteclosedforupgrade = get_config('siteclosed');
+    $siteclosedforupgrade = get_config('siteclosedforupgrade');
     if ($siteclosedforupgrade && get_config('disablelogin')) {
         global $SESSION;
         $SESSION->add_error_msg(get_string('siteclosedlogindisabled', 'mahara', get_config('wwwroot') . 'admin/upgrade.php'), false);

htdocs/auth/user.php

@@ -1864,7 +1864,7 @@ class LiveUser extends User {
 }
 
 function is_site_closed($adminuser) {
-    $siteclosedforupgrade = get_config('siteclosed');
+    $siteclosedforupgrade = get_config('siteclosedforupgrade');
     if ($siteclosedforupgrade && get_config('disablelogin')) {
         global $SESSION;
         $SESSION->add_error_msg(get_string('siteclosedlogindisabled', 'mahara', get_config('wwwroot') . 'admin/upgrade.php'), false);

htdocs/init.php

@@ -349,15 +349,15 @@ if (get_config('installed')) {
         ensure_upgrade_sanity();
     }
     $disablelogin  = $config->disablelogin;
-    $cfgsiteclosed = get_config('siteclosed');
+    $cfgsiteclosed = get_config('siteclosedforupgrade');
     if ($upgradeavailable != $cfgsiteclosed) {
-        set_config('siteclosed', $upgradeavailable);
+        set_config('siteclosedforupgrade', $upgradeavailable);
         set_config('disablelogin', $disablelogin);
     }
 }
 
 // If we're in the middle of an upgrade, quit the cron now.
-$siteclosedforupgrade = get_config('siteclosed');
+$siteclosedforupgrade = get_config('siteclosedforupgrade');
 if ($siteclosedforupgrade && defined('CRON')) {
     exit("Site closed for upgrade.\n");
 }

htdocs/lib/web.php

@@ -646,7 +646,7 @@ EOF;
     $smarty->assign('RELEASE', get_config('release'));
     $smarty->assign('SERIES', get_config('series'));
     $smarty->assign('CACHEVERSION', get_config('cacheversion'));
-    $siteclosedforupgrade = get_config('siteclosed');
+    $siteclosedforupgrade = get_config('siteclosedforupgrade');
     if ($siteclosedforupgrade && get_config('disablelogin')) {
         $smarty->assign('SITECLOSED', 'logindisabled');
     }
@@ -755,7 +755,7 @@ EOF;
             );
         }
 
-        $isloginblockvisible = !$USER->is_logged_in() && !(get_config('siteclosed') && get_config('disablelogin'))
+        $isloginblockvisible = !$USER->is_logged_in() && !(get_config('siteclosedforupgrade') && get_config('disablelogin'))
                 && get_config('showloginsideblock');
         if ($isloginblockvisible) {
             $sideblocks[] = array(