evolution-cms / evolution

install/setup.info.php

Spacing +64 added lines, -65 removed lines

@@ -1,33 +1,32 @@ 
 <?php
 //:: EVO Installer Setup file
 //:::::::::::::::::::::::::::::::::::::::::
-if (is_file($base_path . 'assets/cache/siteManager.php')) {
-    include_once($base_path . 'assets/cache/siteManager.php');
+if (is_file($base_path.'assets/cache/siteManager.php')) {
+    include_once($base_path.'assets/cache/siteManager.php');
 }
-if(!defined('MGR_DIR')) define('MGR_DIR', 'manager');
+if (!defined('MGR_DIR')) define('MGR_DIR', 'manager');
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
-$chunkPath    = $base_path .'install/assets/chunks';
-$snippetPath  = $base_path .'install/assets/snippets';
-$pluginPath   = $base_path .'install/assets/plugins';
-$modulePath   = $base_path .'install/assets/modules';
-$templatePath = $base_path .'install/assets/templates';
-$tvPath = $base_path .'install/assets/tvs';
+$chunkPath    = $base_path.'install/assets/chunks';
+$snippetPath  = $base_path.'install/assets/snippets';
+$pluginPath   = $base_path.'install/assets/plugins';
+$modulePath   = $base_path.'install/assets/modules';
+$templatePath = $base_path.'install/assets/templates';
+$tvPath = $base_path.'install/assets/tvs';
 
 // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category
 $mt = &$moduleTemplates;
-if(is_dir($templatePath) && is_readable($templatePath)) {
+if (is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
     while (false !== ($tplfile = $d->read()))
     {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if (substr($tplfile, -4) != '.tpl') continue;
         $params = parse_docblock($templatePath, $tplfile);
-        if(is_array($params) && (count($params)>0))
+        if (is_array($params) && (count($params) > 0))
         {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
-            $mt[] = array
-            (
+            $mt[] = array(
                 $params['name'],
                 $description,
                 // Don't think this is gonna be used ... but adding it just in case 'type'
@@ -45,12 +44,12 @@ 
 
 // setup Template Variable template files
 $mtv = &$moduleTVs;
-if(is_dir($tvPath) && is_readable($tvPath)) {
+if (is_dir($tvPath) && is_readable($tvPath)) {
     $d = dir($tvPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if (substr($tplfile, -4) != '.tpl') continue;
         $params = parse_docblock($tvPath, $tplfile);
-        if(is_array($params) && (count($params)>0)) {
+        if (is_array($params) && (count($params) > 0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mtv[] = array(
                 $params['name'],
@@ -62,9 +61,9 @@ 
                 $params['output_widget'],
                 $params['output_widget_params'],
                 "$templatePath/{$params['filename']}", /* not currently used */
-                $params['template_assignments']!="*"?$params['template_assignments']:implode(",",array_map(create_function('$v','return $v[0];'),$mt)), /* comma-separated list of template names */
+                $params['template_assignments'] != "*" ? $params['template_assignments'] : implode(",", array_map(create_function('$v', 'return $v[0];'), $mt)), /* comma-separated list of template names */
                 $params['modx_category'],
-                $params['lock_tv'],  /* value should be 1 or 0 */
+                $params['lock_tv'], /* value should be 1 or 0 */
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
@@ -74,14 +73,14 @@ 
 
 // setup chunks template files - array : name, description, type - 0:file or 1:content, file or content
 $mc = &$moduleChunks;
-if(is_dir($chunkPath) && is_readable($chunkPath)) {
+if (is_dir($chunkPath) && is_readable($chunkPath)) {
     $d = dir($chunkPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($chunkPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $mc[] = array(
                 $params['name'],
                 $params['description'],
@@ -97,14 +96,14 @@ 
 
 // setup snippets template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $ms = &$moduleSnippets;
-if(is_dir($snippetPath) && is_readable($snippetPath)) {
+if (is_dir($snippetPath) && is_readable($snippetPath)) {
     $d = dir($snippetPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($snippetPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $ms[] = array(
                 $params['name'],
@@ -121,14 +120,14 @@ 
 
 // setup plugins template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $mp = &$modulePlugins;
-if(is_dir($pluginPath) && is_readable($pluginPath)) {
+if (is_dir($pluginPath) && is_readable($pluginPath)) {
     $d = dir($pluginPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($pluginPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mp[] = array(
                 $params['name'],
@@ -150,14 +149,14 @@ 
 // setup modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid,enable_sharedparams
 $mm = &$moduleModules;
 $mdp = &$moduleDependencies;
-if(is_dir($modulePath) && is_readable($modulePath)) {
+if (is_dir($modulePath) && is_readable($modulePath)) {
     $d = dir($modulePath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($modulePath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mm[] = array(
                 $params['name'],
@@ -241,109 +240,109 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser){
     $ids = array();
     $mysqlVerOk = -1;
 
-    if(function_exists("mysqli_get_server_info")) {
-        $mysqlVerOk = (version_compare(mysqli_get_server_info($sqlParser->conn),"4.0.2")>=0);
+    if (function_exists("mysqli_get_server_info")) {
+        $mysqlVerOk = (version_compare(mysqli_get_server_info($sqlParser->conn), "4.0.2") >= 0);
     }
 
     // secure web documents - privateweb
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group
              WHERE wga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $ds = mysqli_query($sqlParser->conn, $sql);
+    if (!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
     }
     else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
+        while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"];
+        if (count($ids) > 0) {
+            mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ", $ids).")");
             unset($ids);
         }
     }
 
     // secure manager documents privatemgr
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group
              WHERE mga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $ds = mysqli_query($sqlParser->conn, $sql);
+    if (!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
     }
     else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
+        while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"];
+        if (count($ids) > 0) {
+            mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ", $ids).")");
             unset($ids);
         }
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename){
     $params = array();
-    $fullpath = $element_dir . '/' . $filename;
-    if(is_readable($fullpath)) {
+    $fullpath = $element_dir.'/'.$filename;
+    if (is_readable($fullpath)) {
         $tpl = @fopen($fullpath, "r");
-        if($tpl) {
+        if ($tpl) {
             $params['filename'] = $filename;
             $docblock_start_found = false;
             $name_found = false;
             $description_found = false;
             $docblock_end_found = false;
 
-            while(!feof($tpl)) {
+            while (!feof($tpl)) {
                 $line = fgets($tpl);
-                if(!$docblock_start_found) {
+                if (!$docblock_start_found) {
                     // find docblock start
-                    if(strpos($line, '/**') !== false) {
+                    if (strpos($line, '/**') !== false) {
                         $docblock_start_found = true;
                     }
                     continue;
-                } elseif(!$name_found) {
+                } elseif (!$name_found) {
                     // find name
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['name'] = trim($ma[1]);
                         $name_found = !empty($params['name']);
                     }
                     continue;
-                } elseif(!$description_found) {
+                } elseif (!$description_found) {
                     // find description
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['description'] = trim($ma[1]);
                         $description_found = !empty($params['description']);
                     }
                     continue;
                 } else {
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
                         $param = trim($ma[1]);
                         $val = trim($ma[2]);
-                        if(!empty($param) && !empty($val)) {
-                            if($param == 'internal') {
+                        if (!empty($param) && !empty($val)) {
+                            if ($param == 'internal') {
                                 $ma = null;
-                                if(preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
+                                if (preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
                                     $param = trim($ma[1]);
                                     $val = trim($ma[2]);
                                 }
                                 //if($val !== '0' && (empty($param) || empty($val))) {
-                                if(empty($param)) {
+                                if (empty($param)) {
                                     continue;
                                 }
                             }
                             $params[$param] = $val;
                         }
-                    } elseif(preg_match("/^\s*\*\/\s*$/", $line)) {
+                    } elseif (preg_match("/^\s*\*\/\s*$/", $line)) {
                         $docblock_end_found = true;
                         break;
                     }

Braces +23 added lines, -15 removed lines

@@ -4,7 +4,9 @@ 
 if (is_file($base_path . 'assets/cache/siteManager.php')) {
     include_once($base_path . 'assets/cache/siteManager.php');
 }
-if(!defined('MGR_DIR')) define('MGR_DIR', 'manager');
+if(!defined('MGR_DIR')) {
+    define('MGR_DIR', 'manager');
+}
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
@@ -19,12 +21,12 @@ 
 $mt = &$moduleTemplates;
 if(is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
-    while (false !== ($tplfile = $d->read()))
-    {
-        if(substr($tplfile, -4) != '.tpl') continue;
+    while (false !== ($tplfile = $d->read())) {
+        if(substr($tplfile, -4) != '.tpl') {
+            continue;
+        }
         $params = parse_docblock($templatePath, $tplfile);
-        if(is_array($params) && (count($params)>0))
-        {
+        if(is_array($params) && (count($params)>0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mt[] = array
             (
@@ -48,7 +50,9 @@ 
 if(is_dir($tvPath) && is_readable($tvPath)) {
     $d = dir($tvPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if(substr($tplfile, -4) != '.tpl') {
+            continue;
+        }
         $params = parse_docblock($tvPath, $tplfile);
         if(is_array($params) && (count($params)>0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
@@ -241,7 +245,8 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser)
+{
     $ids = array();
     $mysqlVerOk = -1;
 
@@ -259,9 +264,10 @@ 
     $ds = mysqli_query($sqlParser->conn,$sql);
     if(!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
-    }
-    else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
+    } else {
+        while($r = mysqli_fetch_assoc($ds)) {
+            $ids[]=$r["id"];
+        }
         if(count($ids)>0) {
             mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
             unset($ids);
@@ -278,9 +284,10 @@ 
     $ds = mysqli_query($sqlParser->conn,$sql);
     if(!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
-    }
-    else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
+    } else {
+        while($r = mysqli_fetch_assoc($ds)) {
+            $ids[]=$r["id"];
+        }
         if(count($ids)>0) {
             mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
             unset($ids);
@@ -288,7 +295,8 @@ 
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename)
+{
     $params = array();
     $fullpath = $element_dir . '/' . $filename;
     if(is_readable($fullpath)) {

install/actions/action_language.php

Spacing +10 added lines, -10 removed lines

@@ -1,22 +1,22 @@
 <?php
 $content = file_get_contents('actions/tpl_language.html');
-$content = parse($content,array('langOptions'=>getLangOptions($install_language)));
-$content = parse($content,$_lang,'[%','%]');
+$content = parse($content, array('langOptions'=>getLangOptions($install_language)));
+$content = parse($content, $_lang, '[%', '%]');
 echo $content;
 
-function getLangOptions($install_language='english') {
+function getLangOptions($install_language = 'english'){
     $langs = array();
-    if( $handle = opendir('lang/') ) {
-    	while( false !== ( $file = readdir( $handle ) ) ) {
-    		if( strpos( $file, '.' ) ) $langs[] = str_replace('.inc.php', '', $file);
+    if ($handle = opendir('lang/')) {
+    	while (false !== ($file = readdir($handle))) {
+    		if (strpos($file, '.')) $langs[] = str_replace('.inc.php', '', $file);
     	}
-    	closedir( $handle );
+    	closedir($handle);
     }
-    sort( $langs );
+    sort($langs);
     $_ = array();
     foreach ($langs as $language) {
-        $abrv_language = explode('-',$language);
-        $selected =  ($language == $install_language) ? 'selected' : '';
+        $abrv_language = explode('-', $language);
+        $selected = ($language == $install_language) ? 'selected' : '';
         $_[] = sprintf('<option value="%s" %s>%s</option>', $language, $selected, ucwords($abrv_language[0]))."\n";
     }
     return join("\n", $_);

Braces +5 added lines, -2 removed lines

@@ -4,11 +4,14 @@
 $content = parse($content,$_lang,'[%','%]');
 echo $content;
 
-function getLangOptions($install_language='english') {
+function getLangOptions($install_language='english')
+{
     $langs = array();
     if( $handle = opendir('lang/') ) {
     	while( false !== ( $file = readdir( $handle ) ) ) {
-    		if( strpos( $file, '.' ) ) $langs[] = str_replace('.inc.php', '', $file);
+    		if( strpos( $file, '.' ) ) {
+    		    $langs[] = str_replace('.inc.php', '', $file);
+    		}
     	}
     	closedir( $handle );
     }

install/actions/action_install.php

Spacing +2 added lines, -2 removed lines

@@ -43,10 +43,10 @@
 	var chk = document.install.rminstaller;
 	if(chk && chk.checked) {
 		// remove install folder and files
-		window.location.href = "../<?php echo MGR_DIR;?>/processors/remove_installer.processor.php?rminstall=1";
+		window.location.href = "../<?php echo MGR_DIR; ?>/processors/remove_installer.processor.php?rminstall=1";
 	}
 	else {
-		window.location.href = "../<?php echo MGR_DIR;?>/";
+		window.location.href = "../<?php echo MGR_DIR; ?>/";
 	}
 }
 /* ]]> */

install/actions/action_summary.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>
 

install/actions/action_connection.php

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

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", $_);
+    }
+    }

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

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/functions.php

Spacing +18 added lines, -18 removed lines

@@ -4,9 +4,9 @@ 
 	global $_lang;
 	
 	// session loop-back tester
-	if(!isset($_GET['action']) || $_GET['action']!=='mode')
+	if (!isset($_GET['action']) || $_GET['action'] !== 'mode')
 	{
-		if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
+		if (!isset($_SESSION['test']) || $_SESSION['test'] != 1)
 		{
 			echo '
 <html>
@@ -22,8 +22,8 @@ 
 </head>
 <body>
 	<div class="install">
-		<p>' . $_lang["session_problem"] . '</p>
-		<p><a href="./">' .$_lang["session_problem_try_again"] . '</a></p>
+		<p>' . $_lang["session_problem"].'</p>
+		<p><a href="./">' .$_lang["session_problem_try_again"].'</a></p>
 	</div>
 </body>
 </html>';
@@ -32,28 +32,28 @@ 
 	}
 }
 
-function parse($src,$ph,$left='[+',$right='+]')
+function parse($src, $ph, $left = '[+', $right = '+]')
 {
-	foreach($ph as $k=>$v)
+	foreach ($ph as $k=>$v)
 	{
-		$k = $left . $k . $right;
-		$src = str_replace($k,$v,$src);
+		$k = $left.$k.$right;
+		$src = str_replace($k, $v, $src);
 	}
 	return $src;
 }
 
 function ph()
 {
-	global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date;
+	global $_lang, $moduleName, $moduleVersion, $modx_textdir, $modx_release_date;
 
-	if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
+	if (isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
 	else                                $installmode = get_installmode();
 
 	$ph['pagetitle']     = $_lang['modx_install'];
-	$ph['textdir']       = $modx_textdir ? ' id="rtl"':'';
+	$ph['textdir']       = $modx_textdir ? ' id="rtl"' : '';
 	$ph['help_link']     = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd'];
 	$ph['version']       = $moduleVersion;
-	$ph['release_date']  = ($modx_textdir ? '&rlm;':'') . $modx_release_date;
+	$ph['release_date']  = ($modx_textdir ? '&rlm;' : '').$modx_release_date;
 	$ph['footer1']       = $_lang['modx_footer1'];
 	$ph['footer2']       = $_lang['modx_footer2'];
 	$ph['current_year']  = date('Y');
@@ -62,20 +62,20 @@ 
 
 function get_installmode()
 {
-	global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix;
+	global $base_path, $database_server, $database_user, $database_password, $dbase, $table_prefix;
 	
 	$conf_path = "{$base_path}manager/includes/config.inc.php";
 	if (!is_file($conf_path)) $installmode = 0;
-	elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
+	elseif (isset($_POST['installmode'])) $installmode = $_POST['installmode'];
 	else
 	{
 		include_once("{$base_path}manager/includes/config.inc.php");
 		
-		if(!isset($dbase) || empty($dbase)) $installmode = 0;
+		if (!isset($dbase) || empty($dbase)) $installmode = 0;
 		else
 		{
 			$conn = mysqli_connect($database_server, $database_user, $database_password);
-			if($conn)
+			if ($conn)
 			{
 				$_SESSION['database_server']   = $database_server;
 				$_SESSION['database_user']     = $database_user;
@@ -86,7 +86,7 @@ 
 			}
 			else $rs = false;
 			
-			if($rs)
+			if ($rs)
 			{
 				$_SESSION['dbase']                      = $dbase;
 				$_SESSION['table_prefix']               = $table_prefix;
@@ -95,7 +95,7 @@ 
 				
 				$tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`";
 				$rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'");
-				if($rs)
+				if ($rs)
 				{
 					$row = mysqli_fetch_assoc($rs);
 					$settings_version = $row['setting_value'];

Braces +30 added lines, -26 removed lines

@@ -4,10 +4,8 @@ 
 	global $_lang;
 	
 	// session loop-back tester
-	if(!isset($_GET['action']) || $_GET['action']!=='mode')
-	{
-		if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
-		{
+	if(!isset($_GET['action']) || $_GET['action']!=='mode') {
+		if(!isset($_SESSION['test']) || $_SESSION['test']!=1) {
 			echo '
 <html>
 <head>
@@ -34,8 +32,7 @@ 
 
 function parse($src,$ph,$left='[+',$right='+]')
 {
-	foreach($ph as $k=>$v)
-	{
+	foreach($ph as $k=>$v) {
 		$k = $left . $k . $right;
 		$src = str_replace($k,$v,$src);
 	}
@@ -46,8 +43,11 @@ 
 {
 	global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date;
 
-	if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
-	else                                $installmode = get_installmode();
+	if(isset($_SESSION['installmode'])) {
+	    $installmode = $_SESSION['installmode'];
+	} else {
+	    $installmode = get_installmode();
+	}
 
 	$ph['pagetitle']     = $_lang['modx_install'];
 	$ph['textdir']       = $modx_textdir ? ' id="rtl"':'';
@@ -65,29 +65,29 @@ 
 	global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix;
 	
 	$conf_path = "{$base_path}manager/includes/config.inc.php";
-	if (!is_file($conf_path)) $installmode = 0;
-	elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
-	else
-	{
+	if (!is_file($conf_path)) {
+	    $installmode = 0;
+	} elseif(isset($_POST['installmode'])) {
+	    $installmode = $_POST['installmode'];
+	} else {
 		include_once("{$base_path}manager/includes/config.inc.php");
 		
-		if(!isset($dbase) || empty($dbase)) $installmode = 0;
-		else
-		{
+		if(!isset($dbase) || empty($dbase)) {
+		    $installmode = 0;
+		} else {
 			$conn = mysqli_connect($database_server, $database_user, $database_password);
-			if($conn)
-			{
+			if($conn) {
 				$_SESSION['database_server']   = $database_server;
 				$_SESSION['database_user']     = $database_user;
 				$_SESSION['database_password'] = $database_password;
 				
 				$dbase = trim($dbase, '`');
 				$rs = mysqli_select_db($conn, $dbase);
+			} else {
+			    $rs = false;
 			}
-			else $rs = false;
 			
-			if($rs)
-			{
+			if($rs) {
 				$_SESSION['dbase']                      = $dbase;
 				$_SESSION['table_prefix']               = $table_prefix;
 				$_SESSION['database_collation']         = 'utf8_general_ci';
@@ -95,17 +95,21 @@ 
 				
 				$tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`";
 				$rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'");
-				if($rs)
-				{
+				if($rs) {
 					$row = mysqli_fetch_assoc($rs);
 					$settings_version = $row['setting_value'];
+				} else {
+				    $settings_version = '';
 				}
-				else $settings_version = '';
 				
-				if (empty($settings_version)) $installmode = 0;
-				else                          $installmode = 1;
+				if (empty($settings_version)) {
+				    $installmode = 0;
+				} else {
+				    $installmode = 1;
+				}
+			} else {
+			    $installmode = 1;
 			}
-			else $installmode = 1;
 		}
 	}
 	return $installmode;