Merge pull request #3814 from meeting-room-booking-system/3805-upgrad…

…ing-doesnt-work-in-multisite-mode-if-the-sub-sites-do-not-all-use-the-same-database

3805 upgrading doesnt work in multisite mode if the sub sites do not all use the same database

web/css/mrbs.css.php

@@ -2504,6 +2504,13 @@
 }
 
 
+/* ------------- UPGRADE.INC -------------*/
+
+.upgrade_nav {
+  margin-top: 3em;
+}
+
+
 /* ------------ VIEW_ENTRY.PHP ------------------*/
 
 .view_entry #entry td:first-child,

web/dbsys.inc

@@ -87,8 +87,24 @@ function db()
   }
   catch (\Exception $e)
   {
-    $db_obj = DBFactory::create($dbsys, $db_host, $db_login, $db_password,
-                                $db_database, (bool) $db_persist, $db_port, $db_options);
+    try
+    {
+      $db_obj = DBFactory::create(
+        $dbsys,
+        $db_host,
+        $db_login,
+        $db_password,
+        $db_database,
+        (bool)$db_persist,
+        $db_port,
+        $db_options
+      );
+    }
+    catch (\Exception $e)
+    {
+      trigger_error($e->getMessage(), E_USER_WARNING);
+      fatal_error(get_vocab('fatal_db_error'));
+    }
   }
 
   return $db_obj;

web/lang/lang.en

@@ -349,13 +349,17 @@ $vocab["contact_admin"]            = "If you are not the MRBS administrator plea
 $vocab["upgrading_site"]           = "Upgrading site '%s'";  // site name
 $vocab["upgrading_main_site"]      = "Upgrading the main site";
 $vocab["no_tables_found"]          = "No tables found";
+$vocab["already_at_version"]       = "Already at version %d.";
+$vocab["mrbs_upgrade_needed"]      = "A later version of MRBS is required to run against this version of the database tables.";
 $vocab["upgrade_to_version"]       = "Upgrading to database version";
 $vocab["upgrade_to_local_version"] = "Upgrading to database local version";
-$vocab["upgrade_completed"]        = "Database upgrade completed.";
-$vocab["no_handles_main_site"]     = "A database connection could not be established in order to upgrade the main site.";
-$vocab["no_handles_sub_sites"]     = "A database connection could not be established in order to upgrade the following sub-sites:";
-$vocab["retry_from_failing"]       = "Please launch MRBS from one of the failing sites and, when prompted, enter the " .
-                                     "credentials for the database associated with that site.";
+$vocab["upgrade_summary"]          = "Upgrade summary";
+$vocab["upgrade_completed"]        = "Database upgrade successfully completed.";
+$vocab["no_connection"]            = "A database connection could not be established.";
+$vocab["main_site_failed"]         = "The main site could not be upgraded.";
+$vocab["failed_sites"]             = "The following sub-sites could not be upgraded:";
+$vocab["retry_from_failing"]       = "If a database connection could not be established for a site, please launch MRBS " .
+                                     "from that site and, when prompted, enter the database credentials for that site.";
 
 // User access levels
 $vocab["level_0"]            = "none";

web/lib/MRBS/DB.php

@@ -128,13 +128,6 @@ protected function connect(
   }
 
 
-  // Output our own message to avoid giving away the database credentials
-  protected function connectError(string $message): void
-  {
-    trigger_error($message, E_USER_WARNING);
-    fatal_error(get_vocab('fatal_db_error'));
-  }
-
   //
   public function error(): string
   {

web/lib/MRBS/DB_mysql.php

@@ -124,7 +124,7 @@ public function __construct(
         }
         else
         {
-          $this->connectError($message);
+          throw new DBException($message);
         }
       }
     }

web/lib/MRBS/DB_pgsql.php

@@ -60,7 +60,7 @@ public function __construct(
       {
         $message .= ".\n[MRBS note] Try setting " . '$db_host' . " to '127.0.0.1'.";
       }
-      $this->connectError($message);
+      throw new DBException($message);
     }
   }