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

@@ -280,14 +280,16 @@ 
     /**
      * @return string
      */
-    public function getMIMEHeader() {
+    public function getMIMEHeader()
+    {
         return $this->MIMEHeader;
     }
 
     /**
      * @return string
      */
-    public function getMIMEBody() {
+    public function getMIMEBody()
+    {
         return $this->MIMEBody;
     }
 
@@ -296,7 +298,8 @@ 
      *
      * @return $this
      */
-    public function setMIMEHeader($header = '') {
+    public function setMIMEHeader($header = '')
+    {
         $this->MIMEHeader = $header;
 
         return $this;
@@ -307,7 +310,8 @@ 
      *
      * @return $this
      */
-    public function setMIMEBody($body = '') {
+    public function setMIMEBody($body = '')
+    {
         $this->MIMEBody = $body;
 
         return $this;
@@ -318,7 +322,8 @@ 
      *
      * @return $this
      */
-    public function setMailHeader($header = '') {
+    public function setMailHeader($header = '')
+    {
         $this->mailHeader = $header;
 
         return $this;
@@ -327,7 +332,8 @@ 
     /**
      * @return string
      */
-    public function getMessageID() {
+    public function getMessageID()
+    {
         return trim($this->lastMessageID,'<>');
     }
 }

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;

install/connection.servertest.php

Braces +8 added lines, -5 removed lines

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

install/connection.collation.php

Braces +24 added lines, -13 removed lines

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

manager/actions/mutate_content.dynamic.php

Braces +12 added lines, -5 removed lines

@@ -478,7 +478,8 @@ 
 			return s;
 		}
 
-		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific ?>
 		var lastImageCtrl;
 		var lastFileCtrl;
 
@@ -694,7 +695,8 @@ 
 									</td>
 								</tr>
 
-								<?php if($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+								<?php if($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific ?>
 
 									<tr>
 										<td><span class="warning"><?= $_lang['weblink'] ?></span>
@@ -1356,7 +1358,9 @@ 
 						if($documentId > 0) {
 							// Load up, the permissions from the parent (if new document) or existing document
 							$rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							while($currentgroup = $modx->db->getRow($rs)) {
+							    $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							}
 
 							// Load up the current permissions and names
 							$vs = array(
@@ -1418,7 +1422,9 @@ 
 
 							// Create attribute string list
 							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+							foreach($inputAttributes as $k => $v) {
+							    $inputString[] = $k . '="' . $v . '"';
+							}
 
 							// Make the <input> HTML
 							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
@@ -1535,7 +1541,8 @@ 
 	}
 }
 
-function getDefaultTemplate() {
+function getDefaultTemplate()
+{
 	global $modx;
 
 	switch($modx->config['auto_template_logic']) {

manager/actions/resources.static.php

Braces +6 added lines, -2 removed lines

@@ -28,7 +28,9 @@ 
 	'type7' => $_lang["lock_element_type_7"],
 	'type8' => $_lang["lock_element_type_8"]
 );
-foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach($unlockTranslations as $key => $value) {
+    $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+}
 
 // Prepare lang-strings for mgrResAction()
 $mraTranslations = array(
@@ -44,7 +46,9 @@ 
 	'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
 	'confirm_delete_module' => $_lang["confirm_delete_module"],
 );
-foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach($mraTranslations as $key => $value) {
+    $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+}
 ?>
 <script>var trans = <?php echo json_encode($unlockTranslations); ?>;</script>
 <script>var mraTrans = <?php echo json_encode($mraTranslations); ?>;</script>

manager/actions/import_site.static.php

Braces +14 added lines, -7 removed lines

@@ -101,7 +101,8 @@ 
 	</div>
 
 <?php
-function run() {
+function run()
+{
 	global $modx;
 
 	$tbl_site_content = $modx->getFullTableName('site_content');
@@ -160,7 +161,8 @@ 
 	return $output;
 }
 
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode)
+{
 	global $modx;
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -302,7 +304,8 @@ 
 	}
 }
 
-function getFiles($directory, $listing = array(), $count = 0) {
+function getFiles($directory, $listing = array(), $count = 0)
+{
 	global $_lang;
 	global $filesfound;
 	$dummy = $count;
@@ -326,7 +329,8 @@ 
 	return ($listing);
 }
 
-function getFileContent($filepath) {
+function getFileContent($filepath)
+{
 	global $_lang;
 	// get the file
 	if(!$buffer = file_get_contents($filepath)) {
@@ -336,7 +340,8 @@ 
 	}
 }
 
-function pop_index($array) {
+function pop_index($array)
+{
 	$new_array = array();
 	foreach($array as $k => $v) {
 		if($v !== 'index.html' && $v !== 'index.htm') {
@@ -353,7 +358,8 @@ 
 	return $new_array;
 }
 
-function treatContent($src, $filename, $alias) {
+function treatContent($src, $filename, $alias)
+{
 	global $modx;
 
 	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
@@ -394,7 +400,8 @@ 
 	);
 }
 
-function convertLink() {
+function convertLink()
+{
 	global $modx;
 	$tbl_site_content = $modx->getFullTableName('site_content');
 

manager/actions/mutate_settings/tab5_security_settings.inc.php

Braces +10 added lines, -4 removed lines

@@ -1,7 +1,9 @@ 
 <?php

     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4

-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) $valid_hostnames = $_SERVER['HTTP_HOST'];

-?>

+    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
+        $valid_hostnames = $_SERVER['HTTP_HOST'];
+    }
+    ?>

 <!-- Interface & editor settings -->

 <div class="tab-page" id="tabPageSecurity">

 <h2 class="tab"><?php echo $_lang['settings_security'] ?></h2>

@@ -153,7 +155,9 @@ 
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>

 <td>

 <?php

-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

+if(empty($pwd_hash_algo)) {
+    $phm['sel']['UNCRYPT'] = 1;
+}
 $phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;

 $phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0:1;

 $phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0:1;

@@ -182,7 +186,9 @@ 
   ?>

 <?php

 $gdAvailable = extension_loaded('gd');

-if(!$gdAvailable) $use_captcha = 0;

+if(!$gdAvailable) {
+    $use_captcha = 0;
+}
 ?>

   <tr>

     <td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td>