app/helpers/database.php

@@ -13,9 +13,10 @@ function connectDB($config, $database = '', $dbFile = '', $platformId = '') {
                 'type'		=> 'sqlite',
                 'dbFile'	=> $dbFile,
             ]);
-            return ['db' => $db, 'error' => null];
         } catch (Exception $e) {
-            return ['db' => null, 'error' => getError('Error connecting to DB.', $e->getMessage())];
+            $error = getError('Error connecting to DB.', $e->getMessage());
+            include '../app/templates/block-message.php';
+            exit();
         }
 
     // connecting to a jilo-web database of the web app
@@ -29,9 +30,10 @@ function connectDB($config, $database = '', $dbFile = '', $platformId = '') {
                     'dbFile'	=> $config['db']['sqlite_file'],
                 ]);
                 $pdo = $db->getConnection();
-                return ['db' => $db, 'error' => null];
             } catch (Exception $e) {
-                return ['db' => null, 'error' => getError('Error connecting to DB.', $e->getMessage())];
+                $error = getError('Error connecting to DB.', $e->getMessage());
+                include '../app/templates/block-message.php';
+                exit();
             }
         // mysql/mariadb database
         } elseif ($config['db']['db_type'] === 'mysql' || $config['db']['db_type'] === 'mariadb') {
@@ -45,9 +47,10 @@ function connectDB($config, $database = '', $dbFile = '', $platformId = '') {
                     'password'	=> $config['db']['sql_password'],
                 ]);
                 $pdo = $db->getConnection();
-                return ['db' => $db, 'error' => null];
             } catch (Exception $e) {
-                return ['db' => null, 'error' => getError('Error connecting to DB.', $e->getMessage())];
+                $error = getError('Error connecting to DB.', $e->getMessage());
+                include '../app/templates/block-message.php';
+                exit();
             }
         // unknown database
         } else {
@@ -58,5 +61,6 @@ function connectDB($config, $database = '', $dbFile = '', $platformId = '') {
 
     }
 
+    return $db;
 }
 ?>

app/pages/dashboard.php

@@ -4,13 +4,8 @@ require '../app/classes/conference.php';
 require '../app/classes/participant.php';
 
 // connect to database
-$response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $platform_id);
+$db = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $platform_id);
-if ($response['db'] === null) {
+
-    $error = $response['error'];
-    include '../app/templates/block-message.php';
-} else {
-    $db = $response['db'];
-}
 
 //
 // dashboard widget listings

app/templates/block-message.php

@@ -1,24 +1,13 @@
 <?php
 
-// 'error' for errors
+// 'notice' for all non-critical messages
 if (isset($_SESSION['error'])) {
     echo "\t\t" . '<div class="error">' . $_SESSION['error'] . '</div>';
 }
 
-// 'notice' for all non-critical messages
-if (isset($_SESSION['notice'])) {
-    echo "\t\t" . '<div class="notice">' . $_SESSION['notice'] . '</div>';
-}
-
 // 'error' for errors
-if (isset($error)) {
-    echo "\t\t" . '<div class="error">' . $error . '</div>';
-}
-
-// 'notice' for all non-critical messages
 if (isset($_SESSION['notice'])) {
     echo "\t\t" . '<div class="notice">' . $_SESSION['notice'] . '</div>';
 }
 
-
 ?>