evolution-cms / evolution

manager/includes/extenders/modxmailer.class.inc.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -8,8 +8,8 @@
  *******************************************************
  */
 
-use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
+use PHPMailer\PHPMailer\PHPMailer;
 
 require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php';
 require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php';

Braces +12 added lines, -6 removed lines

@@ -276,14 +276,16 @@ 
     /**
      * @return string
      */
-    public function getMIMEHeader() {
+    public function getMIMEHeader()
+    {
         return $this->MIMEHeader;
     }
 
     /**
      * @return string
      */
-    public function getMIMEBody() {
+    public function getMIMEBody()
+    {
         return $this->MIMEBody;
     }
 
@@ -292,7 +294,8 @@ 
      * 
      * @return $this
      */
-    public function setMIMEHeader($header = '') {
+    public function setMIMEHeader($header = '')
+    {
         $this->MIMEHeader = $header;
 
         return $this;
@@ -303,7 +306,8 @@ 
      * 
      * @return $this
      */
-    public function setMIMEBody($body = '') {
+    public function setMIMEBody($body = '')
+    {
         $this->MIMEBody = $body;
 
         return $this;
@@ -314,7 +318,8 @@ 
      * 
      * @return $this
      */
-    public function setMailHeader($header = '') {
+    public function setMailHeader($header = '')
+    {
         $this->mailHeader = $header;
 
         return $this;
@@ -323,7 +328,8 @@ 
     /**
      * @return string
      */
-    public function getMessageID() {
+    public function getMessageID()
+    {
         return trim($this->lastMessageID,'<>');
     }
 }

install/setup.info.php

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

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_summary.php

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

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

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

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

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

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;