evolution-cms / evolution

install/actions/action_summary.php

Indentation +12 added lines, -12 removed lines

@@ -192,9 +192,9 @@ 
         echo "<span class=\"notok\">" . $_lang['failed'] . "</span></b>" . $_lang['table_prefix_not_exist'] . "</p>";
         $errors += 1;
         echo "<p>" . $_lang['table_prefix_not_exist_note'] . "</p>";
-  } else {
+    } else {
         echo "<span class=\"ok\">" . $_lang['ok'] . "</span></p>";
-  }
+    }
 }
 
 // check mysql version
@@ -252,16 +252,16 @@ 
 ?>
       <p>
       <?php
-      echo $_lang['setup_cannot_continue'] . ' ';
-      echo $errors > 1 ? $errors." " : "";
-      if ($errors > 1) echo $_lang['errors'];
-      else echo $_lang['error'];
-      if ($errors > 1) echo $_lang['please_correct_errors'];
-      else echo $_lang['please_correct_error'];
-      if ($errors > 1) echo $_lang['and_try_again_plural'];
-      else echo $_lang['and_try_again'];
-      echo $_lang['visit_forum'];
-      ?>
+        echo $_lang['setup_cannot_continue'] . ' ';
+        echo $errors > 1 ? $errors." " : "";
+        if ($errors > 1) echo $_lang['errors'];
+        else echo $_lang['error'];
+        if ($errors > 1) echo $_lang['please_correct_errors'];
+        else echo $_lang['please_correct_error'];
+        if ($errors > 1) echo $_lang['and_try_again_plural'];
+        else echo $_lang['and_try_again'];
+        echo $_lang['visit_forum'];
+        ?>
       </p>
       <?php
 }

Spacing +62 added lines, -62 removed lines

@@ -2,65 +2,65 @@ 
 $installMode = intval($_POST['installmode']);
 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>
-<h2>" . $_lang['preinstall_validation'] . "</h2>";
+<h2>" . $_lang['preinstall_validation']."</h2>";
 
-echo "<h3>" . $_lang['summary_setup_check'] . "</h3>";
+echo "<h3>".$_lang['summary_setup_check']."</h3>";
 $errors = 0;
 
 // check PHP version
-echo "<p>" . $_lang['checking_php_version'];
+echo "<p>".$_lang['checking_php_version'];
 $phpMinVersion = "5.4.0";
 // -1 if left is less, 0 if equal, +1 if left is higher
 if (version_compare(phpversion(), $phpMinVersion) < 0) {
-    echo "<span class=\"notok\">" . $_lang['failed'] . "</span>" . $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', $phpMinVersion, $_lang["modx_requires_php"]) . "</p>";
+    echo "<span class=\"notok\">".$_lang['failed']."</span>".$_lang['you_running_php'].phpversion().str_replace('[+min_version+]', $phpMinVersion, $_lang["modx_requires_php"])."</p>";
     $errors += 1;
 } 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 += 1;
 } 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 += 1;
 } 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 += 1;
 } 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")) {
-    echo "<span class=\"notok\">" . $_lang['failed'] . "</span></p>";
+    echo "<span class=\"notok\">".$_lang['failed']."</span></p>";
     $errors += 1;
 } 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'];
 if (!file_exists("../assets/cache/siteCache.idx.php")) {
     // make an attempt to create the file
     @ $hnd = fopen("../assets/cache/siteCache.idx.php", 'w');
@@ -68,7 +68,7 @@ 
     @ fclose($hnd);
 }
 if (!is_writable("../assets/cache/siteCache.idx.php")) {
-    echo "<span class=\"notok\">" . $_lang['failed'] . "</span></p>";
+    echo "<span class=\"notok\">".$_lang['failed']."</span></p>";
     $errors += 1;
 } else {
     echo "<span class=\"ok\">".$_lang['ok']."</span></p>";
@@ -140,7 +140,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'];
@@ -178,54 +178,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 += 1;
-        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 += 1;
-        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
@@ -244,7 +244,7 @@ 
     @ fclose($hnd);
 }
 
