evolution-cms / evolution

install/src/controllers/mode.php

Spacing +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 // Determine upgradeability
 $upgradeable = 0;
-if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity
-    include_once $base_path . MGR_DIR . '/includes/config.inc.php';
+if (is_file($base_path.MGR_DIR.'/includes/config.inc.php')) { // Include the file so we can test its validity
+    include_once $base_path.MGR_DIR.'/includes/config.inc.php';
     // We need to have all connection settings - tho prefix may be empty so we have to ignore it
     if (isset($dbase)) {
         if (!$conn = @mysqli_connect($database_server, $database_user, $database_password))
@@ -17,16 +17,16 @@ 
 }
 
 $ph['moduleName']       = $moduleName;
-$ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';
-$ph['displayUpg']       = ($upgradeable==0) ? 'display:none;' : '';
+$ph['displayNew']       = ($upgradeable != 0) ? 'display:none;' : '';
+$ph['displayUpg']       = ($upgradeable == 0) ? 'display:none;' : '';
 $ph['displayAdvUpg']    = $ph['displayUpg'];
-$ph['checkedNew']       = !$upgradeable     ? 'checked' : '';
-$ph['checkedUpg']       = ($_POST['installmode']==1 || $upgradeable==1) ? 'checked' : '';
-$ph['checkedAdvUpg']    = ($_POST['installmode']==2 || $upgradeable==2) ? 'checked' : '';
+$ph['checkedNew']       = !$upgradeable ? 'checked' : '';
+$ph['checkedUpg']       = ($_POST['installmode'] == 1 || $upgradeable == 1) ? 'checked' : '';
+$ph['checkedAdvUpg']    = ($_POST['installmode'] == 2 || $upgradeable == 2) ? 'checked' : '';
 $ph['install_language'] = $install_language;
-$ph['disabledUpg']      = ($upgradeable!=1) ? 'disabled' : '';
-$ph['disabledAdvUpg']   = ($upgradeable==0) ? 'disabled' : '';
+$ph['disabledUpg']      = ($upgradeable != 1) ? 'disabled' : '';
+$ph['disabledAdvUpg']   = ($upgradeable == 0) ? 'disabled' : '';
 
-$tpl = file_get_contents(dirname(__DIR__) . '/template/actions/mode.tpl');
+$tpl = file_get_contents(dirname(__DIR__).'/template/actions/mode.tpl');
 $content = parse($tpl, $ph);
-echo parse($content, $_lang,'[%','%]');
+echo parse($content, $_lang, '[%', '%]');

install/src/controllers/options.php

Spacing +7 added lines, -7 removed lines

@@ -1,19 +1,19 @@ 
 <?php
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
 
-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($_SESSION['databaseloginpassword']))
+        if (empty($_SESSION['databaseloginpassword']))
             $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-        if(empty($_SESSION['databaseloginname']))
