evolution-cms / evolution

install/actions/action_options.php

Switch Indentation +42 added lines, -42 removed lines

@@ -183,53 +183,53 @@
 }
 
 switch($installMode){
-    case 0:
-    case 2:
-        $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci';
-        $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
-        $_POST['database_connection_charset'] = $database_charset;
-        if(!empty($_POST['databaseloginpassword']))
-            $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-        if(!empty($_POST['databaseloginname']))
-            $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
-        break;
-    case 1:
-        include $base_path . MGR_DIR . '/includes/config.inc.php';
-        if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) {
-            if (@ mysqli_query($conn, "USE {$dbase}")) {
-                if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
-                    $rs = mysqli_query($conn, "show session variables like 'collation_server'");
-                }
-                if ($rs && $collation = mysqli_fetch_row($rs)) {
-                    $database_collation = trim($collation[1]);
+        case 0:
+        case 2:
+            $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci';
+            $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
+            $_POST['database_connection_charset'] = $database_charset;
+            if(!empty($_POST['databaseloginpassword']))
+                $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
+            if(!empty($_POST['databaseloginname']))
+                $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
+            break;
+        case 1:
+            include $base_path . MGR_DIR . '/includes/config.inc.php';
+            if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) {
+                if (@ mysqli_query($conn, "USE {$dbase}")) {
+                    if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
+                        $rs = mysqli_query($conn, "show session variables like 'collation_server'");
+                    }
+                    if ($rs && $collation = mysqli_fetch_row($rs)) {
+                        $database_collation = trim($collation[1]);
+                    }
                 }
             }
-        }
-        if (empty ($database_collation)) $database_collation = 'utf8_general_ci';
+            if (empty ($database_collation)) $database_collation = 'utf8_general_ci';
 
-        $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
-        if (!isset ($database_connection_charset) || empty ($database_connection_charset)) {
-            $database_connection_charset = $database_charset;
-        }
+            $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
+            if (!isset ($database_connection_charset) || empty ($database_connection_charset)) {
+                $database_connection_charset = $database_charset;
+            }
 
-        if (!isset ($database_connection_method) || empty ($database_connection_method)) {
-            $database_connection_method = 'SET CHARACTER SET';
-            if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_connection_charset);
-        }
-        if ($database_connection_method != 'SET NAMES' && $database_connection_charset != $database_charset) {
-            $database_connection_method = 'SET NAMES';
-        }
+            if (!isset ($database_connection_method) || empty ($database_connection_method)) {
+                $database_connection_method = 'SET CHARACTER SET';
+                if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_connection_charset);
+            }
+            if ($database_connection_method != 'SET NAMES' && $database_connection_charset != $database_charset) {
+                $database_connection_method = 'SET NAMES';
+            }
 
-        $_POST['database_name'] = $dbase;
-        $_POST['tableprefix'] = $table_prefix;
-        $_POST['database_connection_charset'] = $database_connection_charset;
-        $_POST['database_connection_method'] = $database_connection_method;
-        $_POST['databasehost'] = $database_server;
-        $_SESSION['databaseloginname'] = $database_user;
-        $_SESSION['databaseloginpassword'] = $database_password;
-        break;
-    default:
-        throw new Exception('installmode is undefined');
+            $_POST['database_name'] = $dbase;
+            $_POST['tableprefix'] = $table_prefix;
+            $_POST['database_connection_charset'] = $database_connection_charset;
+            $_POST['database_connection_method'] = $database_connection_method;
+            $_POST['databasehost'] = $database_server;
+            $_SESSION['databaseloginname'] = $database_user;
+            $_SESSION['databaseloginpassword'] = $database_password;
+            break;
+        default:
+            throw new Exception('installmode is undefined');
 }
 
 $ph['install_language'] = $install_language;

Spacing +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
 