-if($installMode > 0 && $_POST['installdata'] == "1") {
+if ($installMode > 0 && $_POST['installdata'] == "1") {
     echo "<p class=\"notes\"><strong>{$_lang['sample_web_site']}:</strong> {$_lang['sample_web_site_note']}</p>\n";
 }
 
@@ -252,7 +252,7 @@ 
 ?>
       <p>
       <?php
-      echo $_lang['setup_cannot_continue'] . ' ';
+      echo $_lang['setup_cannot_continue'].' ';
       echo $errors > 1 ? $errors." " : "";
       if ($errors > 1) echo $_lang['errors'];
       else echo $_lang['error'];
@@ -268,10 +268,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>
@@ -293,27 +293,27 @@ 
     
     <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\" />\n";
-$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\" />\n";
-$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\" />\n";
-$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\" />\n";
-$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\" />\n";
-$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\" />\n";
 ?>
 </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>

Braces +37 added lines, -15 removed lines

@@ -28,7 +28,7 @@ 
 // check if iconv is available
 echo "<p>" . $_lang['checking_iconv'];
 $iconv = (int) function_exists('iconv');
-if ($iconv == '0'){
+if ($iconv == '0') {
     echo "<span class=\"notok\">" . $_lang['failed'].  "</span></p><p><strong>".$_lang['checking_iconv_note']."</strong></p>";
     $errors += 1;
 } else {
@@ -119,8 +119,9 @@ 
     @ $hnd = fopen("../".MGR_DIR."/includes/config.inc.php", 'w');
     @ fwrite($hnd, "<?php //EVO configuration file ?>");
     @ fclose($hnd);
+} else {
+    @chmod("../".MGR_DIR."/includes/config.inc.php", 0666);
 }
-else @chmod("../".MGR_DIR."/includes/config.inc.php", 0666);
 $isWriteable = is_writable("../".MGR_DIR."/includes/config.inc.php");
 if (!$isWriteable) {
     echo "<span class=\"notok\">".$_lang['failed']."</span></p><p><strong>".$_lang['config_permissions_note']."</strong></p>";
@@ -212,7 +213,7 @@ 
 if ($conn) {
     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);
@@ -254,12 +255,21 @@ 
       <?php
       echo $_lang['setup_cannot_continue'] . ' ';
       echo $errors > 1 ? $errors." " : "";
-      if ($errors > 1) echo $_lang['errors'];
-      else echo $_lang['error'];
-      if ($errors > 1) echo $_lang['please_correct_errors'];
-      else echo $_lang['please_correct_error'];
-      if ($errors > 1) echo $_lang['and_try_again_plural'];
-      else echo $_lang['and_try_again'];
+      if ($errors > 1) {
+          echo $_lang['errors'];
+      } else {
+          echo $_lang['error'];
+      }
+      if ($errors > 1) {
+          echo $_lang['please_correct_errors'];
+      } else {
+          echo $_lang['please_correct_error'];
+      }
+      if ($errors > 1) {
+          echo $_lang['and_try_again_plural'];
+      } else {
+          echo $_lang['and_try_again'];
+      }
       echo $_lang['visit_forum'];
       ?>
       </p>
@@ -294,17 +304,29 @@ 
     <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" />
 <?php
 $templates = isset ($_POST['template']) ? $_POST['template'] : array ();
-foreach ($templates as $i => $template) echo "<input type=\"hidden\" name=\"template[]\" value=\"$template\" />\n";
+foreach ($templates as $i => $template) {
+    echo "<input type=\"hidden\" name=\"template[]\" value=\"$template\" />\n";
+}
 $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
-foreach ($tvs as $i => $tv) echo "<input type=\"hidden\" name=\"tv[]\" value=\"$tv\" />\n";
+foreach ($tvs as $i => $tv) {
+    echo "<input type=\"hidden\" name=\"tv[]\" value=\"$tv\" />\n";
+}
 $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
-foreach ($chunks as $i => $chunk) echo "<input type=\"hidden\" name=\"chunk[]\" value=\"$chunk\" />\n";
+foreach ($chunks as $i => $chunk) {
+    echo "<input type=\"hidden\" name=\"chunk[]\" value=\"$chunk\" />\n";
+}
 $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
-foreach ($snippets as $i => $snippet) echo "<input type=\"hidden\" name=\"snippet[]\" value=\"$snippet\" />\n";
+foreach ($snippets as $i => $snippet) {
+    echo "<input type=\"hidden\" name=\"snippet[]\" value=\"$snippet\" />\n";
+}
 $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
-foreach ($plugins as $i => $plugin) echo "<input type=\"hidden\" name=\"plugin[]\" value=\"$plugin\" />\n";
+foreach ($plugins as $i => $plugin) {
+    echo "<input type=\"hidden\" name=\"plugin[]\" value=\"$plugin\" />\n";
+}
 $modules = isset ($_POST['module']) ? $_POST['module'] : array ();
-foreach ($modules as $i => $module) echo "<input type=\"hidden\" name=\"module[]\" value=\"$module\" />\n";
+foreach ($modules as $i => $module) {
+    echo "<input type=\"hidden\" name=\"module[]\" value=\"$module\" />\n";
+}
 ?>
 </div>
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
     echo "<span class=\"ok\">".$_lang['ok']."</span></p>";
 }
 // make sure we can use the database
-if ($installMode > 0 && !mysqli_query($conn, "USE {$dbase}")) {
+if ($installMode > 0 && !mysqli_query($conn, "use {$dbase}")) {
     $errors += 1;
     echo "<span class=\"notok\">".$_lang['database_use_failed']."</span><p />".$_lang["database_use_failed_note"]."</p>";
 }

install/actions/action_connection.php

Indentation +28 added lines, -28 removed lines

@@ -15,13 +15,13 @@ 
         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;
+            $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;
         }
         else $upgradable= 2;
     }
@@ -75,28 +75,28 @@ 
 echo $content;
 
 function getLangs($install_language) {
-	if (isset($_POST['managerlanguage']))   $manager_language = $_POST['managerlanguage'];
-	elseif(isset($_GET['managerlanguage'])) $manager_language = $_GET['managerlanguage'];
-	if ($install_language != "english" && is_file(sprintf("../%s/includes/lang/%s.inc.php",MGR_DIR,$install_language)))
-		$manager_language = $install_language;
-	else
-		$manager_language = "english";
+    if (isset($_POST['managerlanguage']))   $manager_language = $_POST['managerlanguage'];
+    elseif(isset($_GET['managerlanguage'])) $manager_language = $_GET['managerlanguage'];
+    if ($install_language != "english" && is_file(sprintf("../%s/includes/lang/%s.inc.php",MGR_DIR,$install_language)))
+        $manager_language = $install_language;
+    else
+        $manager_language = "english";
 	
-	$langs = array();
-	if ($handle = opendir("../".MGR_DIR."/includes/lang")) {
-	    while (false !== ($file = readdir($handle))) {
-	        if (strpos($file, '.inc.') !== false)
-	            $langs[] = $file;
-	    }
-	    closedir($handle);
-	}
-	sort($langs);
+    $langs = array();
+    if ($handle = opendir("../".MGR_DIR."/includes/lang")) {
+        while (false !== ($file = readdir($handle))) {
+            if (strpos($file, '.inc.') !== false)
+                $langs[] = $file;
+        }
+        closedir($handle);
+    }
+    sort($langs);
 	
-	$_ = array();
-	foreach ($langs as $language) {
-	    $abrv_language = explode('.', $language);
-	    $selected = (strtolower($abrv_language[0]) == strtolower($manager_language)) ? ' selected' : '';
+    $_ = array();
+    foreach ($langs as $language) {
+        $abrv_language = explode('.', $language);
+        $selected = (strtolower($abrv_language[0]) == strtolower($manager_language)) ? ' selected' : '';
         $_[] = sprintf('<option value="%s" %s>%s</option>', $abrv_language[0], $selected, ucwords($abrv_language[0]));
-	}
-	return join("\n", $_);
+    }
+    return join("\n", $_);
 }

Spacing +24 added lines, -24 removed lines

@@ -2,11 +2,11 @@ 
 $installMode = intval($_POST['installmode']);
 
 // Determine upgradeability
-$upgradeable= 0;
+$upgradeable = 0;
 if ($installMode == 0) {
-    $database_name= '';
-    $database_server= 'localhost';
-    $table_prefix= 'evo_';
+    $database_name = '';
+    $database_server = 'localhost';
+    $table_prefix = 'evo_';
 } else {
     $database_name = '';
     if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) $upgradeable = 0;
@@ -17,13 +17,13 @@ 
         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;
+              $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;
     }
 }
 // check the database collation if not specified in the configuration
