evolution-cms / evolution

install/actions/action_connection.php

Braces +12 added lines, -9 removed lines

@@ -9,21 +9,24 @@
     $table_prefix = base_convert(rand(10, 20), 10, 36).substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), rand(0, 33), 3).'_';
 } else {
     $database_name = '';
-    if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) $upgradeable = 0;
-    else {
+    if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) {
+        $upgradeable = 0;
+    } else {
         // Include the file so we can test its validity
         include($base_path.MGR_DIR.'/includes/config.inc.php');
         // We need to have all connection settings - but prefix may be empty so we have to ignore it
         if ($dbase) {
             $database_name = trim($dbase, '`');
-            if (!$conn = mysqli_connect($database_server, $database_user, $database_password))
-                $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
-            elseif (! mysqli_select_db($conn, trim($dbase, '`')))
-                $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
-            else
-                $upgradeable = 1;
+            if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) {
+                            $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
+            } elseif (! mysqli_select_db($conn, trim($dbase, '`'))) {
+                            $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
+            } else {
+                            $upgradeable = 1;
+            }
+        } else {
+            $upgradable= 2;
         }
-        else $upgradable= 2;
     }
 }