evolution-cms / evolution

install/src/controllers/connection/databasetest.php

Spacing +9 added lines, -9 removed lines

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

install/src/controllers/options.php

Spacing +8 added lines, -8 removed lines

@@ -1,21 +1,21 @@ 
 <?php
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
 
-switch($installMode){
+switch ($installMode) {
     case 0:
     case 2:
         $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8mb4_general_ci';
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $_POST['database_connection_charset'] = $database_charset;
-        if(empty($_SESSION['databaseloginpassword']))
+        if (empty($_SESSION['databaseloginpassword']))
             $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-        if(empty($_SESSION['databaseloginname']))
+        if (empty($_SESSION['databaseloginname']))
             $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
         break;
     case 1:
-        include $base_path . MGR_DIR . '/includes/config.inc.php';
+        include $base_path.MGR_DIR.'/includes/config.inc.php';
         $host = explode(':', $database_server, 2);
-        if (@ $conn = mysqli_connect($host[0], $database_user, $database_password,'', isset($host[1]) ? $host[1] : null)) {
+        if (@ $conn = mysqli_connect($host[0], $database_user, $database_password, '', isset($host[1]) ? $host[1] : null)) {
             if (@ mysqli_query($conn, "USE {$dbase}")) {
                 if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
                     $rs = mysqli_query($conn, "show session variables like 'collation_server'");
@@ -69,7 +69,7 @@ 
 $ph['checked'] = isset ($_POST['installdata']) && $_POST['installdata'] == "1" ? 'checked' : '';
 
 # load setup information file
-include_once dirname(__DIR__) . '/processor/result.php';
+include_once dirname(__DIR__).'/processor/result.php';
 $ph['templates'] = getTemplates($moduleTemplates);
 $ph['tvs']       = getTVs($moduleTVs);
 $ph['chunks']    = getChunks($moduleChunks);
@@ -79,6 +79,6 @@ 
 
 $ph['action'] = ($installMode == 1) ? 'mode' : 'connection';
 
-$tpl = file_get_contents(dirname(__DIR__) . '/template/actions/options.tpl');
+$tpl = file_get_contents(dirname(__DIR__).'/template/actions/options.tpl');
 $content = parse($tpl, $ph);
 echo parse($content, $_lang, '[%', '%]');

Braces +13 added lines, -7 removed lines

@@ -1,16 +1,18 @@ 
 <?php
 $installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
 
-switch($installMode){
+switch($installMode) {
     case 0:
     case 2:
         $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8mb4_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'];
+        if(empty($_SESSION['databaseloginpassword'])) {
+                    $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
+        }
+        if(empty($_SESSION['databaseloginname'])) {
+                    $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
+        }
         break;
     case 1:
         include $base_path . MGR_DIR . '/includes/config.inc.php';
@@ -25,7 +27,9 @@ 
                 }
             }
         }
-        if (empty ($database_collation)) $database_collation = 'utf8mb4_general_ci';
+        if (empty ($database_collation)) {
+            $database_collation = 'utf8mb4_general_ci';
+        }
 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         if (!isset ($database_connection_charset) || empty ($database_connection_charset)) {
@@ -34,7 +38,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';

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

@@ -16,7 +16,7 @@
         include $base_path . MGR_DIR . '/includes/config.inc.php';
         $host = explode(':', $database_server, 2);
         if (@ $conn = mysqli_connect($host[0], $database_user, $database_password,'', isset($host[1]) ? $host[1] : null)) {
-            if (@ mysqli_query($conn, "USE {$dbase}")) {
+            if (@ mysqli_query($conn, "use {$dbase}")) {
                 if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
                     $rs = mysqli_query($conn, "show session variables like 'collation_server'");
                 }

install/src/sqlParser.class.php

Indentation +121 added lines, -121 removed lines

@@ -4,141 +4,141 @@ 
 // SNUFFKIN/ Alex 2004
 
 class SqlParser {
-	public $host;
-	public $dbname;
-	public $prefix;
-	public $user;
-	public $password;
-	public $mysqlErrors;
-	public $conn;
-	public $installFailed;
-	public $sitename;
-	public $adminname;
-	public $adminemail;
-	public $adminpass;
-	public $managerlanguage;
-	public $mode;
-	public $fileManagerPath;
-	public $imgPath;
-	public $imgUrl;
-	public $dbMODx;
-	public $dbVersion;
+    public $host;
+    public $dbname;
+    public $prefix;
+    public $user;
+    public $password;
+    public $mysqlErrors;
+    public $conn;
+    public $installFailed;
+    public $sitename;
+    public $adminname;
+    public $adminemail;
+    public $adminpass;
+    public $managerlanguage;
+    public $mode;
+    public $fileManagerPath;
+    public $imgPath;
+    public $imgUrl;
+    public $dbMODx;
+    public $dbVersion;
     public $connection_charset;
     public $connection_method;
     public $ignoreDuplicateErrors;
     public $autoTemplateLogic;
 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
-		$this->host = $host;
-		$this->dbname = $db;
-		$this->prefix = $prefix;
-		$this->user = $user;
-		$this->password = $password;
-		$this->adminpass = $adminpass;
-		$this->adminname = $adminname;
-		$this->adminemail = $adminemail;
-		$this->connection_charset = $connection_charset;
-		$this->connection_method = $connection_method;
-		$this->ignoreDuplicateErrors = false;
-		$this->managerlanguage = $managerlanguage;
+    public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+        $this->host = $host;
+        $this->dbname = $db;
+        $this->prefix = $prefix;
+        $this->user = $user;
+        $this->password = $password;
+        $this->adminpass = $adminpass;
+        $this->adminname = $adminname;
+        $this->adminemail = $adminemail;
+        $this->connection_charset = $connection_charset;
+        $this->connection_method = $connection_method;
+        $this->ignoreDuplicateErrors = false;
+        $this->managerlanguage = $managerlanguage;
         $this->autoTemplateLogic = $auto_template_logic;
-	}
+    }
 
-	public function connect() {
+    public function connect() {
         $host = explode(':', $this->host, 2);
         $this->conn = mysqli_connect($host[0], $this->user, $this->password,'', isset($host[1]) ? $host[1] : null);
-		mysqli_select_db($this->conn, $this->dbname);
-		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
-
-		$this->dbVersion = 3.23; // assume version 3.23
-		if(function_exists("mysqli_get_server_info")) {
-			$ver = mysqli_get_server_info($this->conn);
-			$this->dbMODx 	 = version_compare($ver,"4.0.2");
-			$this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
-		}
+        mysqli_select_db($this->conn, $this->dbname);
+        if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
+
+        $this->dbVersion = 3.23; // assume version 3.23
+        if(function_exists("mysqli_get_server_info")) {
+            $ver = mysqli_get_server_info($this->conn);
+            $this->dbMODx 	 = version_compare($ver,"4.0.2");
+            $this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
+        }
 
         mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
-	}
+    }
 
     public function process($filename) {
-	    global $custom_placeholders;
-
-		// check to make sure file exists
-		if (!file_exists($filename)) {
-			$this->mysqlErrors[] = array("error" => "File '$filename' not found");
-			$this->installFailed = true ;
-			return false;
-		}
-
-		$fh = fopen($filename, 'r');
-		$idata = '';
-
-		while (!feof($fh)) {
-			$idata .= fread($fh, 1024);
-		}
-
-		fclose($fh);
-		$idata = str_replace("\r", '', $idata);
-
-		// check if in upgrade mode
-		if ($this->mode === 'upd') {
-			// remove non-upgradeable parts
-			$s = strpos($idata,'non-upgrade-able[[');
-			$e = strpos($idata,']]non-upgrade-able') + 17;
-			if($s && $e) {
-			    $idata = str_replace(substr($idata, $s,$e-$s),' Removed non upgradeable items', $idata);
+        global $custom_placeholders;
+
+        // check to make sure file exists
+        if (!file_exists($filename)) {
+            $this->mysqlErrors[] = array("error" => "File '$filename' not found");
+            $this->installFailed = true ;
+            return false;
+        }
+
+        $fh = fopen($filename, 'r');
+        $idata = '';
+
+        while (!feof($fh)) {
+            $idata .= fread($fh, 1024);
+        }
+
+        fclose($fh);
+        $idata = str_replace("\r", '', $idata);
+
+        // check if in upgrade mode
+        if ($this->mode === 'upd') {
+            // remove non-upgradeable parts
+            $s = strpos($idata,'non-upgrade-able[[');
+            $e = strpos($idata,']]non-upgrade-able') + 17;
+            if($s && $e) {
+                $idata = str_replace(substr($idata, $s,$e-$s),' Removed non upgradeable items', $idata);
             }
-		}
+        }
 
-		// replace {} tags
-		$idata = str_replace('{PREFIX}', $this->prefix, $idata);
+        // replace {} tags
+        $idata = str_replace('{PREFIX}', $this->prefix, $idata);
         $idata = str_replace('{TABLEENCODING}', $this->getTableEncoding(), $idata);
-		$idata = str_replace('{ADMIN}', $this->adminname, $idata);
-		$idata = str_replace('{ADMINEMAIL}', $this->adminemail, $idata);
-		$idata = str_replace('{ADMINPASS}', $this->adminpass, $idata);
-		$idata = str_replace('{IMAGEPATH}', $this->imgPath, $idata);
-		$idata = str_replace('{IMAGEURL}', $this->imgUrl, $idata);
-		$idata = str_replace('{FILEMANAGERPATH}', $this->fileManagerPath, $idata);
-		$idata = str_replace('{MANAGERLANGUAGE}', $this->managerlanguage, $idata);
-		$idata = str_replace('{AUTOTEMPLATELOGIC}', $this->autoTemplateLogic, $idata);
-		/*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
-
-		// Replace custom placeholders
-		foreach($custom_placeholders as $key=>$val) {
-			if (strpos($idata, '{'.$key.'}') !== false) {
-				$idata = str_replace('{'.$key.'}', $val, $idata);
-			}
-		}
-
-		$sql_array = explode("\n\n", $idata);
-
-		$num = 0;
-		foreach($sql_array as $sql_entry) {
-			$sql_do = trim($sql_entry, "\r\n; ");
-
-			if (preg_match('/^\#/', $sql_do)) continue;
-
-			// strip out comments and \n for mysql 3.x
-			if ($this->dbVersion <4.0) {
-				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
-				$sql_do = str_replace('\r', "", $sql_do);
-				$sql_do = str_replace('\n', "", $sql_do);
-			}
-
-
-			$num = $num + 1;
-			if ($sql_do) mysqli_query($this->conn, $sql_do);
-			if(mysqli_error($this->conn)) {
-				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
-				}
-				// End Ignore duplicate
-				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
-				$this->installFailed = true;
-			}
-		}
-	}
+        $idata = str_replace('{ADMIN}', $this->adminname, $idata);
+        $idata = str_replace('{ADMINEMAIL}', $this->adminemail, $idata);
+        $idata = str_replace('{ADMINPASS}', $this->adminpass, $idata);
+        $idata = str_replace('{IMAGEPATH}', $this->imgPath, $idata);
+        $idata = str_replace('{IMAGEURL}', $this->imgUrl, $idata);
+        $idata = str_replace('{FILEMANAGERPATH}', $this->fileManagerPath, $idata);
+        $idata = str_replace('{MANAGERLANGUAGE}', $this->managerlanguage, $idata);
+        $idata = str_replace('{AUTOTEMPLATELOGIC}', $this->autoTemplateLogic, $idata);
+        /*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
+
+        // Replace custom placeholders
+        foreach($custom_placeholders as $key=>$val) {
+            if (strpos($idata, '{'.$key.'}') !== false) {
+                $idata = str_replace('{'.$key.'}', $val, $idata);
+            }
+        }
+
+        $sql_array = explode("\n\n", $idata);
+
+        $num = 0;
+        foreach($sql_array as $sql_entry) {
+            $sql_do = trim($sql_entry, "\r\n; ");
+
+            if (preg_match('/^\#/', $sql_do)) continue;
+
+            // strip out comments and \n for mysql 3.x
+            if ($this->dbVersion <4.0) {
+                $sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
+                $sql_do = str_replace('\r', "", $sql_do);
+                $sql_do = str_replace('\n', "", $sql_do);
+            }
+
+
+            $num = $num + 1;
+            if ($sql_do) mysqli_query($this->conn, $sql_do);
+            if(mysqli_error($this->conn)) {
+                // Ignore duplicate and drop errors - Raymond
+                if ($this->ignoreDuplicateErrors){
+                    if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+                }
+                // End Ignore duplicate
+                $this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
+                $this->installFailed = true;
+            }
+        }
+    }
 
     public function getTableEncoding()
     {
@@ -150,6 +150,6 @@ 
     }
 
     public function close() {
-		mysqli_close($this->conn);
-	}
+        mysqli_close($this->conn);
+    }
 }

Spacing +23 added lines, -23 removed lines

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

Braces +23 added lines, -10 removed lines

@@ -3,7 +3,8 @@ 
 // MySQL Dump Parser
 // SNUFFKIN/ Alex 2004
 
-class SqlParser {
+class SqlParser
+{
 	public $host;
 	public $dbname;
 	public $prefix;
@@ -28,7 +29,8 @@ 
     public $ignoreDuplicateErrors;
     public $autoTemplateLogic;
 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent')
+	{
 		$this->host = $host;
 		$this->dbname = $db;
 		$this->prefix = $prefix;
@@ -44,11 +46,14 @@ 
         $this->autoTemplateLogic = $auto_template_logic;
 	}
 
-	public function connect() {
+	public function connect()
+	{
         $host = explode(':', $this->host, 2);
         $this->conn = mysqli_connect($host[0], $this->user, $this->password,'', isset($host[1]) ? $host[1] : null);
 		mysqli_select_db($this->conn, $this->dbname);
-		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
+		if (function_exists('mysqli_set_charset')) {
+		    mysqli_set_charset($this->conn, $this->connection_charset);
+		}
 
 		$this->dbVersion = 3.23; // assume version 3.23
 		if(function_exists("mysqli_get_server_info")) {
@@ -60,7 +65,8 @@ 
         mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
 	}
 
-    public function process($filename) {
+    public function process($filename)
+    {
 	    global $custom_placeholders;
 
 		// check to make sure file exists
@@ -116,7 +122,9 @@ 
 		foreach($sql_array as $sql_entry) {
 			$sql_do = trim($sql_entry, "\r\n; ");
 
-			if (preg_match('/^\#/', $sql_do)) continue;
+			if (preg_match('/^\#/', $sql_do)) {
+			    continue;
+			}
 
 			// strip out comments and \n for mysql 3.x
 			if ($this->dbVersion <4.0) {
@@ -127,11 +135,15 @@ 
 
 
 			$num = $num + 1;
-			if ($sql_do) mysqli_query($this->conn, $sql_do);
+			if ($sql_do) {
+			    mysqli_query($this->conn, $sql_do);
+			}
 			if(mysqli_error($this->conn)) {
 				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+				if ($this->ignoreDuplicateErrors) {
+					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) {
+					    continue;
+					}
 				}
 				// End Ignore duplicate
 				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
@@ -149,7 +161,8 @@ 
         return $out;
     }
 
-    public function close() {
+    public function close()
+    {
 		mysqli_close($this->conn);
 	}
 }

install/src/functions.php

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! function_exists('getLangOptions')) {
+if (!function_exists('getLangOptions')) {
     /**
      * @param string $install_language
      * @return string
@@ -7,7 +7,7 @@ 
     function getLangOptions($install_language = 'english')
     {
         $langs = array();
-        if ($handle = opendir(__DIR__ . '/lang/')) {
+        if ($handle = opendir(__DIR__.'/lang/')) {
             while (false !== ($file = readdir($handle))) {
                 if (strpos($file, '.')) {
                     $langs[] = str_replace('.inc.php', '', $file);
@@ -21,14 +21,14 @@ 
             $abrv_language = explode('-', $language);
             $selected = ($language === $install_language) ? 'selected' : '';
             $_[] = sprintf('<option value="%s" %s>%s</option>', $language, $selected,
-                    ucwords($abrv_language[0])) . "\n";
+                    ucwords($abrv_language[0]))."\n";
         }
 
         return implode("\n", $_);
     }
 }
 
-if (! function_exists('install_sessionCheck')) {
+if (!function_exists('install_sessionCheck')) {
     function install_sessionCheck()
     {
         global $_lang;
@@ -50,8 +50,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>';
@@ -72,7 +72,7 @@ 
     function parse($src, $ph, $left = '[+', $right = '+]')
     {
         foreach ($ph as $k => $v) {
-            $k = $left . $k . $right;
+            $k = $left.$k.$right;
             $src = str_replace($k, $v, $src);
         }
 
@@ -99,7 +99,7 @@ 
         $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');
@@ -128,7 +128,7 @@ 
                 $installmode = 0;
             } else {
                 $host = explode(':', $database_server, 2);
-                $conn = mysqli_connect($host[0], $database_user, $database_password,'', isset($host[1]) ? $host[1] : null);
+                $conn = mysqli_connect($host[0], $database_user, $database_password, '', isset($host[1]) ? $host[1] : null);
                 if ($conn) {
                     $_SESSION['database_server'] = $database_server;
                     $_SESSION['database_user'] = $database_user;
@@ -186,7 +186,7 @@ 
             $manager_language = "english";
         }
         $langs = array();
-        if ($handle = opendir(MODX_MANAGER_PATH . 'includes/lang')) {
+        if ($handle = opendir(MODX_MANAGER_PATH.'includes/lang')) {
             while (false !== ($file = readdir($handle))) {
                 if (strpos($file, '.inc.') !== false) {
                     $langs[] = $file;
@@ -252,7 +252,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%templates%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%templates%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -282,7 +282,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%tvs%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%tvs%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -313,7 +313,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%chunks%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%chunks%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -344,7 +344,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%modules%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%modules%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -379,7 +379,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%plugins%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%plugins%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -410,7 +410,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%snippets%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%snippets%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -421,46 +421,46 @@ 
 
         // secure web documents - privateweb
         mysqli_query($sqlParser->conn,
-            "UPDATE `" . $sqlParser->prefix . "site_content` SET privateweb = 0 WHERE privateweb = 1");
+            "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
+             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) {
-            echo "An error occurred while executing a query: " . mysqli_error($sqlParser->conn);
+            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) . ")");
+                    "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");
+            "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
+             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) {
-            echo "An error occurred while executing a query: " . mysqli_error($sqlParser->conn);
+            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) . ")");
+                    "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",
+                        $ids).")");
                 unset($ids);
             }
         }
@@ -471,7 +471,7 @@ 
     function parse_docblock($element_dir, $filename)
     {
         $params = array();
-        $fullpath = $element_dir . '/' . $filename;
+        $fullpath = $element_dir.'/'.$filename;
         if (is_readable($fullpath)) {
             $tpl = @fopen($fullpath, "r");
             if ($tpl) {
@@ -688,17 +688,17 @@ 
     function getCreateDbCategory($category, $sqlParser)
     {
         $dbase = $sqlParser->dbname;
-        $dbase = '`' . trim($dbase, '`') . '`';
+        $dbase = '`'.trim($dbase, '`').'`';
         $table_prefix = $sqlParser->prefix;
         $category_id = 0;
         if (!empty($category)) {
             $category = mysqli_real_escape_string($sqlParser->conn, $category);
             $rs = mysqli_query($sqlParser->conn,
-                "SELECT id FROM $dbase.`" . $table_prefix . "categories` WHERE category = '" . $category . "'");
+                "SELECT id FROM $dbase.`".$table_prefix."categories` WHERE category = '".$category."'");
             if (mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) {
                 $category_id = $row['id'];
             } else {
-                $q = "INSERT INTO $dbase.`" . $table_prefix . "categories` (`category`) VALUES ('{$category}');";
+                $q = "INSERT INTO $dbase.`".$table_prefix."categories` (`category`) VALUES ('{$category}');";
                 $rs = mysqli_query($sqlParser->conn, $q);
                 if ($rs) {
                     $category_id = mysqli_insert_id($sqlParser->conn);
@@ -740,7 +740,7 @@ 
             default:
                 return $cleaned;
         };
-        if (substr(trim($cleaned), 0, $count) == $include . ' MODX_BASE_PATH.\'assets/' . $elm_name . '/') {
+        if (substr(trim($cleaned), 0, $count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') {
             return $cleaned;
         }
 

core/functions/nodes.php

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!function_exists('makeHTML')) {
+if (!function_exists('makeHTML')) {
     /**
      * @param int $indent
      * @param int $parent
@@ -37,14 +37,14 @@ 
             case 'publishedon':
             case 'pub_date':
             case 'unpub_date':
-                $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'],
-                    'sc.' . $_SESSION['tree_sortby']);
+                $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'],
+                    'sc.'.$_SESSION['tree_sortby']);
                 break;
             default:
-                $sortby = 'sc.' . $_SESSION['tree_sortby'];
+                $sortby = 'sc.'.$_SESSION['tree_sortby'];
         };
 
-        $orderby = $modx->getDatabase()->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+        $orderby = $modx->getDatabase()->escape($sortby.' '.$_SESSION['tree_sortdir']);
 
         // Folder sorting gets special setup ;) Add menuindex and pagetitle
         if ($_SESSION['tree_sortby'] == 'isfolder') {
@@ -59,11 +59,11 @@ 
             $_SESSION['mgrDocgroups']) : '';
         $showProtected = false;
         if ($modx->getConfig('tree_show_protected') !== null) {
-            $showProtected = (boolean)$modx->getConfig('tree_show_protected');
+            $showProtected = (boolean) $modx->getConfig('tree_show_protected');
         }
-        $mgrRole = (isset ($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
+        $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
         if ($showProtected == false) {
-            $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+            $access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
         } else {
             $access = '';
         }
@@ -100,7 +100,7 @@ 
             }
 
             $weblinkDisplay = $row['type'] == 'reference' ? sprintf('&nbsp;%s', $_style['tree_linkgo']) : '';
-            $pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
+            $pageIdDisplay = '<small>('.($modx_textdir ? '&rlm;' : '').$row['id'].')</small>';
 
             // Prepare displaying user-locks
             $lockedByUser = '';
@@ -111,7 +111,7 @@ 
                         'element_type' => $_lang["lock_element_type_7"],
                         'lasthit_df'   => $rowLock['lasthit_df']
                     ));
-                    $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
+                    $lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>';
                 } else {
                     $title = $modx->parseText($_lang["lock_element_locked_by"], array(
                         'element_type' => $_lang["lock_element_type_7"],
@@ -119,9 +119,9 @@ 
                         'lasthit_df'   => $rowLock['lasthit_df']
                     ));
                     if ($modx->hasPermission('remove_locks')) {
-                        $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                        $lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                     } else {
-                        $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                        $lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                     }
                 }
             }
@@ -130,22 +130,22 @@ 
 
             $title = '';
             if (isDateNode($nodeNameSource)) {
-                $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+                $title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]';
             }
-            $title .= $_lang['id'] . ': ' . $row['id'];
-            $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
-            $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
-            $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
-            $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
-            $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
-            $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
-            $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
-            $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
-            $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
-            $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
-            $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
+            $title .= $_lang['id'].': '.$row['id'];
+            $title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle'];
+            $title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex'];
+            $title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-');
+            $title .= '[+lf+]'.$_lang['template'].': '.$row['templatename'];
+            $title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']);
+            $title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']);
+            $title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']);
+            $title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
+            $title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
+            $title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
+            $title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
             $title = $modx->getPhpCompat()->htmlspecialchars($title);
-            $title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+            $title = str_replace('[+lf+]', ' &#13;', $title); // replace line-breaks with empty space as fall-back
 
             $data = array(
                 'id'               => $row['id'],
@@ -229,7 +229,7 @@ 
                 }
 
                 if ($ph['contextmenu']) {
-                    $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                    $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                 }
 
                 if ($_SESSION['tree_show_only_folders']) {
@@ -287,7 +287,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -325,7 +325,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -376,7 +376,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -418,7 +418,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -444,7 +444,7 @@ 
     }
 }
 
-if(!function_exists('getIconInfo')) {
+if (!function_exists('getIconInfo')) {
     /**
      * @param array $_style
      * @return array
@@ -478,7 +478,7 @@ 
     }
 }
 
-if(!function_exists('getNodeTitle')) {
+if (!function_exists('getNodeTitle')) {
     /**
      * @param string $nodeNameSource
      * @param array $row
@@ -499,7 +499,7 @@ 
                         $nodetitle .= $modx->getConfig('friendly_url_suffix');
                     }
                 }
-                $nodetitle = $modx->getConfig('friendly_url_prefix') . $nodetitle;
+                $nodetitle = $modx->getConfig('friendly_url_prefix').$nodetitle;
                 break;
             case 'pagetitle':
                 $nodetitle = $row['pagetitle'];
@@ -533,7 +533,7 @@ 
     }
 }
 
-if(!function_exists('isDateNode')) {
+if (!function_exists('isDateNode')) {
     /**
      * @param string $nodeNameSource
      * @return bool
@@ -553,7 +553,7 @@ 
     }
 }
 
-if(!function_exists('checkIsFolder')) {
+if (!function_exists('checkIsFolder')) {
     /**
      * @param int $parent
      * @param int $isfolder
@@ -563,11 +563,11 @@ 
     {
         $modx = evolutionCMS();
 
-        return (int)$modx->getDatabase()->getValue($modx->getDatabase()->query('SELECT count(*) FROM ' . $modx->getDatabase()->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
+        return (int) $modx->getDatabase()->getValue($modx->getDatabase()->query('SELECT count(*) FROM '.$modx->getDatabase()->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' '));
     }
 }
 
-if(!function_exists('_htmlentities')) {
+if (!function_exists('_htmlentities')) {
     /**
      * @param mixed $array
      * @return string
@@ -583,7 +583,7 @@ 
     }
 }
 
-if(!function_exists('getTplSingleNode')) {
+if (!function_exists('getTplSingleNode')) {
     /**
      * @return string
      */
@@ -613,7 +613,7 @@ 
     }
 }
 
-if(!function_exists('getTplFolderNode')) {
+if (!function_exists('getTplFolderNode')) {
     /**
      * @return string
      */
@@ -654,7 +654,7 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
     }
 }
-if(!function_exists('getTplFolderNodeNotChildren')) {
+if (!function_exists('getTplFolderNodeNotChildren')) {
     /**
      * @return string
      */

core/functions/helper.php

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (! function_exists('createGUID')) {
+if (!function_exists('createGUID')) {
     /**
      * create globally unique identifiers (guid)
      *
@@ -8,16 +8,16 @@ 
      */
     function createGUID()
     {
-        srand((double)microtime() * 1000000);
+        srand((double) microtime() * 1000000);
         $r = rand();
-        $u = uniqid(getmypid() . $r . (double)microtime() * 1000000, 1);
+        $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
         $m = md5($u);
 
         return $m;
     }
 }
 
-if (! function_exists('generate_password')) {
+if (!function_exists('generate_password')) {
     /**
      * Generate password
      *
@@ -28,7 +28,7 @@ 
     {
         $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
         $ps_len = strlen($allowable_characters);
-        mt_srand((double)microtime() * 1000000);
+        mt_srand((double) microtime() * 1000000);
         $pass = "";
         for ($i = 0; $i < $length; $i++) {
             $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
@@ -50,7 +50,7 @@ 
     }
 }
 
-if (! function_exists('html_escape')) {
+if (!function_exists('html_escape')) {
     /**
      * @param $str
      * @param string $charset
@@ -63,7 +63,7 @@ 
     }
 }
 
-if (! function_exists('get_by_key')) {
+if (!function_exists('get_by_key')) {
     /**
      * @param mixed $data
      * @param string|int $key
@@ -102,7 +102,7 @@ 
                 }
             }
         }
-        if ($found === true && ! empty($validate) && \is_callable($validate)) {
+        if ($found === true && !empty($validate) && \is_callable($validate)) {
             $out = (($validate($out) === true) ? $out : $default);
         }
 
@@ -110,14 +110,14 @@ 
     }
 }
 
-if (! function_exists('is_cli')) {
+if (!function_exists('is_cli')) {
     function is_cli()
     {
         return php_sapi_name() === 'cli' || php_sapi_name() === 'phpdbg';
     }
 }
 
-if (! function_exists('nicesize')) {
+if (!function_exists('nicesize')) {
     /**
      * @param $size
      * @return string
@@ -128,7 +128,7 @@ 
         $precisions = count($sizes) - 1;
         foreach ($sizes as $unit => $bytes) {
             if ($size >= $bytes) {
-                return number_format($size / $bytes, $precisions) . ' ' . $unit;
+                return number_format($size / $bytes, $precisions).' '.$unit;
             }
             $precisions--;
         }
@@ -137,7 +137,7 @@ 
     }
 }
 
-if (! function_exists('data_is_json')) {
+if (!function_exists('data_is_json')) {
     /**
      * @param $string
      * @param bool $returnData
@@ -151,7 +151,7 @@ 
     }
 }
 
-if (! function_exists('is_ajax')) {
+if (!function_exists('is_ajax')) {
     /**
      * @return bool
      */

core/functions/rss.php

Spacing +8 added lines, -8 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if (! function_exists('fetchRssChannelItems')) {
+if (!function_exists('fetchRssChannelItems')) {
     function fetchRssChannelItems($url)
     {
         $items = [];
-        $file = evolutionCMS()->getCachePath() . 'rss/' . md5($url);
+        $file = evolutionCMS()->getCachePath().'rss/'.md5($url);
         $loadPath = file_exists($file) ? $file : $url;
         $content = file_get_contents($loadPath);
 
@@ -27,7 +27,7 @@ 
             }
 
             if (!empty($items) && $loadPath !== $file) {
-                if(! is_dir(dirname($file))) {
+                if (!is_dir(dirname($file))) {
                     mkdir(dirname($file));
                 }
                 file_put_contents($file, $content);
@@ -38,7 +38,7 @@ 
     }
 }
 
-if (! function_exists('rel2abs')) {
+if (!function_exists('rel2abs')) {
     /**
      * Convert relative path into absolute url
      *
@@ -52,7 +52,7 @@ 
         $tmp = parse_url($base);
         extract($tmp);
         if (strpos($rel, "//") === 0) {
-            return $scheme . ':' . $rel;
+            return $scheme.':'.$rel;
         }
         // return if already absolute URL
         if (parse_url($rel, PHP_URL_SCHEME) != '') {
@@ -60,7 +60,7 @@ 
         }
         // queries and anchors
         if ($rel[0] == '#' || $rel[0] == '?') {
-            return $base . $rel;
+            return $base.$rel;
         }
         // remove non-directory element from path
         $path = preg_replace('#/[^/]*$#', '', $path);
@@ -69,12 +69,12 @@ 
             $path = '';
         }
         // dirty absolute URL
-        $abs = $host . $path . "/" . $rel;
+        $abs = $host.$path."/".$rel;
         // replace '//' or  '/./' or '/foo/../' with '/'
         $abs = preg_replace("/(\/\.?\/)/", "/", $abs);
         $abs = preg_replace("/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs);
 
         // absolute URL is ready!
-        return $scheme . '://' . $abs;
+        return $scheme.'://'.$abs;
     }
 }

core/functions/actions/search.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!function_exists('highlightingCoincidence')) {
+if (!function_exists('highlightingCoincidence')) {
     /**
      * @param string $text
      * @param string $search
@@ -8,19 +8,19 @@ 
      */
     function highlightingCoincidence($text, $search)
     {
-        $regexp = '!(' . str_replace(array(
+        $regexp = '!('.str_replace(array(
                 '(',
                 ')'
             ), array(
                 '\(',
                 '\)'
-            ), entities(trim($search), evolutionCMS()->getConfig('modx_charset'))) . ')!isu';
+            ), entities(trim($search), evolutionCMS()->getConfig('modx_charset'))).')!isu';
 
         return preg_replace($regexp, '<span class="text-danger">$1</span>', entities($text, evolutionCMS()->getConfig('modx_charset')));
     }
 }
 
-if(!function_exists('addClassForItemList')) {
+if (!function_exists('addClassForItemList')) {
     /**
      * @param string $locked
      * @param string $disabled
@@ -40,7 +40,7 @@ 
             $class .= ' deleted';
         }
         if ($class) {
-            $class = ' class="' . trim($class) . '"';
+            $class = ' class="'.trim($class).'"';
         }
 
         return $class;

core/functions/actions/help.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!function_exists('createList')) {
+if (!function_exists('createList')) {
     /**
      * @param string $sectionHeader
      * @param array $linkArr
@@ -7,8 +7,8 @@ 
      */
     function createList($sectionHeader, $linkArr)
     {
-        $output = '<div class="sectionHeader">' . $sectionHeader . '</div><div class="sectionBody">' . "\n";
-        $output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">' . "\n";
+        $output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
+        $output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
         $links = '';
         foreach ($linkArr as $row) {
             if (!is_array($row['link'])) {
@@ -16,16 +16,16 @@ 
             }
             foreach ($row['link'] as $link) {
                 $links .= $links != '' ? '<br/>' : '';
-                $links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';
+                $links .= '<a href="'.$link.'" target="_blank">'.$link.'</a>';
             }
             $output .= '
 		<tr>
-			<td align="left"><strong>' . $row["title"] . '</strong></td>
-			<td align="left">' . $links . '</td>
+			<td align="left"><strong>' . $row["title"].'</strong></td>
+			<td align="left">' . $links.'</td>
 		</tr>';
             $links = '';
         }
-        $output .= '</table></div>' . "\n";
+        $output .= '</table></div>'."\n";
 
         return $output;
     }