@@ -48,36 +48,36 @@ 
     $database_connection_method = 'SET CHARACTER SET';
 }
 
-$ph['database_name'] = isset($_POST['database_name']) ? $_POST['database_name']: $database_name;
-$ph['tableprefix'] = isset($_POST['tableprefix']) ? $_POST['tableprefix']: $table_prefix;
+$ph['database_name'] = isset($_POST['database_name']) ? $_POST['database_name'] : $database_name;
+$ph['tableprefix'] = isset($_POST['tableprefix']) ? $_POST['tableprefix'] : $table_prefix;
 $ph['selected_set_character_set'] = isset($database_connection_method) && $database_connection_method == 'SET CHARACTER SET' ? 'selected' : '';
 $ph['selected_set_names'] = isset($database_connection_method) && $database_connection_method == 'SET NAMES' ? 'selected' : '';
 $ph['show#connection_method'] = (($installMode == 0) || ($installMode == 2)) ? 'block' : 'none';
-$ph['database_collation'] = isset($_POST['database_collation']) ? $_POST['database_collation']: $database_collation;
-$ph['show#AUH'] = ($installMode == 0) ? 'block':'none';
-$ph['cmsadmin'] = isset($_POST['cmsadmin']) ? $_POST['cmsadmin']:'admin';
-$ph['cmsadminemail'] = isset($_POST['cmsadminemail']) ? $_POST['cmsadminemail']:"";
-$ph['cmspassword'] = isset($_POST['cmspassword']) ? $_POST['cmspassword']:"";
-$ph['cmspasswordconfirm'] = isset($_POST['cmspasswordconfirm']) ? $_POST['cmspasswordconfirm']:"";
+$ph['database_collation'] = isset($_POST['database_collation']) ? $_POST['database_collation'] : $database_collation;
+$ph['show#AUH'] = ($installMode == 0) ? 'block' : 'none';
+$ph['cmsadmin'] = isset($_POST['cmsadmin']) ? $_POST['cmsadmin'] : 'admin';
+$ph['cmsadminemail'] = isset($_POST['cmsadminemail']) ? $_POST['cmsadminemail'] : "";
+$ph['cmspassword'] = isset($_POST['cmspassword']) ? $_POST['cmspassword'] : "";
+$ph['cmspasswordconfirm'] = isset($_POST['cmspasswordconfirm']) ? $_POST['cmspasswordconfirm'] : "";
 $ph['managerLangs'] = getLangs($install_language);
 $ph['install_language'] = $install_language;
 $ph['installMode'] = $installMode;
-$ph['checkedChkagree']  = isset($_POST['chkagree']) ? 'checked':"";
+$ph['checkedChkagree']  = isset($_POST['chkagree']) ? 'checked' : "";
 $ph['database_connection_method'] = isset($database_connection_method) ? $database_connection_method : '';
-$ph['databasehost'] = isset($_POST['databasehost']) ? $_POST['databasehost']: $database_server;
-$ph['databaseloginname'] = isset($_SESSION['databaseloginname']) ? $_SESSION['databaseloginname']: '';
-$ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword']: "";
+$ph['databasehost'] = isset($_POST['databasehost']) ? $_POST['databasehost'] : $database_server;
+$ph['databaseloginname'] = isset($_SESSION['databaseloginname']) ? $_SESSION['databaseloginname'] : '';
+$ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword'] : "";
 $ph['MGR_DIR'] = MGR_DIR;
 
 $content = file_get_contents('./actions/tpl_connection.html');
-$content = parse($content, $_lang, '[%','%]');
+$content = parse($content, $_lang, '[%', '%]');
 $content = parse($content, $ph);
 echo $content;
 
-function getLangs($install_language) {
+function getLangs($install_language){
 	if (isset($_POST['managerlanguage']))   $manager_language = $_POST['managerlanguage'];
-	elseif(isset($_GET['managerlanguage'])) $manager_language = $_GET['managerlanguage'];
-	if ($install_language != "english" && is_file(sprintf("../%s/includes/lang/%s.inc.php",MGR_DIR,$install_language)))
+	elseif (isset($_GET['managerlanguage'])) $manager_language = $_GET['managerlanguage'];
+	if ($install_language != "english" && is_file(sprintf("../%s/includes/lang/%s.inc.php", MGR_DIR, $install_language)))
 		$manager_language = $install_language;
 	else
 		$manager_language = "english";

Braces +27 added lines, -18 removed lines

@@ -9,21 +9,24 @@ 
     $table_prefix= 'evo_';
 } 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;
     }
 }
 // check the database collation if not specified in the configuration
@@ -74,19 +77,25 @@ 
 $content = parse($content, $ph);
 echo $content;
 