+        if (empty($_SESSION['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'")) {
@@ -68,7 +68,7 @@ 
 $ph['checked'] = isset ($_POST['installdata']) && $_POST['installdata'] == "1" ? 'checked' : '';
 
 # load setup information file
-include_once dirname(__DIR__) . '/processor/result.php';
+include_once dirname(__DIR__).'/processor/result.php';
 $ph['templates'] = getTemplates($moduleTemplates);
 $ph['tvs']       = getTVs($moduleTVs);
 $ph['chunks']    = getChunks($moduleChunks);
@@ -78,6 +78,6 @@ 
 
 $ph['action'] = ($installMode == 1) ? 'mode' : 'connection';
 
-$tpl = file_get_contents(dirname(__DIR__) . '/template/actions/options.tpl');
+$tpl = file_get_contents(dirname(__DIR__).'/template/actions/options.tpl');
 $content = parse($tpl, $ph);
 echo parse($content, $_lang, '[%', '%]');

install/src/controllers/connection/databasetest.php

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
 
 $output = $_lang["status_checking_database"];
 if (!$conn = mysqli_connect($host, $uid, $pwd)) {
-    $output .= '<span id="database_fail" style="color:#FF0000;">' . $_lang['status_failed'] . '</span>';
+    $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed'].'</span>';
 } else {
     $database_name = mysqli_real_escape_string($conn, $_POST['database_name']);
     $database_name = str_replace("`", "", $database_name);
@@ -18,22 +18,22 @@ 
     if (!@ mysqli_select_db($conn, $database_name)) {
         // create database
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
-        $query = "CREATE DATABASE `" . $database_name . "` CHARACTER SET " . $database_charset . " COLLATE " . $database_collation . ";";
+        $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
         if (!mysqli_query($conn, $query)) {
-            $output .= '<span id="database_fail" style="color:#FF0000;">' . $_lang['status_failed_could_not_create_database'] . '</span>';
+            $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
         } else {
-            $output .= '<span id="database_pass" style="color:#80c000;">' . $_lang['status_passed_database_created'] . '</span>';
+            $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed_database_created'].'</span>';
         }
     } elseif (($installMode == 0) && (mysqli_query($conn,
             "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) {
-        $output .= '<span id="database_fail" style="color:#FF0000;">' . $_lang['status_failed_table_prefix_already_in_use'] . '</span>';
+        $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_table_prefix_already_in_use'].'</span>';
     } elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn,
             "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
-        $output .= '<span id="database_fail" style="color:#FF0000;">' . sprintf($_lang['status_failed_database_collation_does_not_match'],
-                $row[1]) . '</span>';
+        $output .= '<span id="database_fail" style="color:#FF0000;">'.sprintf($_lang['status_failed_database_collation_does_not_match'],
+                $row[1]).'</span>';
     } else {
-        $output .= '<span id="database_pass" style="color:#80c000;">' . $_lang['status_passed'] . '</span>';
+        $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed'].'</span>';
     }
 }
 

install/src/controllers/connection/servertest.php

Spacing +5 added lines, -5 removed lines

@@ -7,13 +7,13 @@ 
 $output = $_lang["status_connecting"];
 if (function_exists('mysqli_connect')) {
     if (!$conn = @mysqli_connect($host, $uid, $pwd)) {
-        $output .= '<span id="server_fail" style="color:#FF0000;"> ' . $_lang['status_failed'] . '</span>';
+        $output .= '<span id="server_fail" style="color:#FF0000;"> '.$_lang['status_failed'].'</span>';
     } else {
-        $output .= '<span id="server_pass" style="color:#80c000;"> ' . $_lang['status_passed_server'] . '</span>';
+        $output .= '<span id="server_pass" style="color:#80c000;"> '.$_lang['status_passed_server'].'</span>';
 
         // Mysql version check
         if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
-            $output .= '<br /><span style="color:#FF0000;"> ' . $_lang['mysql_5051'] . '</span>';
+            $output .= '<br /><span style="color:#FF0000;"> '.$_lang['mysql_5051'].'</span>';
         }
         // Mode check
         $mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode");
@@ -26,11 +26,11 @@ 
                 }
             }
             if ($strictMode) {
-                $output .= '<br /><span style="color:#FF0000;"> ' . $_lang['strict_mode'] . '</span>';
+                $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
             }
         }
     }
 } else {
-    $output .= '<span id="server_fail" style="color:#FF0000;"> ' . $_lang['status_failed_mysqli'] . '</span>';
+    $output .= '<span id="server_fail" style="color:#FF0000;"> '.$_lang['status_failed_mysqli'].'</span>';
 }
 echo $output;

install/src/controllers/language.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 
-$content = file_get_contents(dirname(__DIR__) . '/template/actions/language.tpl');
+$content = file_get_contents(dirname(__DIR__).'/template/actions/language.tpl');
 $content = parse($content, array(
     'langOptions' => getLangOptions($install_language))
 );
-$content = parse($content, $_lang,'[%','%]');
+$content = parse($content, $_lang, '[%', '%]');
 
 echo $content;

install/src/controllers/connection.php

Spacing +8 added lines, -8 removed lines

@@ -1,27 +1,27 @@ 
 <?php
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
 
 // Determine upgradeability
 $upgradeable = 0;
 if ($installMode === 0) {
     $database_name = '';
     $database_server = 'localhost';
-    $table_prefix = base_convert(mt_rand(10, 20), 10, 36) .
-        substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), mt_rand(0, 33), 3) .
+    $table_prefix = base_convert(mt_rand(10, 20), 10, 36).
+        substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), mt_rand(0, 33), 3).
         '_';
 } else {
     $database_name = '';
-    if (! is_file($base_path . MGR_DIR . '/includes/config.inc.php')) {
+    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';
+        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, '`'))) {
+            } elseif (!mysqli_select_db($conn, trim($dbase, '`'))) {
                 $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] === 'new') ? 0 : 2;
             } else {
                 $upgradeable = 1;
@@ -33,7 +33,7 @@ 
 }
 
 // check the database collation if not specified in the configuration