-if( ! function_exists('getTemplates')) {
+if (!function_exists('getTemplates')) {
     /**
      * @param array $presets
      * @return string
@@ -25,11 +25,11 @@ 
             $_[] = parse($tpl, $ph);
             $i++;
         }
-        return (0 < count($_)) ? '<h3>[%templates%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%templates%]</h3>'.implode("\n", $_) : '';
     }
 }
 
-if( ! function_exists('getTVs')) {
+if (!function_exists('getTVs')) {
     /**
      * @param array $presets
      * @return string
@@ -54,11 +54,11 @@ 
             $_[] = parse($tpl, $ph);
             $i++;
         }
-        return (0 < count($_)) ? '<h3>[%tvs%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%tvs%]</h3>'.implode("\n", $_) : '';
     }
 }
 
-if( ! function_exists('getChunks')) {
+if (!function_exists('getChunks')) {
     /**
      * display chunks
      *
@@ -84,11 +84,11 @@ 
             $_[] = parse($tpl, $ph);
             $i++;
         }
-        return (0 < count($_)) ? '<h3>[%chunks%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%chunks%]</h3>'.implode("\n", $_) : '';
     }
 }
 
-if( ! function_exists('getModules')) {
+if (!function_exists('getModules')) {
     /**
      * display modules
      *
@@ -114,11 +114,11 @@ 
             $_[] = parse($tpl, $ph);
             $i++;
         }
-        return (0 < count($_)) ? '<h3>[%modules%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%modules%]</h3>'.implode("\n", $_) : '';
     }
 }
 
-if( ! function_exists('getPlugins')) {
+if (!function_exists('getPlugins')) {
     /**
      * display plugins
      *
@@ -148,11 +148,11 @@ 
             $_[] = parse($tpl, $ph);
             $i++;
         }
-        return (0 < count($_)) ? '<h3>[%plugins%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%plugins%]</h3>'.implode("\n", $_) : '';
     }
 }
 
-if( ! function_exists('getSnippets')) {
+if (!function_exists('getSnippets')) {
     /**
      * display snippets
      *
@@ -178,23 +178,23 @@ 
             $_[] = parse($tpl, $ph);
             $i++;
         }
-        return (0 < count($_)) ? '<h3>[%snippets%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%snippets%]</h3>'.implode("\n", $_) : '';
     }
 }
 
-switch($installMode){
+switch ($installMode) {
     case 0:
     case 2:
         $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci';
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $_POST['database_connection_charset'] = $database_charset;
-        if(!empty($_POST['databaseloginpassword']))
+        if (!empty($_POST['databaseloginpassword']))
             $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-        if(!empty($_POST['databaseloginname']))
+        if (!empty($_POST['databaseloginname']))
             $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
         break;
     case 1:
-        include $base_path . MGR_DIR . '/includes/config.inc.php';
+        include $base_path.MGR_DIR.'/includes/config.inc.php';
         if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) {
             if (@ mysqli_query($conn, "USE {$dbase}")) {
                 if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
@@ -249,7 +249,7 @@ 
 $ph['checked'] = isset ($_POST['installdata']) && $_POST['installdata'] == "1" ? 'checked' : '';
 
 # load setup information file
-include($base_path . 'install/setup.info.php');
+include($base_path.'install/setup.info.php');
 $ph['templates'] = getTemplates($moduleTemplates);
 $ph['tvs']       = getTVs($moduleTVs);
 $ph['chunks']    = getChunks($moduleChunks);
@@ -259,6 +259,6 @@ 
 
 $ph['action'] = ($installMode == 1) ? 'mode' : 'connection';
 
-$tpl = file_get_contents($base_path . 'install/actions/tpl_options.html');
-$content = parse($tpl,$ph);
-echo parse($content,$_lang,'[%','%]');
+$tpl = file_get_contents($base_path.'install/actions/tpl_options.html');
+$content = parse($tpl, $ph);
+echo parse($content, $_lang, '[%', '%]');

Braces +13 added lines, -7 removed lines

@@ -182,16 +182,18 @@ 
     }
 }
 
-switch($installMode){
+switch($installMode) {
     case 0:
     case 2:
         $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci';
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $_POST['database_connection_charset'] = $database_charset;
-        if(!empty($_POST['databaseloginpassword']))
-            $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-        if(!empty($_POST['databaseloginname']))
-            $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
+        if(!empty($_POST['databaseloginpassword'])) {
+                    $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
+        }
+        if(!empty($_POST['databaseloginname'])) {
+                    $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
+        }
         break;
     case 1:
         include $base_path . MGR_DIR . '/includes/config.inc.php';
@@ -205,7 +207,9 @@ 
                 }
             }
         }
-        if (empty ($database_collation)) $database_collation = 'utf8_general_ci';
+        if (empty ($database_collation)) {
+            $database_collation = 'utf8_general_ci';
+        }
 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         if (!isset ($database_connection_charset) || empty ($database_connection_charset)) {
@@ -214,7 +218,9 @@ 
 
         if (!isset ($database_connection_method) || empty ($database_connection_method)) {
             $database_connection_method = 'SET CHARACTER SET';
-            if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_connection_charset);
+            if (function_exists('mysqli_set_charset')) {
+                mysqli_set_charset($conn, $database_connection_charset);
+            }
         }
         if ($database_connection_method != 'SET NAMES' && $database_connection_charset != $database_charset) {
             $database_connection_method = 'SET NAMES';