-function getLangs($install_language) {
-	if (isset($_POST['managerlanguage']))   $manager_language = $_POST['managerlanguage'];
-	elseif(isset($_GET['managerlanguage'])) $manager_language = $_GET['managerlanguage'];
-	if ($install_language != "english" && is_file(sprintf("../%s/includes/lang/%s.inc.php",MGR_DIR,$install_language)))
-		$manager_language = $install_language;
-	else
-		$manager_language = "english";
+function getLangs($install_language)
+{
+	if (isset($_POST['managerlanguage'])) {
+	    $manager_language = $_POST['managerlanguage'];
+	} elseif(isset($_GET['managerlanguage'])) {
+	    $manager_language = $_GET['managerlanguage'];
+	}
+	if ($install_language != "english" && is_file(sprintf("../%s/includes/lang/%s.inc.php",MGR_DIR,$install_language))) {
+			$manager_language = $install_language;
+	} else {
+			$manager_language = "english";
+	}
 	
 	$langs = array();
 	if ($handle = opendir("../".MGR_DIR."/includes/lang")) {
 	    while (false !== ($file = readdir($handle))) {
-	        if (strpos($file, '.inc.') !== false)
-	            $langs[] = $file;
+	        if (strpos($file, '.inc.') !== false) {
+	        	            $langs[] = $file;
+	        }
 	    }
 	    closedir($handle);
 	}

install/actions/action_options.php

Indentation +5 added lines, -5 removed lines

@@ -80,7 +80,7 @@ 
 
 
 function getTemplates($presets=array()) {
-	if(!count($presets)) return '';
+    if(!count($presets)) return '';
     $selectedTemplates = isset ($_POST['template']) ? $_POST['template'] : array ();
     $tpl = '<label><input type="checkbox" name="template[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -118,7 +118,7 @@ 
 
 // display chunks
 function getChunks($presets=array()) {
-	if(!count($presets)) return '';
+    if(!count($presets)) return '';
     $selected = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
     $tpl = '<label><input type="checkbox" name="chunk[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -137,7 +137,7 @@ 
 
 // display modules
 function getModules($presets=array()) {
-	if(!count($presets)) return '';
+    if(!count($presets)) return '';
     $selected = isset ($_POST['module']) ? $_POST['module'] : array ();
     $tpl = '<label><input type="checkbox" name="module[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -156,7 +156,7 @@ 
 
 // display plugins
 function getPlugins($presets=array()) {
-	if(!count($presets)) return '';
+    if(!count($presets)) return '';
     $selected = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
     $tpl = '<label><input type="checkbox" name="plugin[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -179,7 +179,7 @@ 
 
 // display snippets
 function getSnippets($presets=array()) {
-	if(!count($presets)) return '';
+    if(!count($presets)) return '';
     $selected = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
     $tpl = '<label><input type="checkbox" name="snippet[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();

Spacing +42 added lines, -42 removed lines

@@ -5,13 +5,13 @@ 
     $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'];
 }
 elseif ($installMode == 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'")) {
@@ -63,7 +63,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);
@@ -73,15 +73,15 @@ 
 
 $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, '[%', '%]');
 
 
 
-function getTemplates($presets=array()) {
-	if(!count($presets)) return '';
-    $selectedTemplates = isset ($_POST['template']) ? $_POST['template'] : array ();
+function getTemplates($presets = array()){
+	if (!count($presets)) return '';
+    $selectedTemplates = isset ($_POST['template']) ? $_POST['template'] : array();
     $tpl = '<label><input type="checkbox" name="template[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
     $i = 0;
@@ -90,16 +90,16 @@ 
         $ph['name']  = $preset[0];
         $ph['desc']  = $preset[1];
         $ph['class'] = !in_array('sample', $preset[6]) ? 'toggle' : 'toggle demo';
-        $ph['checked']   = in_array($i, $selectedTemplates) || (!isset($_POST['options_selected'])) ? 'checked' : '';
-        $_[] = parse($tpl,$ph);
+        $ph['checked'] = in_array($i, $selectedTemplates) || (!isset($_POST['options_selected'])) ? 'checked' : '';
+        $_[] = parse($tpl, $ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%templates%]</h3>' . join("\n", $_);
+    if (0 < count($_)) return '<h3>[%templates%]</h3>'.join("\n", $_);
 }
 
-function getTVs($presets=array()) {
-    if(!count($presets)) return '';
-    $selectedTvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
+function getTVs($presets = array()){
+    if (!count($presets)) return '';
+    $selectedTvs = isset ($_POST['tv']) ? $_POST['tv'] : array();
     $tpl = '<label><input type="checkbox" name="tv[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+alterName+] <span class="description">([+desc+])</span></label><hr />';
     $_ = array();
     $i = 0;
@@ -109,17 +109,17 @@ 
         $ph['alterName'] = $preset[1];
         $ph['desc']      = $preset[2];
         $ph['class']     = !in_array('sample', $preset[12]) ? 'toggle' : 'toggle demo';
-        $ph['checked']       = in_array($i, $selectedTvs) || (!isset($_POST['options_selected'])) ? 'checked' : '';
-        $_[] = parse($tpl,$ph);
+        $ph['checked'] = in_array($i, $selectedTvs) || (!isset($_POST['options_selected'])) ? 'checked' : '';
+        $_[] = parse($tpl, $ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%tvs%]</h3>' . join("\n", $_);
+    if (0 < count($_)) return '<h3>[%tvs%]</h3>'.join("\n", $_);
 }
 
 // display chunks
-function getChunks($presets=array()) {
-	if(!count($presets)) return '';
-    $selected = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
+function getChunks($presets = array()){
+	if (!count($presets)) return '';
+    $selected = isset ($_POST['chunk']) ? $_POST['chunk'] : array();
     $tpl = '<label><input type="checkbox" name="chunk[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
     $i = 0;
@@ -128,17 +128,17 @@ 
         $ph['name']  = $preset[0];
         $ph['desc']  = $preset[1];
         $ph['class'] = !in_array('sample', $preset[5]) ? 'toggle' : 'toggle demo';
-        $ph['checked']   = in_array($i, $selected) || (!isset($_POST['options_selected'])) ? 'checked' : '';
-        $_[] = parse($tpl,$ph);
+        $ph['checked'] = in_array($i, $selected) || (!isset($_POST['options_selected'])) ? 'checked' : '';
+        $_[] = parse($tpl, $ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%chunks%]</h3>' . join("\n", $_);
+    if (0 < count($_)) return '<h3>[%chunks%]</h3>'.join("\n", $_);
 }
 
 // display modules
-function getModules($presets=array()) {
-	if(!count($presets)) return '';
-    $selected = isset ($_POST['module']) ? $_POST['module'] : array ();
+function getModules($presets = array()){
+	if (!count($presets)) return '';
+    $selected = isset ($_POST['module']) ? $_POST['module'] : array();
     $tpl = '<label><input type="checkbox" name="module[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
     $i = 0;
@@ -147,17 +147,17 @@ 
         $ph['name']  = $preset[0];
         $ph['desc']  = $preset[1];
         $ph['class'] = !in_array('sample', $preset[7]) ? 'toggle' : 'toggle demo';
-        $ph['checked']   = in_array($i, $selected) || (!isset($_POST['options_selected'])) ? 'checked' : '';
-        $_[] = parse($tpl,$ph);
+        $ph['checked'] = in_array($i, $selected) || (!isset($_POST['options_selected'])) ? 'checked' : '';
+        $_[] = parse($tpl, $ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%modules%]</h3>' . join("\n", $_);
+    if (0 < count($_)) return '<h3>[%modules%]</h3>'.join("\n", $_);
 }
 
 // display plugins
-function getPlugins($presets=array()) {
-	if(!count($presets)) return '';
-    $selected = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
+function getPlugins($presets = array()){
+	if (!count($presets)) return '';
+    $selected = isset ($_POST['plugin']) ? $_POST['plugin'] : array();
     $tpl = '<label><input type="checkbox" name="plugin[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
     $i = 0;
@@ -167,20 +167,20 @@ 
         $ph['desc']  = $preset[1];
         if (is_array($preset[8])) {
             $ph['class'] = !in_array('sample', $preset[8]) ? 'toggle' : 'toggle demo';
-        }else{
+        } else {
             $ph['class'] = 'toggle demo';
         }
         $ph['checked']   = in_array($i, $selected) || (!isset($_POST['options_selected'])) ? 'checked' : '';
-        $_[] = parse($tpl,$ph);
+        $_[] = parse($tpl, $ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%plugins%]</h3>' . join("\n", $_);
+    if (0 < count($_)) return '<h3>[%plugins%]</h3>'.join("\n", $_);
 }
 
 // display snippets
-function getSnippets($presets=array()) {
-	if(!count($presets)) return '';
-    $selected = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
+function getSnippets($presets = array()){
+	if (!count($presets)) return '';
+    $selected = isset ($_POST['snippet']) ? $_POST['snippet'] : array();
     $tpl = '<label><input type="checkbox" name="snippet[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
     $i = 0;
@@ -190,8 +190,8 @@ 
         $ph['desc']  = $preset[1];
         $ph['class'] = !in_array('sample', $preset[5]) ? 'toggle' : 'toggle demo';
         $ph['checked'] = in_array($i, $selected) || (!isset($_POST['options_selected'])) ? 'checked' : '';
-        $_[] = parse($tpl,$ph);
+        $_[] = parse($tpl, $ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%snippets%]</h3>' . join("\n", $_);
+    if (0 < count($_)) return '<h3>[%snippets%]</h3>'.join("\n", $_);
 }

Braces +68 added lines, -33 removed lines

@@ -5,12 +5,13 @@ 
     $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']))
-        $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-    if(empty($_SESSION['databaseloginname']))
-        $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
-}
-elseif ($installMode == 1) {
+    if(empty($_SESSION['databaseloginpassword'])) {
+            $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
+    }
+    if(empty($_SESSION['databaseloginname'])) {
+            $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
+    }
+    } elseif ($installMode == 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}")) {
@@ -22,7 +23,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)) {
@@ -31,7 +34,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';
@@ -79,8 +84,11 @@ 
 
 
 
-function getTemplates($presets=array()) {
-	if(!count($presets)) return '';
+function getTemplates($presets=array())
+{
+	if(!count($presets)) {
+	    return '';
+	}
     $selectedTemplates = isset ($_POST['template']) ? $_POST['template'] : array ();
     $tpl = '<label><input type="checkbox" name="template[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -94,11 +102,16 @@ 
         $_[] = parse($tpl,$ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%templates%]</h3>' . join("\n", $_);
-}
+    if(0<count($_)) {
+        return '<h3>[%templates%]</h3>' . join("\n", $_);
+    }
+    }
 
-function getTVs($presets=array()) {
-    if(!count($presets)) return '';
+function getTVs($presets=array())
+{
+    if(!count($presets)) {
+        return '';
+    }
     $selectedTvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
     $tpl = '<label><input type="checkbox" name="tv[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+alterName+] <span class="description">([+desc+])</span></label><hr />';
     $_ = array();
@@ -113,12 +126,17 @@ 
         $_[] = parse($tpl,$ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%tvs%]</h3>' . join("\n", $_);
-}
+    if(0<count($_)) {
+        return '<h3>[%tvs%]</h3>' . join("\n", $_);
+    }
+    }
 
 // display chunks
-function getChunks($presets=array()) {
-	if(!count($presets)) return '';
+function getChunks($presets=array())
+{
+	if(!count($presets)) {
+	    return '';
+	}
     $selected = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
     $tpl = '<label><input type="checkbox" name="chunk[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -132,12 +150,17 @@ 
         $_[] = parse($tpl,$ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%chunks%]</h3>' . join("\n", $_);
-}
+    if(0<count($_)) {
+        return '<h3>[%chunks%]</h3>' . join("\n", $_);
+    }
+    }
 
 // display modules
-function getModules($presets=array()) {
-	if(!count($presets)) return '';
+function getModules($presets=array())
+{
+	if(!count($presets)) {
+	    return '';
+	}
     $selected = isset ($_POST['module']) ? $_POST['module'] : array ();
     $tpl = '<label><input type="checkbox" name="module[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -151,12 +174,17 @@ 
         $_[] = parse($tpl,$ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%modules%]</h3>' . join("\n", $_);
-}
+    if(0<count($_)) {
+        return '<h3>[%modules%]</h3>' . join("\n", $_);
+    }
+    }
 
 // display plugins
-function getPlugins($presets=array()) {
-	if(!count($presets)) return '';
+function getPlugins($presets=array())
+{
+	if(!count($presets)) {
+	    return '';
+	}
     $selected = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
     $tpl = '<label><input type="checkbox" name="plugin[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -167,19 +195,24 @@ 
         $ph['desc']  = $preset[1];
         if (is_array($preset[8])) {
             $ph['class'] = !in_array('sample', $preset[8]) ? 'toggle' : 'toggle demo';
-        }else{
+        } else {
             $ph['class'] = 'toggle demo';
         }
         $ph['checked']   = in_array($i, $selected) || (!isset($_POST['options_selected'])) ? 'checked' : '';
         $_[] = parse($tpl,$ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%plugins%]</h3>' . join("\n", $_);
-}
+    if(0<count($_)) {
+        return '<h3>[%plugins%]</h3>' . join("\n", $_);
+    }
+    }
 
 // display snippets
-function getSnippets($presets=array()) {
-	if(!count($presets)) return '';
+function getSnippets($presets=array())
+{
+	if(!count($presets)) {
+	    return '';
+	}
     $selected = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
     $tpl = '<label><input type="checkbox" name="snippet[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -193,5 +226,7 @@ 
         $_[] = parse($tpl,$ph);
         $i++;
     }
-    if(0<count($_)) return '<h3>[%snippets%]</h3>' . join("\n", $_);
-}
+    if(0<count($_)) {
+        return '<h3>[%snippets%]</h3>' . join("\n", $_);
+    }
+    }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 elseif ($installMode == 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 (@ 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'");
             }

install/actions/action_mode.php

Spacing +12 added lines, -12 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 $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 $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))
@@ -16,16 +16,16 @@ 
         $upgradeable = 2;
 }
 $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($base_path . 'install/actions/tpl_mode.html');
-$content = parse($tpl,$ph);
-echo parse($content,$_lang,'[%','%]');
+$tpl = file_get_contents($base_path.'install/actions/tpl_mode.html');
+$content = parse($tpl, $ph);
+echo parse($content, $_lang, '[%', '%]');

Braces +12 added lines, -10 removed lines

@@ -1,20 +1,22 @@
 <?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
+if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) {
+// 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 - tho prefix may be empty so we have to ignore it
     if (isset($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 {
+            $upgradeable = 2;
+    }
     }
-    else
-        $upgradeable = 2;
-}
 $ph['moduleName']       = $moduleName;
 $ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';
 $ph['displayUpg']       = ($upgradeable==0) ? 'display:none;' : '';

install/connection.databasetest.php

Indentation +2 added lines, -2 removed lines

@@ -8,10 +8,10 @@
 $self = 'install/connection.databasetest.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once("lang.php");
 

Spacing +4 added lines, -4 removed lines

@@ -6,12 +6,12 @@ 
 $installMode = $_POST['installMode'];
 
 $self = 'install/connection.databasetest.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once("lang.php");
 
@@ -31,7 +31,7 @@ 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (!mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
         }
         else {

Braces +6 added lines, -11 removed lines

@@ -18,8 +18,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>';
-}
-else {
+} else {
     $database_name = mysqli_real_escape_string($conn, $_POST['database_name']);
     $database_name = str_replace("`", "", $database_name);
     $tableprefix = mysqli_real_escape_string($conn, $_POST['tableprefix']);
@@ -31,20 +30,16 @@ 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (! mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
-        }
-        else {
+        } else {
             $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`"))) {
+    } 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>';
-    }
-    elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
+    } 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>';
-    }
-    else {
+    } else {
         $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed'].'</span>';
     }
 }

install/connection.servertest.php

Indentation +3 added lines, -3 removed lines

@@ -7,10 +7,10 @@ 
 $self = 'install/connection.servertest.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once("lang.php");
 
@@ -31,7 +31,7 @@ 
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {
-    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
+                if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
         }
         if ($strictMode) $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
     }

Spacing +5 added lines, -5 removed lines

@@ -5,12 +5,12 @@ 
 $pwd = $_POST['pwd'];
 
 $self = 'install/connection.servertest.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once("lang.php");
 
@@ -22,12 +22,12 @@ 
     $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', '=') ) {
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
         $output .= '<br /><span style="color:#FF0000;"> '.$_lang['mysql_5051'].'</span>';
     }
     // Mode check
     $mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode");
-    if (@mysqli_num_rows($mysqlmode) > 0){
+    if (@mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {

Braces +8 added lines, -5 removed lines

@@ -17,8 +17,7 @@ 
 $output = $_lang["status_connecting"];
 if (!$conn = @mysqli_connect($host, $uid, $pwd)) {
     $output .= '<span id="server_fail" style="color:#FF0000;"> '.$_lang['status_failed'].'</span>';
-}
-else {
+} else {
     $output .= '<span id="server_pass" style="color:#80c000;"> '.$_lang['status_passed_server'].'</span>';
 
     // Mysql version check
@@ -27,13 +26,17 @@ 
     }
     // Mode check
     $mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode");
-    if (@mysqli_num_rows($mysqlmode) > 0){
+    if (@mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {
-    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
+    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
+    		        $strictMode = true;
+    		    }
+        }
+        if ($strictMode) {
+            $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
         }
-        if ($strictMode) $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
     }
 }
 echo $output;

install/connection.collation.php

Indentation +8 added lines, -8 removed lines

@@ -7,10 +7,10 @@ 
 $self = 'install/connection.collation.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once('lang.php');
 
@@ -59,12 +59,12 @@ 
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
     foreach($order as $v) {
-    	foreach($array as $name=>$sel) {
-        	if(strpos($name,$v)!==false) {
-        		$rs[$name] = $array[$name];
-        		unset($array[$name]);
-        	}
-    	}
+        foreach($array as $name=>$sel) {
+            if(strpos($name,$v)!==false) {
+                $rs[$name] = $array[$name];
+                unset($array[$name]);
+            }
+        }
     }
     $rs['unrecommend']='';
     return $rs + $array;

Spacing +18 added lines, -18 removed lines

@@ -5,17 +5,17 @@ 
 $pwd = $_POST['pwd'];
 
 $self = 'install/connection.collation.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once('lang.php');
 
 $conn = mysqli_connect($host, $uid, $pwd);
-if(!$conn) exit('can not connect');
+if (!$conn) exit('can not connect');
 
 // get collation
 $rs = mysqli_query($conn, "SHOW COLLATION");
@@ -29,20 +29,20 @@ 
     $database_collation = htmlentities($_POST['database_collation']);
     $recommend_collation = $_lang['recommend_collation'];
     
-    if    (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
-    elseif(isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
-    elseif(isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
-    elseif(isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
+    if (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
+    elseif (isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
+    elseif (isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
+    elseif (isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
     
-    $_ = sortItem($_,$_lang['recommend_collations_order']);
+    $_ = sortItem($_, $_lang['recommend_collations_order']);
     
-    foreach($_ as $collation=>$selected) {
+    foreach ($_ as $collation=>$selected) {
         $collation = htmlentities($collation);
         // if(substr($collation,0,4)!=='utf8') continue;
-        if(strpos($collation,'sjis')===0) continue;
-        if($collation=='recommend')
+        if (strpos($collation, 'sjis') === 0) continue;
+        if ($collation == 'recommend')
             $output .= '<optgroup label="recommend">';
-        elseif($collation=='unrecommend')
+        elseif ($collation == 'unrecommend')
             $output .= '</optgroup><optgroup label="unrecommend">';
         else
             $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
@@ -55,17 +55,17 @@ 
 
 
 
-function sortItem($array=array(),$order='utf8mb4,utf8') {
+function sortItem($array = array(), $order = 'utf8mb4,utf8'){
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
-    foreach($order as $v) {
-    	foreach($array as $name=>$sel) {
-        	if(strpos($name,$v)!==false) {
+    foreach ($order as $v) {
+    	foreach ($array as $name=>$sel) {
+        	if (strpos($name, $v) !== false) {
         		$rs[$name] = $array[$name];
         		unset($array[$name]);
         	}
     	}
     }
-    $rs['unrecommend']='';
+    $rs['unrecommend'] = '';
     return $rs + $array;
 }

Braces +24 added lines, -13 removed lines

@@ -15,7 +15,9 @@ 
 require_once('lang.php');
 
 $conn = mysqli_connect($host, $uid, $pwd);
-if(!$conn) exit('can not connect');
+if(!$conn) {
+    exit('can not connect');
+}
 
 // get collation
 $rs = mysqli_query($conn, "SHOW COLLATION");
@@ -29,23 +31,31 @@ 
     $database_collation = htmlentities($_POST['database_collation']);
     $recommend_collation = $_lang['recommend_collation'];
     
-    if    (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
-    elseif(isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
-    elseif(isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
-    elseif(isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
+    if    (isset($_[$recommend_collation])) {
+        $_[$recommend_collation] = ' selected';
+    } elseif(isset($_['utf8mb4_general_ci'])) {
+        $_['utf8mb4_general_ci'] = ' selected';
+    } elseif(isset($_['utf8_general_ci'])) {
+        $_['utf8_general_ci']    = ' selected';
+    } elseif(isset($_[$database_collation])) {
+        $_[$database_collation]  = ' selected';
+    }
     
     $_ = sortItem($_,$_lang['recommend_collations_order']);
     
     foreach($_ as $collation=>$selected) {
         $collation = htmlentities($collation);
         // if(substr($collation,0,4)!=='utf8') continue;
-        if(strpos($collation,'sjis')===0) continue;
-        if($collation=='recommend')
-            $output .= '<optgroup label="recommend">';
-        elseif($collation=='unrecommend')
-            $output .= '</optgroup><optgroup label="unrecommend">';
-        else
-            $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
+        if(strpos($collation,'sjis')===0) {
+            continue;
+        }
+        if($collation=='recommend') {
+                    $output .= '<optgroup label="recommend">';
+        } elseif($collation=='unrecommend') {
+                    $output .= '</optgroup><optgroup label="unrecommend">';
+        } else {
+                    $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
+        }
     }
     $output .= '</optgroup></select>';
 }
@@ -55,7 +65,8 @@ 
 
 
 
-function sortItem($array=array(),$order='utf8mb4,utf8') {
+function sortItem($array=array(),$order='utf8mb4,utf8')
+{
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
     foreach($order as $v) {

install/index.php

Indentation +2 added lines, -2 removed lines

@@ -16,10 +16,10 @@
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
 
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR', 'manager');
+    define('MGR_DIR', 'manager');
 }
 
 

Spacing +13 added lines, -13 removed lines

@@ -9,7 +9,7 @@ 
 }
 
 $self = 'install/index.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 require_once("{$base_path}install/functions.php");
 
 // set error reporting
@@ -18,7 +18,7 @@ 
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
 	define('MGR_DIR', 'manager');
 }
 
@@ -38,26 +38,26 @@ 
 $moduleSQLDataFile = "setup.data.sql";
 $moduleSQLResetFile = "setup.data.reset.sql";
 
-$moduleChunks = array (); // chunks - array : name, description, type - 0:file or 1:content, file or content
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content
-$moduleSnippets = array (); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
-$modulePlugins = array (); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
-$moduleModules = array (); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
-$moduleTVs = array (); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleChunks = array(); // chunks - array : name, description, type - 0:file or 1:content, file or content
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content
+$moduleSnippets = array(); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
+$modulePlugins = array(); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
+$moduleModules = array(); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleTVs = array(); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
 $moduleDependencies = array(); // module depedencies - array : module, table, column, type, name
 
-$errors= 0;
+$errors = 0;
 
 // get post back status
 $isPostBack = (count($_POST));
 
 $ph = ph();
-$ph = array_merge($ph,$_lang);
+$ph = array_merge($ph, $_lang);
 $ph['install_language'] = $install_language;
 
 ob_start();
-$action= isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
+$action = isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
 if (!@include_once("actions/action_{$action}.php")) {
     die ("Invalid install action attempted. [action={$action}]");
 }
@@ -65,5 +65,5 @@ 
 ob_end_clean();
 
 $tpl = file_get_contents("{$base_path}install/template.tpl");
-echo parse($tpl,$ph);
+echo parse($tpl, $ph);
 

install/lang.php

Indentation +26 added lines, -26 removed lines

@@ -16,35 +16,35 @@ 
 $install_language = "english";
 
 $_langFiles= array (
- "en" => "english",
- "bg" => "bulgarian",
- "cs" => "czech",
- "da" => "danish",
- "fi" => "finnish-utf8",
- "fr" => "francais-utf8",
- "de" => "german",
- "he" => "hebrew",
- "it" => "italian",
- "ja" => "japanese-utf8",
- "nl" => "nederlands-utf8",
- "no" => "norwegian",
- "fa" => "persian",
- "pl" => "polish-utf8",
- "pt" => "portuguese-br-utf8",
+    "en" => "english",
+    "bg" => "bulgarian",
+    "cs" => "czech",
+    "da" => "danish",
+    "fi" => "finnish-utf8",
+    "fr" => "francais-utf8",
+    "de" => "german",
+    "he" => "hebrew",
+    "it" => "italian",
+    "ja" => "japanese-utf8",
+    "nl" => "nederlands-utf8",
+    "no" => "norwegian",
+    "fa" => "persian",
+    "pl" => "polish-utf8",
+    "pt" => "portuguese-br-utf8",
 // "pt" => "portuguese",
- "ru" => "russian-UTF8",
- "es" => "spanish-utf8",
- "sv" => "svenska"
+    "ru" => "russian-UTF8",
+    "es" => "spanish-utf8",
+    "sv" => "svenska"
 );
 $_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
 if (!empty($_langFiles[$_langISO6391]))  $install_language = $_langFiles[$_langISO6391];
 
 
 if (isset($_POST['language']) && !stristr($_POST['language'],"..")) {
-	$install_language = $_POST['language'];
+    $install_language = $_POST['language'];
 } else {
-	if (isset($_GET['language']) && !stristr($_GET['language'],"..")) 
-		$install_language = $_GET['language'];
+    if (isset($_GET['language']) && !stristr($_GET['language'],"..")) 
+        $install_language = $_GET['language'];
 }
 # load language file
 require_once("lang/english.inc.php"); // As fallback
@@ -53,15 +53,15 @@ 
 $manager_language = $install_language;
 
 if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) {
-	$manager_language = $_POST['managerlanguage'];
+    $manager_language = $_POST['managerlanguage'];
 } else {
-	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],"..")) 
-		$manager_language = $_GET['managerlanguage'];
+    if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],"..")) 
+        $manager_language = $_GET['managerlanguage'];
 }
 
 foreach($_lang as $k=>$v)
 {
-	if(strpos($v,'[+MGR_DIR+]')!==false)
-		$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
+    if(strpos($v,'[+MGR_DIR+]')!==false)
+        $_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
 }
 ?>
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -10,12 +10,12 @@ 
  * Filename:       /install/lang.php
  */
 
-$_lang = array ();
+$_lang = array();
 
 #default fallback language file - english
 $install_language = "english";
 
-$_langFiles= array (
+$_langFiles = array(
  "en" => "english",
  "bg" => "bulgarian",
  "cs" => "czech",
@@ -36,14 +36,14 @@ 
  "es" => "spanish-utf8",
  "sv" => "svenska"
 );
-$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
 if (!empty($_langFiles[$_langISO6391]))  $install_language = $_langFiles[$_langISO6391];
 
 
-if (isset($_POST['language']) && !stristr($_POST['language'],"..")) {
+if (isset($_POST['language']) && !stristr($_POST['language'], "..")) {
 	$install_language = $_POST['language'];
 } else {
-	if (isset($_GET['language']) && !stristr($_GET['language'],"..")) 
+	if (isset($_GET['language']) && !stristr($_GET['language'], "..")) 
 		$install_language = $_GET['language'];
 }
 # load language file
@@ -52,16 +52,16 @@ 
 
 $manager_language = $install_language;
 
-if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) {
+if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'], "..")) {
 	$manager_language = $_POST['managerlanguage'];
 } else {
-	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],"..")) 
+	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'], "..")) 
 		$manager_language = $_GET['managerlanguage'];
 }
 
-foreach($_lang as $k=>$v)
+foreach ($_lang as $k=>$v)
 {
-	if(strpos($v,'[+MGR_DIR+]')!==false)
+	if (strpos($v, '[+MGR_DIR+]') !== false)
 		$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
 }
 ?>
\ No newline at end of file

Braces +16 added lines, -12 removed lines

@@ -37,15 +37,18 @@ 
  "sv" => "svenska"
 );
 $_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
-if (!empty($_langFiles[$_langISO6391]))  $install_language = $_langFiles[$_langISO6391];
+if (!empty($_langFiles[$_langISO6391])) {
+    $install_language = $_langFiles[$_langISO6391];
+}
 
 
 if (isset($_POST['language']) && !stristr($_POST['language'],"..")) {
 	$install_language = $_POST['language'];
 } else {
-	if (isset($_GET['language']) && !stristr($_GET['language'],"..")) 
-		$install_language = $_GET['language'];
-}
+	if (isset($_GET['language']) && !stristr($_GET['language'],"..")) {
+			$install_language = $_GET['language'];
+	}
+	}
 # load language file
 require_once("lang/english.inc.php"); // As fallback
 require_once("lang/".$install_language.".inc.php");
@@ -55,13 +58,14 @@ 
 if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) {
 	$manager_language = $_POST['managerlanguage'];
 } else {
-	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],"..")) 
-		$manager_language = $_GET['managerlanguage'];
-}
+	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],"..")) {
+			$manager_language = $_GET['managerlanguage'];
+	}
+	}
 
-foreach($_lang as $k=>$v)
-{
-	if(strpos($v,'[+MGR_DIR+]')!==false)
-		$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
-}
+foreach($_lang as $k=>$v) {
+	if(strpos($v,'[+MGR_DIR+]')!==false) {
+			$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
+	}
+	}
 ?>
\ No newline at end of file