-if ($upgradeable && (! isset($database_connection_charset) || empty($database_connection_charset))) {
+if ($upgradeable && (!isset($database_connection_charset) || empty($database_connection_charset))) {
     if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
         $rs = mysqli_query($conn, "show session variables like 'collation_server'");
     }
@@ -77,7 +77,7 @@ 
 $ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword'] : "";
 $ph['MGR_DIR'] = MGR_DIR;
 
-$content = file_get_contents(dirname(__DIR__) . '/template/actions/connection.tpl');
+$content = file_get_contents(dirname(__DIR__).'/template/actions/connection.tpl');
 $content = parse($content, $_lang, '[%', '%]');
 $content = parse($content, $ph);
 

install/src/controllers/summary.php

Spacing +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! function_exists('f_owc')){
+if (!function_exists('f_owc')) {
     /**
      * @param $path
      * @param $data
@@ -12,30 +12,30 @@ 
             fwrite($hnd, $data);
             fclose($hnd);
 
-            if(null !== $mode) chmod($path, $mode);
-        }catch(Exception $e){
+            if (null !== $mode) chmod($path, $mode);
+        } catch (Exception $e) {
             // Nothing, this is NOT normal
             unset($e);
         }
     }
 }
 
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
-if( ! isset($_lang)) $_lang = array();
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
+if (!isset($_lang)) $_lang = array();
 
 echo '<div class="stepcontainer">
       <ul class="progressbar">
-          <li class="visited">' . $_lang['choose_language'] . '</li>
-          <li class="visited">' . $_lang['installation_mode'] . '</li>
-          <li class="visited">' . $_lang['optional_items'] . '</li>
-          <li class="active">' . $_lang['preinstall_validation'] . '</li>
-          <li>' . $_lang['install_results'] . '</li>
+          <li class="visited">' . $_lang['choose_language'].'</li>
+          <li class="visited">' . $_lang['installation_mode'].'</li>
+          <li class="visited">' . $_lang['optional_items'].'</li>
+          <li class="active">' . $_lang['preinstall_validation'].'</li>
+          <li>' . $_lang['install_results'].'</li>
   </ul>
   <div class="clearleft"></div>
 </div>';
 
-echo '<h2>' . $_lang['preinstall_validation'] . '</h2>';
-echo '<h3>' . $_lang['summary_setup_check'] . '</h3>';
+echo '<h2>'.$_lang['preinstall_validation'].'</h2>';
+echo '<h3>'.$_lang['summary_setup_check'].'</h3>';
 
 $errors = 0;
 
@@ -43,73 +43,73 @@ 
 // check PHP version
 define('PHP_MIN_VERSION', '5.4.0');
 $phpMinVersion = PHP_MIN_VERSION; // Maybe not necessary. For backward compatibility
-echo '<p>' . $_lang['checking_php_version'];
+echo '<p>'.$_lang['checking_php_version'];
 // -1 if left is less, 0 if equal, +1 if left is higher
 if (version_compare(phpversion(), PHP_MIN_VERSION) < 0) {
     $errors++;
-    $tmp = $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
-    echo '<span class="notok">' . $_lang['failed'] . '</span>' . $tmp . '</p>';
+    $tmp = $_lang['you_running_php'].phpversion().str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
+    echo '<span class="notok">'.$_lang['failed'].'</span>'.$tmp.'</p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check if iconv is available
-echo '<p>' . $_lang['checking_iconv'];
+echo '<p>'.$_lang['checking_iconv'];
 $iconv = (int) function_exists('iconv');
-if ($iconv == '0'){
-    echo '<span class="notok">' . $_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
+if ($iconv == '0') {
+    echo '<span class="notok">'.$_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 // check sessions
-echo '<p>' . $_lang['checking_sessions'];
+echo '<p>'.$_lang['checking_sessions'];
 if ($_SESSION['test'] != 1) {
-    echo '<span class="notok">' . $_lang['failed'].  '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check directories
 // cache exists?
-echo '<p>' . $_lang['checking_if_cache_exist'];
+echo '<p>'.$_lang['checking_if_cache_exist'];
 if (!file_exists("../assets/cache") || !file_exists("../assets/cache/rss")) {
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache writable?
-echo '<p>' . $_lang['checking_if_cache_writable'];
+echo '<p>'.$_lang['checking_if_cache_writable'];
 if (!is_writable("../assets/cache")) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache files writable?
-echo '<p>' . $_lang['checking_if_cache_file_writable'];
+echo '<p>'.$_lang['checking_if_cache_file_writable'];
 $tmp = "../assets/cache/siteCache.idx.php";
-if ( ! file_exists($tmp)) {
+if (!file_exists($tmp)) {
     f_owc($tmp, "<?php //EVO site cache file ?>");
 }
-if ( ! is_writable($tmp)) {
+if (!is_writable($tmp)) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
     echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 echo '<p>'.$_lang['checking_if_cache_file2_writable'];
-if ( ! is_writable("../assets/cache/sitePublishing.idx.php")) {
+if (!is_writable("../assets/cache/sitePublishing.idx.php")) {
     $errors++;
     echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
@@ -119,7 +119,7 @@ 
 
 // File Browser directories exists?
 echo '<p>'.$_lang['checking_if_images_exist'];
-switch(true){
+switch (true) {
     case !file_exists("../assets/images"):
     case !file_exists("../assets/files"):
     case !file_exists("../assets/backup"):
@@ -134,7 +134,7 @@ 
 
 // File Browser directories writable?
 echo '<p>'.$_lang['checking_if_images_writable'];
-switch(true){
+switch (true) {
     case !is_writable("../assets/images"):
     case !is_writable("../assets/files"):
     case !is_writable("../assets/backup"):
@@ -194,7 +194,7 @@ 
     $database_charset = substr($database_collation, 0, strpos($database_collation, '_') - 1);
     $database_connection_charset = $_POST['database_connection_charset'];
     $database_connection_method = $_POST['database_connection_method'];
-    $dbase = '`' . $_POST['database_name'] . '`';
+    $dbase = '`'.$_POST['database_name'].'`';
     $table_prefix = $_POST['tableprefix'];
 }
 echo '<p>'.$_lang['creating_database_connection'];
@@ -234,54 +234,54 @@ 
 
 // check table prefix
 if ($conn && $installMode == 0) {
-    echo '<p>' . $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if ($rs= mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_already_inuse'] . '</p>';
+    echo '<p>'.$_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if ($rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed'].'</span></b>'.$_lang['table_prefix_already_inuse'].'</p>';
         $errors++;
-        echo "<p>" . $_lang['table_prefix_already_inuse_note'] . '</p>';
+        echo "<p>".$_lang['table_prefix_already_inuse_note'].'</p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 } elseif ($conn && $installMode == 2) {
-    echo '<p>' . $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_not_exist'] . '</p>';
+    echo '<p>'.$_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed'].'</span></b>'.$_lang['table_prefix_not_exist'].'</p>';
         $errors++;
-        echo '<p>' . $_lang['table_prefix_not_exist_note'] . '</p>';
+        echo '<p>'.$_lang['table_prefix_not_exist_note'].'</p>';
   } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
   }
 }
 
 // check mysql version
 if ($conn) {
-    echo '<p>' . $_lang['checking_mysql_version'];
-    if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
-        echo '<span class="notok">'  . $_lang['warning'] . '</span></b>&nbsp;&nbsp;<strong>' . $_lang['mysql_5051'] . '</strong></p>';
-        echo '<p><span class="notok">' . $_lang['mysql_5051_warning'] . '</span></p>';
+    echo '<p>'.$_lang['checking_mysql_version'];
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
+        echo '<span class="notok">'.$_lang['warning'].'</span></b>&nbsp;&nbsp;<strong>'.$_lang['mysql_5051'].'</strong></p>';
+        echo '<p><span class="notok">'.$_lang['mysql_5051_warning'].'</span></p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span>&nbsp;&nbsp;<strong>' . $_lang['mysql_version_is'] . mysqli_get_server_info($conn) . '</strong></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span>&nbsp;&nbsp;<strong>'.$_lang['mysql_version_is'].mysqli_get_server_info($conn).'</strong></p>';
     }
 }
 
 // check for strict mode
 if ($conn) {
-    echo '<p>'. $_lang['checking_mysql_strict_mode'];
+    echo '<p>'.$_lang['checking_mysql_strict_mode'];
     $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode");
-    if (mysqli_num_rows($mysqlmode) > 0){
+    if (mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         //$modes = array("STRICT_TRANS_TABLES"); // for testing
         // print_r($modes);
         foreach ($modes as $mode) {
             if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
-                echo '<span class="notok">' . $_lang['warning'] . '</span></b> <strong>&nbsp;&nbsp;' . $_lang['strict_mode'] . '</strong></p>';
-                echo '<p><span class="notok">' . $_lang['strict_mode_error'] . '</span></p>';
+                echo '<span class="notok">'.$_lang['warning'].'</span></b> <strong>&nbsp;&nbsp;'.$_lang['strict_mode'].'</strong></p>';
+                echo '<p><span class="notok">'.$_lang['strict_mode_error'].'</span></p>';
             } else {
-                echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+                echo '<span class="ok">'.$_lang['ok'].'</span></p>';
             }
         }
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 }
 // Version and strict mode check end
@@ -297,18 +297,18 @@ 
     f_owc("../assets/cache/installProc.inc.php", '<?php $installStartTime = '.time().'; ?>');
 }
 
-if($installMode > 0 && $_POST['installdata'] == "1") {
-    echo '<p class="notes"><strong>' . $_lang['sample_web_site'] . ':</strong> ' . $_lang['sample_web_site_note'] . '</p>';
+if ($installMode > 0 && $_POST['installdata'] == "1") {
+    echo '<p class="notes"><strong>'.$_lang['sample_web_site'].':</strong> '.$_lang['sample_web_site_note'].'</p>';
 }
 
 if ($errors > 0) {
     echo '<p>';
-    echo $_lang['setup_cannot_continue'] . ' ';
+    echo $_lang['setup_cannot_continue'].' ';
 
-    if($errors > 1){
-        echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
-    }else{
-        echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again'];
+    if ($errors > 1) {
+        echo $errors." ".$_lang['errors'].$_lang['please_correct_errors'].$_lang['and_try_again_plural'];
+    } else {
+        echo $_lang['error'].$_lang['please_correct_error'].$_lang['and_try_again'];
     }
 
     echo $_lang['visit_forum'];
@@ -317,10 +317,10 @@ 
 
 echo '<p>&nbsp;</p>';
 
-$nextAction= $errors > 0 ? 'summary' : 'install';
-$nextButton= $errors > 0 ? $_lang['retry'] : $_lang['install'];
-$nextVisibility= $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
-$agreeToggle= $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
+$nextAction = $errors > 0 ? 'summary' : 'install';
+$nextButton = $errors > 0 ? $_lang['retry'] : $_lang['install'];
+$nextVisibility = $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
+$agreeToggle = $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
 ?>
 <form name="install" id="install_form" action="index.php?action=<?php echo $nextAction ?>" method="post">
   <div>
@@ -342,32 +342,32 @@ 
 
     <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" />
 <?php
-    $templates = isset ($_POST['template']) ? $_POST['template'] : array ();
+    $templates = isset ($_POST['template']) ? $_POST['template'] : array();
     foreach ($templates as $i => $template) echo '<input type="hidden" name="template[]" value="'.$template.'" />';
 
-    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
+    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array();
     foreach ($tvs as $i => $tv) echo '<input type="hidden" name="tv[]" value="'.$tv.'" />';
 
-    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
+    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array();
     foreach ($chunks as $i => $chunk) echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />';
 
-    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
+    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array();
     foreach ($snippets as $i => $snippet) echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />';
 
-    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
+    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array();
     foreach ($plugins as $i => $plugin) echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />';
 
-    $modules = isset ($_POST['module']) ? $_POST['module'] : array ();
+    $modules = isset ($_POST['module']) ? $_POST['module'] : array();
     foreach ($modules as $i => $module) echo '<input type="hidden" name="module[]" value="'.$module.'" />';
 ?>
 </div>
 
-<h2><?php echo $_lang['agree_to_terms'];?></h2>
+<h2><?php echo $_lang['agree_to_terms']; ?></h2>
 <p>
-<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ':""; ?><?php echo $agreeToggle;?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
+<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ' : ""; ?><?php echo $agreeToggle; ?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
 </p>
     <p class="buttonlinks">
         <a href="javascript:document.getElementById('install_form').action='index.php?action=options&language=<?php echo $install_language?>';document.getElementById('install_form').submit();" class="prev" title="<?php echo $_lang['btnback_value']?>"><span><?php echo $_lang['btnback_value']?></span></a>
-        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility;?>"><span><?php echo $nextButton ?></span></a>
+        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility; ?>"><span><?php echo $nextButton ?></span></a>
     </p>
 </form>

install/src/sqlParser.class.php

Spacing +20 added lines, -20 removed lines

@@ -3,7 +3,7 @@ 
 // MySQL Dump Parser
 // SNUFFKIN/ Alex 2004
 
-class SqlParser {
+class SqlParser{
 	public $host;
 	public $dbname;
 	public $prefix;
@@ -28,7 +28,7 @@ 
     public $ignoreDuplicateErrors;
     public $autoTemplateLogic;
 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+	public function __construct($host, $user, $password, $db, $prefix = 'modx_', $adminname, $adminemail, $adminpass, $connection_charset = 'utf8', $managerlanguage = 'english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent'){
 		$this->host = $host;
 		$this->dbname = $db;
 		$this->prefix = $prefix;
@@ -44,28 +44,28 @@ 
         $this->autoTemplateLogic = $auto_template_logic;
 	}
 
-	public function connect() {
+	public function connect(){
 		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
 		mysqli_select_db($this->conn, $this->dbname);
 		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
 
 		$this->dbVersion = 3.23; // assume version 3.23
-		if(function_exists("mysqli_get_server_info")) {
+		if (function_exists("mysqli_get_server_info")) {
 			$ver = mysqli_get_server_info($this->conn);
-			$this->dbMODx 	 = version_compare($ver,"4.0.2");
+			$this->dbMODx 	 = version_compare($ver, "4.0.2");
 			$this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
 		}
 
-        mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
+        mysqli_query($this->conn, "{$this->connection_method} {$this->connection_charset}");
 	}
 
-    public function process($filename) {
+    public function process($filename){
 	    global $custom_placeholders;
 
 		// check to make sure file exists
 		if (!file_exists($filename)) {
 			$this->mysqlErrors[] = array("error" => "File '$filename' not found");
-			$this->installFailed = true ;
+			$this->installFailed = true;
 			return false;
 		}
 
@@ -82,10 +82,10 @@ 
 		// check if in upgrade mode
 		if ($this->mode === 'upd') {
 			// remove non-upgradeable parts
-			$s = strpos($idata,'non-upgrade-able[[');
-			$e = strpos($idata,']]non-upgrade-able') + 17;
-			if($s && $e) {
-			    $idata = str_replace(substr($idata, $s,$e-$s),' Removed non upgradeable items', $idata);
+			$s = strpos($idata, 'non-upgrade-able[[');
+			$e = strpos($idata, ']]non-upgrade-able') + 17;
+			if ($s && $e) {
+			    $idata = str_replace(substr($idata, $s, $e - $s), ' Removed non upgradeable items', $idata);
             }
 		}
 
@@ -102,7 +102,7 @@ 
 		/*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
 
 		// Replace custom placeholders
-		foreach($custom_placeholders as $key=>$val) {
+		foreach ($custom_placeholders as $key=>$val) {
 			if (strpos($idata, '{'.$key.'}') !== false) {
 				$idata = str_replace('{'.$key.'}', $val, $idata);
 			}
@@ -111,14 +111,14 @@ 
 		$sql_array = explode("\n\n", $idata);
 
 		$num = 0;
-		foreach($sql_array as $sql_entry) {
+		foreach ($sql_array as $sql_entry) {
 			$sql_do = trim($sql_entry, "\r\n; ");
 
 			if (preg_match('/^\#/', $sql_do)) continue;
 
 			// strip out comments and \n for mysql 3.x
-			if ($this->dbVersion <4.0) {
-				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
+			if ($this->dbVersion < 4.0) {
+				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~", "", $sql_do);
 				$sql_do = str_replace('\r', "", $sql_do);
 				$sql_do = str_replace('\n', "", $sql_do);
 			}
@@ -126,10 +126,10 @@ 
 
 			$num = $num + 1;
 			if ($sql_do) mysqli_query($this->conn, $sql_do);
-			if(mysqli_error($this->conn)) {
+			if (mysqli_error($this->conn)) {
 				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+				if ($this->ignoreDuplicateErrors) {
+					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 || mysqli_errno($this->conn) == 1091) continue;
 				}
 				// End Ignore duplicate
 				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
@@ -138,7 +138,7 @@ 
 		}
 	}
 
-    public function close() {
+    public function close(){
 		mysqli_close($this->conn);
 	}
 }

install/src/lang.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     'sv' => 'svenska'
 );
 $_langISO6391 = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
-if (! empty($_langFiles[$_langISO6391])) {
+if (!empty($_langFiles[$_langISO6391])) {
     $install_language = $_langFiles[$_langISO6391];
 }
 
@@ -51,7 +51,7 @@ 
 }
 # load language file
 require_once 'lang/english.inc.php'; // As fallback
-require_once 'lang/' . $install_language . '.inc.php';
+require_once 'lang/'.$install_language.'.inc.php';
 
 $manager_language = $install_language;