evolution-cms / evolution

install/src/sqlParser.class.php

Indentation +122 added lines, -122 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() {
-		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
-		mysqli_select_db($this->conn, $this->dbname);
-		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
+    public function connect() {
+        $this->conn = mysqli_connect($this->host, $this->user, $this->password);
+        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]
-		}
+        $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);
-		$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;
-			}
-		}
-	}
+        }
+
+        // replace {} tags
+        $idata = str_replace('{PREFIX}', $this->prefix, $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;
+            }
+        }
+    }
 
     public function close() {
-		mysqli_close($this->conn);
-	}
+        mysqli_close($this->conn);
+    }
 }

Spacing +20 added lines, -20 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,28 +44,28 @@ 
         $this->autoTemplateLogic = $auto_template_logic;
 	}
 
-	public function connect() {
+	public function connect(){
 		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
 		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;
 		}
 
@@ -82,10 +82,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);
             }
 		}
 
@@ -102,7 +102,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);
 			}
@@ -111,14 +111,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);
 			}
@@ -126,10 +126,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);
@@ -138,7 +138,7 @@ 
 		}
 	}
 
-    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,10 +46,13 @@ 
         $this->autoTemplateLogic = $auto_template_logic;
 	}
 
-	public function connect() {
+	public function connect()
+	{
 		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
 		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")) {
@@ -59,7 +64,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
@@ -114,7 +120,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) {
@@ -125,11 +133,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);
@@ -138,7 +150,8 @@ 
 		}
 	}
 
-    public function close() {
+    public function close()
+    {
 		mysqli_close($this->conn);
 	}
 }

install/src/lang.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     'sv' => 'svenska'
 );
 $_langISO6391 = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
-if (! empty($_langFiles[$_langISO6391])) {
+if (!empty($_langFiles[$_langISO6391])) {
     $install_language = $_langFiles[$_langISO6391];
 }
 
@@ -51,7 +51,7 @@ 
 }
 # load language file
 require_once 'lang/english.inc.php'; // As fallback
-require_once 'lang/' . $install_language . '.inc.php';
+require_once 'lang/'.$install_language.'.inc.php';
 
 $manager_language = $install_language;
 

install/src/lang/russian-UTF8.inc.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  *
  * Please commit your language changes on Transifex (https://www.transifex.com/projects/p/modx-evolution/) or on GitHub (https://github.com/modxcms/evolution).
  */
-setlocale (LC_ALL, 'ru_RU.UTF-8');
+setlocale(LC_ALL, 'ru_RU.UTF-8');
 $_lang["agree_to_terms"] = 'Согласиться с условиями лицензии и приступить к установке';
 $_lang["alert_database_test_connection"] = 'Вы должны создать базу данных или выбрать базу данных для проверки!';
 $_lang["alert_database_test_connection_failed"] = 'Неудачная проверка выбранной базы данных!';

install/src/processor/result.php

Spacing +13 added lines, -14 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 //:: EVO Installer Setup file
 //:::::::::::::::::::::::::::::::::::::::::
-if (is_file($base_path . 'assets/cache/siteManager.php')) {
-    include_once($base_path . 'assets/cache/siteManager.php');
+if (is_file($base_path.'assets/cache/siteManager.php')) {
+    include_once($base_path.'assets/cache/siteManager.php');
 }
 if (!defined('MGR_DIR')) {
     define('MGR_DIR', 'manager');
 }
 
-require_once(dirname(dirname(dirname(__DIR__))) . '/' . MGR_DIR . '/includes/version.inc.php');
+require_once(dirname(dirname(dirname(__DIR__))).'/'.MGR_DIR.'/includes/version.inc.php');
 
-$chunkPath = $base_path . 'install/assets/chunks';
-$snippetPath = $base_path . 'install/assets/snippets';
-$pluginPath = $base_path . 'install/assets/plugins';
-$modulePath = $base_path . 'install/assets/modules';
-$templatePath = $base_path . 'install/assets/templates';
-$tvPath = $base_path . 'install/assets/tvs';
+$chunkPath = $base_path.'install/assets/chunks';
+$snippetPath = $base_path.'install/assets/snippets';
+$pluginPath = $base_path.'install/assets/plugins';
+$modulePath = $base_path.'install/assets/modules';
+$templatePath = $base_path.'install/assets/templates';
+$tvPath = $base_path.'install/assets/tvs';
 
 // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category
 $mt = &$moduleTemplates;
@@ -28,8 +28,7 @@ 
         $params = parse_docblock($templatePath, $tplfile);
         if (is_array($params) && (count($params) > 0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
-            $mt[] = array
-            (
+            $mt[] = array(
                 $params['name'],
                 $description,
                 // Don't think this is gonna be used ... but adding it just in case 'type'
@@ -149,7 +148,7 @@ 
                 $params['modx_category'],
                 $params['legacy_names'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false,
-                (int)$params['disabled']
+                (int) $params['disabled']
             );
         }
     }
@@ -174,12 +173,12 @@ 
                 "$modulePath/{$params['filename']}",
                 $params['properties'],
                 $params['guid'],
-                (int)$params['shareparams'],
+                (int) $params['shareparams'],
                 $params['modx_category'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-        if ((int)$params['shareparams'] || !empty($params['dependencies'])) {
+        if ((int) $params['shareparams'] || !empty($params['dependencies'])) {
             $dependencies = explode(',', $params['dependencies']);
             foreach ($dependencies as $dependency) {
                 $dependency = explode(':', $dependency);

manager/includes/functions/tv.php

Doc Comments +3 added lines, -3 removed lines

@@ -172,7 +172,7 @@ 
      *
      * @param string $param
      * @param array $tvsArray
-     * @return mixed
+     * @return string
      */
     function parseTvValues($param, $tvsArray)
     {
@@ -566,7 +566,7 @@ 
     /**
      * returns an array if a delimiter is present. returns array is a recordset is present
      *
-     * @param $src
+     * @param string $src
      * @param string $delim
      * @param string $type
      * @param bool $columns
@@ -1022,7 +1022,7 @@ 
 
 if (! function_exists('ParseIntputOptions')) {
     /**
-     * @param string|array|mysqli_result $v
+     * @param string $v
      * @return array
      */
     function ParseIntputOptions($v)

Spacing +76 added lines, -76 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (! function_exists('ProcessTVCommand')) {
+if (!function_exists('ProcessTVCommand')) {
     /**
      * @param string $value
      * @param string $name
@@ -12,7 +12,7 @@ 
     function ProcessTVCommand($value, $name = '', $docid = '', $src = 'docform', $tvsArray = array())
     {
         $modx = evolutionCMS();
-        $docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
+        $docid = (int) $docid > 0 ? (int) $docid : $modx->documentIdentifier;
         $nvalue = trim($value);
         if (substr($nvalue, 0, 1) != '@') {
             return $value;
@@ -77,8 +77,8 @@ 
                         // if an inherited value is found and if there is content following the @INHERIT binding
                         // remove @INHERIT and output that following content. This content could contain other
                         // @ bindings, that are processed in the next step
-                        if ((string)$tv['value'] !== '' && !preg_match('%^@INHERIT[\s\n\r]*$%im', $tv['value'])) {
-                            $output = trim(str_replace('@INHERIT', '', (string)$tv['value']));
+                        if ((string) $tv['value'] !== '' && !preg_match('%^@INHERIT[\s\n\r]*$%im', $tv['value'])) {
+                            $output = trim(str_replace('@INHERIT', '', (string) $tv['value']));
                             break 2;
                         }
                     }
@@ -86,7 +86,7 @@ 
 
                 case 'DIRECTORY' :
                     $files = array();
-                    $path = $modx->config['base_path'] . $param;
+                    $path = $modx->config['base_path'].$param;
                     if (substr($path, -1, 1) != '/') {
                         $path .= '/';
                     }
@@ -117,7 +117,7 @@ 
     }
 }
 
-if (! function_exists('ProcessFile')) {
+if (!function_exists('ProcessFile')) {
     /**
      * @param $file
      * @return string
@@ -134,7 +134,7 @@ 
     }
 }
 
-if (! function_exists('ParseCommand')) {
+if (!function_exists('ParseCommand')) {
     /**
      * ParseCommand - separate @ cmd from params
      *
@@ -155,7 +155,7 @@ 
 
         $binding_array = array();
         foreach ($BINDINGS as $cmd) {
-            if (strpos($binding_string, '@' . $cmd) === 0) {
+            if (strpos($binding_string, '@'.$cmd) === 0) {
                 $code = substr($binding_string, strlen($cmd) + 1);
                 $binding_array = array($cmd, trim($code));
                 break;
@@ -166,7 +166,7 @@ 
     }
 }
 
-if (! function_exists('parseTvValues')) {
+if (!function_exists('parseTvValues')) {
     /**
      * Parse MODX Template-Variables
      *
@@ -197,7 +197,7 @@ 
     }
 }
 
-if (! function_exists('getTVDisplayFormat')) {
+if (!function_exists('getTVDisplayFormat')) {
     /**
      * @param string $name
      * @param string $value
@@ -215,7 +215,7 @@ 
         $o = '';
 
         // process any TV commands in value
-        $docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
+        $docid = (int) $docid > 0 ? (int) $docid : $modx->documentIdentifier;
         $value = ProcessTVCommand($value, $name, $docid);
 
         $params = array();
@@ -254,12 +254,12 @@ 
                             $attr['align'] = $params['align'];
                         }
                         foreach ($attr as $k => $v) {
-                            $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                            $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
                         }
-                        $attributes .= ' ' . $params['attrib'];
+                        $attributes .= ' '.$params['attrib'];
 
                         // Output the image with attributes
-                        $o .= '<img' . rtrim($attributes) . ' />';
+                        $o .= '<img'.rtrim($attributes).' />';
                     }
                 }
                 break;
@@ -331,12 +331,12 @@ 
                             'target' => $params['target'],
                         );
                         foreach ($attr as $k => $v) {
-                            $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                            $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
                         }
-                        $attributes .= ' ' . $params['attrib']; // add extra
+                        $attributes .= ' '.$params['attrib']; // add extra
 
                         // Output the link
-                        $o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->getPhpCompat()->htmlspecialchars($params['text']) : $name) . '</a>';
+                        $o .= '<a'.rtrim($attributes).'>'.($params['text'] ? $modx->getPhpCompat()->htmlspecialchars($params['text']) : $name).'</a>';
                     }
                 }
                 break;
@@ -362,12 +362,12 @@ 
                         'style' => $params['style'],
                     );
                     foreach ($attr as $k => $v) {
-                        $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                        $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
                     }
-                    $attributes .= ' ' . $params['attrib']; // add extra
+                    $attributes .= ' '.$params['attrib']; // add extra
 
                     // Output the HTML Tag
-                    $o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+                    $o .= '<'.$tagname.rtrim($attributes).'>'.$tagvalue.'</'.$tagname.'>';
                 }
                 break;
 
@@ -376,7 +376,7 @@ 
                 $w = $params['w'] ? $params['w'] : '100%';
                 $h = $params['h'] ? $params['h'] : '400px';
                 $richtexteditor = $params['edt'] ? $params['edt'] : "";
-                $o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
+                $o = '<div class="MODX_RichTextWidget"><textarea id="'.$id.'" name="'.$id.'" style="width:'.$w.'; height:'.$h.';">';
                 $o .= $modx->getPhpCompat()->htmlspecialchars($value);
                 $o .= '</textarea></div>';
                 $replace_richtext = array($id);
@@ -403,7 +403,7 @@ 
 
             case "viewport":
                 $value = parseInput($value);
-                $id = '_' . time();
+                $id = '_'.time();
                 if (!$params['vpid']) {
                     $params['vpid'] = $id;
                 }
@@ -417,41 +417,41 @@ 
                     $h = "100%";
                 }
                 if ($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-                    $autoMode = "3";  //both
+                    $autoMode = "3"; //both
                 } else {
                     if ($params['awidth'] == 'Yes') {
                         $autoMode = "1"; //width only
                     } else {
                         if ($params['aheight'] == 'Yes') {
-                            $autoMode = "2";    //height only
+                            $autoMode = "2"; //height only
                         }
                     }
                 }
 
-                $modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
+                $modx->regClientStartupScript(MODX_MANAGER_URL."media/script/bin/viewport.js", array(
                     'name'      => 'viewport',
                     'version'   => '0',
                     'plaintext' => false
                 ));
-                $o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
+                $o = $sTag." id='".$params['vpid']."' name='".$params['vpid']."' ";
                 if ($params['class']) {
-                    $o .= " class='" . $params['class'] . "' ";
+                    $o .= " class='".$params['class']."' ";
                 }
                 if ($params['style']) {
-                    $o .= " style='" . $params['style'] . "' ";
+                    $o .= " style='".$params['style']."' ";
                 }
                 if ($params['attrib']) {
-                    $o .= $params['attrib'] . " ";
+                    $o .= $params['attrib']." ";
                 }
-                $o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
-                $o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
-                $o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
+                $o .= "scrolling='".($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto"))."' ";
+                $o .= "src='".$value."' frameborder='".$params['borsize']."' ";
+                $o .= "onload=\"window.setTimeout('ResizeViewPort(\\'".$params['vpid']."\\',".$autoMode.")',100);\" width='".$w."' height='".$h."' ";
                 $o .= ">";
                 $o .= $eTag;
                 break;
 
             case "datagrid":
-                include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
                 $grd = new DataGrid('', $value);
 
                 $grd->noRecordMsg = $params['egmsg'];
@@ -498,16 +498,16 @@ 
                 $o = '';
                 /* If we are loading a file */
                 if (substr($params['output'], 0, 5) == "@FILE") {
-                    $file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
+                    $file_name = MODX_BASE_PATH.trim(substr($params['output'], 6));
                     if (!file_exists($file_name)) {
-                        $widget_output = $file_name . ' does not exist';
+                        $widget_output = $file_name.' does not exist';
                     } else {
                         $widget_output = file_get_contents($file_name);
                     }
                 } elseif (substr($params['output'], 0, 8) == '@INCLUDE') {
-                    $file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
+                    $file_name = MODX_BASE_PATH.trim(substr($params['output'], 9));
                     if (!file_exists($file_name)) {
-                        $widget_output = $file_name . ' does not exist';
+                        $widget_output = $file_name.' does not exist';
                     } else {
                         /* The included file needs to set $widget_output. Can be string, array, object */
                         include $file_name;
@@ -549,7 +549,7 @@ 
     }
 }
 
-if (! function_exists('decodeParamValue')) {
+if (!function_exists('decodeParamValue')) {
     /**
      * @param string $s
      * @return string
@@ -562,7 +562,7 @@ 
     }
 }
 
-if (! function_exists('parseInput')) {
+if (!function_exists('parseInput')) {
     /**
      * returns an array if a delimiter is present. returns array is a recordset is present
      *
@@ -594,7 +594,7 @@ 
     }
 }
 
-if (! function_exists('getUnixtimeFromDateString')) {
+if (!function_exists('getUnixtimeFromDateString')) {
     /**
      * @param string $value
      * @return bool|false|int
@@ -622,7 +622,7 @@ 
     }
 }
 
-if (! function_exists('renderFormElement')) {
+if (!function_exists('renderFormElement')) {
     /**
      * DISPLAY FORM ELEMENTS
      *
@@ -645,7 +645,7 @@ 
         $field_style = '',
         $row = array(),
         $tvsArray = array()
-    ) {
+    ){
         $modx = evolutionCMS();
         global $_style;
         global $_lang;
@@ -665,22 +665,22 @@ 
 
                 case "text": // handler for regular text boxes
                 case "rawtext"; // non-htmlentity converted text boxes
-                    $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->getPhpCompat()->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" />';
+                    $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->getPhpCompat()->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%" />';
                     break;
                 case "email": // handles email input fields
-                    $field_html .= '<input type="email" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->getPhpCompat()->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%"/>';
+                    $field_html .= '<input type="email" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->getPhpCompat()->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%"/>';
                     break;
                 case "number": // handles the input of numbers
-                    $field_html .= '<input type="number" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->getPhpCompat()->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
+                    $field_html .= '<input type="number" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->getPhpCompat()->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
                     break;
                 case "textareamini": // handler for textarea mini boxes
-                    $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">' . $modx->getPhpCompat()->htmlspecialchars($field_value) . '</textarea>';
+                    $field_html .= '<textarea id="tv'.$field_id.'" name="tv'.$field_id.'" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">'.$modx->getPhpCompat()->htmlspecialchars($field_value).'</textarea>';
                     break;
                 case "textarea": // handler for textarea boxes
                 case "rawtextarea": // non-htmlentity convertex textarea boxes
                 case "htmlarea": // handler for textarea boxes (deprecated)
                 case "richtext": // handler for textarea boxes
-                    $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">' . $modx->getPhpCompat()->htmlspecialchars($field_value) . '</textarea>';
+                    $field_html .= '<textarea id="tv'.$field_id.'" name="tv'.$field_id.'" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">'.$modx->getPhpCompat()->htmlspecialchars($field_value).'</textarea>';
                     break;
                 case "date":
                     $field_id = str_replace(array(
@@ -690,12 +690,12 @@ 
                     if ($field_value == '') {
                         $field_value = 0;
                     }
-                    $field_html .= '<input id="tv' . $field_id . '" name="tv' . $field_id . '" class="DatePicker" type="text" value="' . ($field_value == 0 || !isset($field_value) ? "" : $field_value) . '" onblur="documentDirty=true;" />';
-                    $field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].value=\'\';document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="' . $_style["actions_calendar_delete"] . '"></i></a>';
+                    $field_html .= '<input id="tv'.$field_id.'" name="tv'.$field_id.'" class="DatePicker" type="text" value="'.($field_value == 0 || !isset($field_value) ? "" : $field_value).'" onblur="documentDirty=true;" />';
+                    $field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv'.$field_id.'\'].value=\'\';document.forms[\'mutate\'].elements[\'tv'.$field_id.'\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="'.$_style["actions_calendar_delete"].'"></i></a>';
 
                     break;
                 case "dropdown": // handler for select boxes
-                    $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
+                    $field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'" size="1" onchange="documentDirty=true;">';
                     $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform',
                         $tvsArray));
                     while (list($item, $itemvalue) = each($index_list)) {
@@ -703,12 +703,12 @@ 
                         if (strlen($itemvalue) == 0) {
                             $itemvalue = $item;
                         }
-                        $field_html .= '<option value="' . $modx->getPhpCompat()->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->getPhpCompat()->htmlspecialchars($item) . '</option>';
+                        $field_html .= '<option value="'.$modx->getPhpCompat()->htmlspecialchars($itemvalue).'"'.($itemvalue == $field_value ? ' selected="selected"' : '').'>'.$modx->getPhpCompat()->htmlspecialchars($item).'</option>';
                     }
                     $field_html .= "</select>";
                     break;
                 case "listbox": // handler for select boxes
-                    $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
+                    $field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'" onchange="documentDirty=true;" size="8">';
                     $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform',
                         $tvsArray));
                     while (list($item, $itemvalue) = each($index_list)) {
@@ -716,13 +716,13 @@ 
                         if (strlen($itemvalue) == 0) {
                             $itemvalue = $item;
                         }
-                        $field_html .= '<option value="' . $modx->getPhpCompat()->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->getPhpCompat()->htmlspecialchars($item) . '</option>';
+                        $field_html .= '<option value="'.$modx->getPhpCompat()->htmlspecialchars($itemvalue).'"'.($itemvalue == $field_value ? ' selected="selected"' : '').'>'.$modx->getPhpCompat()->htmlspecialchars($item).'</option>';
                     }
                     $field_html .= "</select>";
                     break;
                 case "listbox-multiple": // handler for select boxes where you can choose multiple items
                     $field_value = explode("||", $field_value);
-                    $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
+                    $field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
                     $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform',
                         $tvsArray));
                     while (list($item, $itemvalue) = each($index_list)) {
@@ -730,8 +730,8 @@ 
                         if (strlen($itemvalue) == 0) {
                             $itemvalue = $item;
                         }
-                        $field_html .= '<option value="' . $modx->getPhpCompat()->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue,
-                                $field_value) ? ' selected="selected"' : '') . '>' . $modx->getPhpCompat()->htmlspecialchars($item) . '</option>';
+                        $field_html .= '<option value="'.$modx->getPhpCompat()->htmlspecialchars($itemvalue).'"'.(in_array($itemvalue,
+                                $field_value) ? ' selected="selected"' : '').'>'.$modx->getPhpCompat()->htmlspecialchars($item).'</option>';
                     }
                     $field_html .= "</select>";
                     break;
@@ -743,17 +743,17 @@ 
                         'ftp://'   => 'ftp://',
                         'mailto:'  => 'mailto:'
                     );
-                    $field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv' . $field_id . '_prefix" name="tv' . $field_id . '_prefix" onchange="documentDirty=true;">';
+                    $field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv'.$field_id.'_prefix" name="tv'.$field_id.'_prefix" onchange="documentDirty=true;">';
                     foreach ($urls as $k => $v) {
                         if (strpos($field_value, $v) === false) {
-                            $field_html .= '<option value="' . $v . '">' . $k . '</option>';
+                            $field_html .= '<option value="'.$v.'">'.$k.'</option>';
                         } else {
                             $field_value = str_replace($v, '', $field_value);
-                            $field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
+                            $field_html .= '<option value="'.$v.'" selected="selected">'.$k.'</option>';
                         }
                     }
                     $field_html .= '</select></td><td>';
-                    $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->getPhpCompat()->htmlspecialchars($field_value) . '" width="100" ' . $field_style . ' onchange="documentDirty=true;" /></td></tr></table>';
+                    $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->getPhpCompat()->htmlspecialchars($field_value).'" width="100" '.$field_style.' onchange="documentDirty=true;" /></td></tr></table>';
                     break;
                 case 'checkbox': // handles check boxes
                     $values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
@@ -795,7 +795,7 @@ 
                         if (strlen($itemvalue) == 0) {
                             $itemvalue = $item;
                         }
-                        $field_html .= '<input type="radio" value="' . $modx->getPhpCompat()->htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '" ' . ($itemvalue == $field_value ? 'checked="checked"' : '') . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '" class="radio">' . $item . '</label><br />';
+                        $field_html .= '<input type="radio" value="'.$modx->getPhpCompat()->htmlspecialchars($itemvalue).'" id="tv_'.$i.'" name="tv'.$field_id.'" '.($itemvalue == $field_value ? 'checked="checked"' : '').' onchange="documentDirty=true;" /><label for="tv_'.$i.'" class="radio">'.$item.'</label><br />';
                         $i++;
                     }
                     break;
@@ -825,13 +825,13 @@ 
 									lastImageCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=images', w, h);
+									OpenServerBrowser('" . MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=images', w, h);
 								}
 								function BrowseFileServer(ctrl) {
 									lastFileCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=files', w, h);
+									OpenServerBrowser('".MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=files', w, h);
 								}
 								function SetUrlChange(el) {
 									if ('createEvent' in document) {
@@ -865,7 +865,7 @@ 
 						</script>";
                         $ResourceManagerLoaded = true;
                     }
-                    $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseServer(\'tv' . $field_id . '\')" />';
+                    $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'"  value="'.$field_value.'" '.$field_style.' onchange="documentDirty=true;" /><input type="button" value="'.$_lang['insert'].'" onclick="BrowseServer(\'tv'.$field_id.'\')" />';
                     break;
                 case "file": // handles the input of file uploads
                     /* Modified by Timon for use with resource browser */
@@ -895,13 +895,13 @@ 
 									lastImageCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=images', w, h);
+									OpenServerBrowser('" . MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=images', w, h);
 								}
 								function BrowseFileServer(ctrl) {
 									lastFileCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=files', w, h);
+									OpenServerBrowser('".MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=files', w, h);
 								}
 								function SetUrlChange(el) {
 									if ('createEvent' in document) {
@@ -935,7 +935,7 @@ 
 						</script>";
                         $ResourceManagerLoaded = true;
                     }
-                    $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseFileServer(\'tv' . $field_id . '\')" />';
+                    $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'"  value="'.$field_value.'" '.$field_style.' onchange="documentDirty=true;" /><input type="button" value="'.$_lang['insert'].'" onclick="BrowseFileServer(\'tv'.$field_id.'\')" />';
 
                     break;
 
@@ -943,16 +943,16 @@ 
                     $custom_output = '';
                     /* If we are loading a file */
                     if (substr($field_elements, 0, 5) == "@FILE") {
-                        $file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
+                        $file_name = MODX_BASE_PATH.trim(substr($field_elements, 6));
                         if (!file_exists($file_name)) {
-                            $custom_output = $file_name . ' does not exist';
+                            $custom_output = $file_name.' does not exist';
                         } else {
                             $custom_output = file_get_contents($file_name);
                         }
                     } elseif (substr($field_elements, 0, 8) == '@INCLUDE') {
-                        $file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
+                        $file_name = MODX_BASE_PATH.trim(substr($field_elements, 9));
                         if (!file_exists($file_name)) {
-                            $custom_output = $file_name . ' does not exist';
+                            $custom_output = $file_name.' does not exist';
                         } else {
                             ob_start();
                             include $file_name;
@@ -963,7 +963,7 @@ 
                         $chunk_name = trim(substr($field_elements, 7));
                         $chunk_body = $modx->getChunk($chunk_name);
                         if ($chunk_body == false) {
-                            $custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
+                            $custom_output = $_lang['chunk_no_exist'].'('.$_lang['htmlsnippet_name'].':'.$chunk_name.')';
                         } else {
                             $custom_output = $chunk_body;
                         }
@@ -988,15 +988,15 @@ 
                     break;
 
                 default: // the default handler -- for errors, mostly
-                    $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->getPhpCompat()->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
+                    $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->getPhpCompat()->htmlspecialchars($field_value).'" '.$field_style.' onchange="documentDirty=true;" />';
 
             } // end switch statement
         } else {
             $custom = explode(":", $field_type);
             $custom_output = '';
-            $file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
+            $file_name = MODX_BASE_PATH.'assets/tvs/'.$custom['1'].'/'.$custom['1'].'.customtv.php';
             if (!file_exists($file_name)) {
-                $custom_output = $file_name . ' does not exist';
+                $custom_output = $file_name.' does not exist';
             } else {
                 ob_start();
                 include $file_name;
@@ -1020,7 +1020,7 @@ 
     } // end renderFormElement function
 }
 
-if (! function_exists('ParseIntputOptions')) {
+if (!function_exists('ParseIntputOptions')) {
     /**
      * @param string|array|mysqli_result $v
      * @return array

Braces +2 added lines, -1 removed lines

@@ -573,7 +573,8 @@
      * @return array|string
      */
     function parseInput($src, $delim = "||", $type = "string", $columns = true)
-    { // type can be: string, array
+    {
+// type can be: string, array
         $modx = evolutionCMS();
         if ($modx->getDatabase()->isResult($src)) {
             // must be a recordset

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

@@ -51,7 +51,7 @@
                         $modx->setPlaceholder($rvKey, $rvValue);
                     }
                     $param = $modx->mergePlaceholderContent($param);
-                    $rs = $modx->getDatabase()->query("SELECT $param;");
+                    $rs = $modx->getDatabase()->query("select $param;");
                     $output = $rs;
                     break;
 

manager/includes/src/Cache.php

Doc Comments +1 added lines, -1 removed lines

@@ -237,7 +237,7 @@
     /**
      * build siteCache file
      * @param DocumentParser $modx
-     * @return boolean success
+     * @return null|boolean success
      */
     public function buildCache($modx)
     {

Braces +4 added lines, -2 removed lines

@@ -79,7 +79,8 @@ 
      * @return string
      */
     public function getParents($id, $path = '')
-    { // modx:returns child's parent
+    {
+// modx:returns child's parent
         $modx = evolutionCMS();
         if (empty($this->aliases)) {
             $f = "id, IF(alias='', id, alias) AS alias, parent, alias_visible";
@@ -456,7 +457,8 @@ 
                         $_ = trim($_);
                     }
                     $lastChar = substr($_, -1);
-                    if (!in_array($lastChar, $chars)) {// ,320,327,288,284,289
+                    if (!in_array($lastChar, $chars)) {
+// ,320,327,288,284,289
                         if (!in_array($prev_token,
                             array(T_FOREACH, T_WHILE, T_FOR, T_BOOLEAN_AND, T_BOOLEAN_OR, T_DOUBLE_ARROW))) {
                             $_ .= ' ';

Spacing +29 added lines, -29 removed lines

@@ -97,7 +97,7 @@ 
         if (isset($this->aliases[$id])) {
             if ($this->aliasVisible[$id] == 1) {
                 if ($path != '') {
-                    $path = $this->aliases[$id] . '/' . $path;
+                    $path = $this->aliases[$id].'/'.$path;
                 } else {
                     $path = $this->aliases[$id];
                 }
@@ -121,7 +121,7 @@ 
             $modx->messageQuit("Cache path not set.");
         }
 
-        $files = glob(realpath($this->cachePath) . '/*.pageCache.php');
+        $files = glob(realpath($this->cachePath).'/*.pageCache.php');
         $filesincache = count($files);
         $deletedfiles = array();
         while ($file = array_shift($files)) {
@@ -156,9 +156,9 @@ 
                 if (isset($opcache)) {
                     echo '<p>Opcache empty.</p>';
                 }
-                echo '<p>' . $_lang['cache_files_deleted'] . '</p><ul>';
+                echo '<p>'.$_lang['cache_files_deleted'].'</p><ul>';
                 foreach ($deletedfiles as $deletedfile) {
-                    echo '<li>' . $deletedfile . '</li>';
+                    echo '<li>'.$deletedfile.'</li>';
                 }
                 echo '</ul>';
             }
@@ -177,11 +177,11 @@ 
 
 
         // write the file
-        $content = '<?php' . "\n";
-        $content .= '$recent_update=\'' . $this->request_time . '\';' . "\n";
-        $content .= '$cacheRefreshTime=\'' . $cacheRefreshTime . '\';' . "\n";
+        $content = '<?php'."\n";
+        $content .= '$recent_update=\''.$this->request_time.'\';'."\n";
+        $content .= '$cacheRefreshTime=\''.$cacheRefreshTime.'\';'."\n";
 
-        $filename = $this->cachePath . '/sitePublishing.idx.php';
+        $filename = $this->cachePath.'/sitePublishing.idx.php';
         if (!$handle = fopen($filename, 'w')) {
             exit("Cannot open file ({$filename}");
         }
@@ -205,7 +205,7 @@ 
         $timesArr = array();
 
         $result = $modx->getDatabase()->select('MIN(pub_date) AS minpub', '[+prefix+]site_content',
-            'pub_date>' . $this->request_time);
+            'pub_date>'.$this->request_time);
         if (!$result) {
             echo "Couldn't determine next publish event!";
         }
@@ -216,7 +216,7 @@ 
         }
 
         $result = $modx->getDatabase()->select('MIN(unpub_date) AS minunpub', '[+prefix+]site_content',
-            'unpub_date>' . $this->request_time);
+            'unpub_date>'.$this->request_time);
         if (!$result) {
             echo "Couldn't determine next unpublish event!";
         }
@@ -255,7 +255,7 @@ 
         $config = array();
         $content .= '$c=&$this->config;';
         while (list($key, $value) = $modx->getDatabase()->getRow($rs, 'num')) {
-            $content .= '$c[\'' . $key . '\']="' . $this->escapeDoubleQuotes($value) . '";';
+            $content .= '$c[\''.$key.'\']="'.$this->escapeDoubleQuotes($value).'";';
             $config[$key] = $value;
         }
 
@@ -293,23 +293,23 @@ 
             $docid = $doc['id'];
             if ($use_alias_path) {
                 $tmpPath = $this->getParents($doc['parent']);
-                $alias = (strlen($tmpPath) > 0 ? "$tmpPath/" : '') . $doc['alias'];
+                $alias = (strlen($tmpPath) > 0 ? "$tmpPath/" : '').$doc['alias'];
                 $key = $alias;
             } else {
                 $key = $doc['alias'];
             }
 
             $doc['path'] = $tmpPath;
-            $content .= '$a[' . $docid . ']=array(\'id\'=>' . $docid . ',\'alias\'=>\'' . $doc['alias'] . '\',\'path\'=>\'' . $doc['path'] . '\',\'parent\'=>' . $doc['parent'] . ',\'isfolder\'=>' . $doc['isfolder'] . ',\'alias_visible\'=>' . $doc['alias_visible'] . ');';
-            $content .= '$d[\'' . $key . '\']=' . $docid . ';';
-            $content .= '$m[]=array(' . $doc['parent'] . '=>' . $docid . ');';
+            $content .= '$a['.$docid.']=array(\'id\'=>'.$docid.',\'alias\'=>\''.$doc['alias'].'\',\'path\'=>\''.$doc['path'].'\',\'parent\'=>'.$doc['parent'].',\'isfolder\'=>'.$doc['isfolder'].',\'alias_visible\'=>'.$doc['alias_visible'].');';
+            $content .= '$d[\''.$key.'\']='.$docid.';';
+            $content .= '$m[]=array('.$doc['parent'].'=>'.$docid.');';
         }
 
         // get content types
         $rs = $modx->getDatabase()->select('id, contentType', '[+prefix+]site_content', "contentType!='text/html'");
         $content .= '$c=&$this->contentTypes;';
         while ($doc = $modx->getDatabase()->getRow($rs)) {
-            $content .= '$c[\'' . $doc['id'] . '\']=\'' . $doc['contentType'] . '\';';
+            $content .= '$c[\''.$doc['id'].'\']=\''.$doc['contentType'].'\';';
         }
 
         // WRITE Chunks to cache file
@@ -319,7 +319,7 @@ 
             if ($modx->config['minifyphp_incache']) {
                 $doc['snippet'] = $this->php_strip_whitespace($doc['snippet']);
             }
-            $content .= '$c[\'' . $doc['name'] . '\']=\'' . ($doc['disabled'] ? '' : $this->escapeSingleQuotes($doc['snippet'])) . '\';';
+            $content .= '$c[\''.$doc['name'].'\']=\''.($doc['disabled'] ? '' : $this->escapeSingleQuotes($doc['snippet'])).'\';';
         }
 
         // WRITE snippets to cache file
@@ -330,18 +330,18 @@ 
         while ($row = $modx->getDatabase()->getRow($rs)) {
             $key = $row['name'];
             if ($row['disabled']) {
-                $content .= '$s[\'' . $key . '\']=\'return false;\';';
+                $content .= '$s[\''.$key.'\']=\'return false;\';';
             } else {
                 $value = trim($row['snippet']);
                 if ($modx->config['minifyphp_incache']) {
                     $value = $this->php_strip_whitespace($value);
                 }
-                $content .= '$s[\'' . $key . '\']=\'' . $this->escapeSingleQuotes($value) . '\';';
+                $content .= '$s[\''.$key.'\']=\''.$this->escapeSingleQuotes($value).'\';';
                 $properties = $modx->parseProperties($row['properties']);
                 $sharedproperties = $modx->parseProperties($row['sharedproperties']);
                 $properties = array_merge($sharedproperties, $properties);
                 if (0 < count($properties)) {
-                    $content .= '$s[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';';
+                    $content .= '$s[\''.$key.'Props\']=\''.$this->escapeSingleQuotes(json_encode($properties)).'\';';
                 }
             }
         }
@@ -359,13 +359,13 @@ 
             if ($modx->config['minifyphp_incache']) {
                 $value = $this->php_strip_whitespace($value);
             }
-            $content .= '$p[\'' . $key . '\']=\'' . $this->escapeSingleQuotes($value) . '\';';
+            $content .= '$p[\''.$key.'\']=\''.$this->escapeSingleQuotes($value).'\';';
             if ($row['properties'] != '' || $row['sharedproperties'] != '') {
                 $properties = $modx->parseProperties($row['properties']);
                 $sharedproperties = $modx->parseProperties($row['sharedproperties']);
                 $properties = array_merge($sharedproperties, $properties);
                 if (0 < count($properties)) {
-                    $content .= '$p[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';';
+                    $content .= '$p[\''.$key.'Props\']=\''.$this->escapeSingleQuotes(json_encode($properties)).'\';';
                 }
             }
         }
@@ -388,14 +388,14 @@ 
         }
         foreach ($events as $evtname => $pluginnames) {
             $events[$evtname] = $pluginnames;
-            $content .= '$e[\'' . $evtname . '\']=array(\'' . implode('\',\'',
-                    $this->escapeSingleQuotes($pluginnames)) . '\');';
+            $content .= '$e[\''.$evtname.'\']=array(\''.implode('\',\'',
+                    $this->escapeSingleQuotes($pluginnames)).'\');';
         }
 
         $content .= "\n";
 
         // close and write the file
-        $filename = $this->cachePath . 'siteCache.idx.php';
+        $filename = $this->cachePath.'siteCache.idx.php';
 
         // invoke OnBeforeCacheUpdate event
         if ($modx) {
@@ -406,8 +406,8 @@ 
             exit("Cannot write main MODX cache file! Make sure the assets/cache directory is writable!");
         }
 
-        if (!is_file($this->cachePath . '/.htaccess')) {
-            file_put_contents($this->cachePath . '/.htaccess', "order deny,allow\ndeny from all\n");
+        if (!is_file($this->cachePath.'/.htaccess')) {
+            file_put_contents($this->cachePath.'/.htaccess', "order deny,allow\ndeny from all\n");
         }
 
         // invoke OnCacheUpdate event
@@ -429,7 +429,7 @@ 
 
         $source = trim($source);
         if (substr($source, 0, 5) !== '<?php') {
-            $source = '<?php ' . $source;
+            $source = '<?php '.$source;
         }
 
         $tokens = token_get_all($source);
@@ -487,7 +487,7 @@ 
             }
         }
         $source = preg_replace(array('@^<\?php@i', '|\s+|', '|<!--|', '|-->|', '|-->\s+<!--|'),
-            array('', ' ', "\n" . '<!--', '-->' . "\n", '-->' . "\n" . '<!--'), $_);
+            array('', ' ', "\n".'<!--', '-->'."\n", '-->'."\n".'<!--'), $_);
         $source = trim($source);
 
         return $source;

manager/includes/src/Event.php

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getOutput()
     {

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         if (is_array($SystemAlertMsgQueque)) {
             $title = '';
             if ($this->name && $this->activePlugin) {
-                $title = "<div><b>" . $this->activePlugin . "</b> - <span style='color:maroon;'>" . $this->name . "</span></div>";
+                $title = "<div><b>".$this->activePlugin."</b> - <span style='color:maroon;'>".$this->name."</span></div>";
             }
             $SystemAlertMsgQueque[] = "$title<div style='margin-left:10px;margin-top:3px;'>$msg</div>";
         }

manager/includes/src/Support/MakeTable.php

Doc Comments +4 added lines, -7 removed lines

@@ -278,8 +278,7 @@ 
     /**
      * Sets the width attribute of each column in the array.
      *
-     * @param array $value An Array of column widths in the order of the keys in the
-     *            source table array.
+     * @param string[] $widthArray
      */
     public function setColumnWidths($widthArray)
     {
@@ -289,7 +288,6 @@ 
     /**
      * An optional array of values that can be preselected when using
      *
-     * @param array $value Indicates the INPUT form element type attribute.
      */
     public function setSelectedValues($valueArray)
     {
@@ -326,7 +324,7 @@ 
     /**
      * Determines what class the current row should have applied.
      *
-     * @param int $value The position of the current row being rendered.
+     * @param integer $position
      * @return string
      */
     public function determineRowClass($position)
@@ -353,7 +351,6 @@ 
      * Generates an onclick action applied to the current cell, to execute
      * any specified cell actions.
      *
-     * @param string $value Indicates the INPUT form element type attribute.
      * @return string
      */
     public function getCellAction($currentActionFieldValue)
@@ -395,7 +392,7 @@ 
     /**
      * Function to prepare a link generated in the table cell/link actions.
      *
-     * @param string $value Indicates the INPUT form element type attribute.
+     * @param string $link
      * @return string
      */
     public function prepareLink($link)
@@ -414,7 +411,7 @@ 
      *
      * @param array $fieldsArray The associative array representing the table rows
      * and columns.
-     * @param array $fieldHeadersArray An optional array of values for providing
+     * @param string[] $fieldHeadersArray An optional array of values for providing
      * alternative field headers; this is an associative arrays of keys from
      * the $fieldsArray where the values represent the alt heading content
      * for each column.

Spacing +27 added lines, -27 removed lines

@@ -130,7 +130,7 @@ 
      */
     public function setTableWidth($value)
     {
-        $this->tableWidth = (int)$value;
+        $this->tableWidth = (int) $value;
     }
 
     /**
@@ -317,7 +317,7 @@ 
     {
         $currentWidth = '';
         if (is_array($this->columnWidths)) {
-            $currentWidth = $this->columnWidths[$columnPosition] ? ' width="' . $this->columnWidths[$columnPosition] . '" ' : '';
+            $currentWidth = $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
         }
 
         return $currentWidth;
@@ -346,7 +346,7 @@ 
             $currentClass = $this->rowAlternateClass;
         }
 
-        return ' class="' . $currentClass . '"';
+        return ' class="'.$currentClass.'"';
     }
 
     /**
@@ -360,7 +360,7 @@ 
     {
         $cellAction = '';
         if ($this->cellAction) {
-            $cellAction = ' onClick="javascript:window.location=\'' . $this->cellAction . $this->actionField . '=' . urlencode($currentActionFieldValue) . '\'" ';
+            $cellAction = ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
         }
 
         return $cellAction;
@@ -377,7 +377,7 @@ 
     {
         $cell = $value;
         if ($this->linkAction) {
-            $cell = '<a href="' . $this->linkAction . $this->actionField . '=' . urlencode($currentActionFieldValue) . '">' . $cell . '</a>';
+            $cell = '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
         }
 
         return $cell;
@@ -406,7 +406,7 @@ 
             $end = '?';
         }
 
-        return $link . $end;
+        return $link.$end;
     }
 
     /**
@@ -426,7 +426,7 @@ 
         if (is_array($fieldsArray)) {
             $i = 0;
             foreach ($fieldsArray as $fieldName => $fieldValue) {
-                $table .= "\t<tr" . $this->determineRowClass($i) . ">\n";
+                $table .= "\t<tr".$this->determineRowClass($i).">\n";
                 $currentActionFieldValue = $fieldValue[$this->actionField];
                 if (is_array($this->selectedValues)) {
                     $isChecked = array_search($currentActionFieldValue, $this->selectedValues) === false ? 0 : 1;
@@ -437,15 +437,15 @@ 
                 $colPosition = 0;
                 foreach ($fieldValue as $key => $value) {
                     if (!in_array($key, $this->excludeFields)) {
-                        $table .= "\t\t<td" . $this->getCellAction($currentActionFieldValue) . ">";
+                        $table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
                         $table .= $this->createCellText($currentActionFieldValue, $value);
                         $table .= "</td>\n";
                         if ($i == 0) {
                             if (empty ($header) && $this->formElementType) {
-                                $header .= "\t\t<th style=\"width:32px\" " . ($this->thClass ? 'class="' . $this->thClass . '"' : '') . ">" . ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '') . "</th>\n";
+                                $header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">".($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
                             }
                             $headerText = array_key_exists($key, $fieldHeadersArray) ? $fieldHeadersArray[$key] : $key;
-                            $header .= "\t\t<th" . $this->getColumnWidth($colPosition) . ($this->thClass ? ' class="' . $this->thClass . '" ' : '') . ">" . $headerText . "</th>\n";
+                            $header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
                         }
                         $colPosition++;
                     }
@@ -453,9 +453,9 @@ 
                 $i++;
                 $table .= "\t</tr>\n";
             }
-            $table = "\n" . '<table' . ($this->tableWidth > 0 ? ' width="' . $this->tableWidth . '"' : '') . ($this->tableClass ? ' class="' . $this->tableClass . '"' : '') . ($this->tableID ? ' id="' . $this->tableID . '"' : '') . ">\n" . ($header ? "\t<thead>\n\t<tr class=\"" . $this->rowHeaderClass . "\">\n" . $header . "\t</tr>\n\t</thead>\n" : '') . $table . "</table>\n";
+            $table = "\n".'<table'.($this->tableWidth > 0 ? ' width="'.$this->tableWidth.'"' : '').($this->tableClass ? ' class="'.$this->tableClass.'"' : '').($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n".($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
             if ($this->formElementType) {
-                $table = "\n" . '<form id="' . $this->formName . '" name="' . $this->formName . '" action="' . $this->formAction . '" method="POST">' . $table;
+                $table = "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
             }
             if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
                 /* commented this part because of cookie
@@ -469,7 +469,7 @@ 
 
                 $table .= '</select>'.$_lang["pagination_table_perpage"].'</div>';
                 */
-                $table .= '<div id="pagination" class="paginate">' . $_lang["pagination_table_gotopage"] . '<ul>' . $this->pageNav . '</ul></div>';
+                $table .= '<div id="pagination" class="paginate">'.$_lang["pagination_table_gotopage"].'<ul>'.$this->pageNav.'</ul></div>';
                 //$table .= '<script language="javascript">function updatePageSize(size){window.location = \''.$this->prepareLink($linkpage).'pageSize=\'+size;}</script>';
 
             }
@@ -478,7 +478,7 @@ 
 <script language="javascript">
 	toggled = 0;
 	function clickAll() {
-		myform = document.getElementById("' . $this->formName . '");
+		myform = document.getElementById("' . $this->formName.'");
 		for(i=0;i<myform.length;i++) {
 			if(myform.elements[i].type==\'checkbox\') {
 				myform.elements[i].checked=(toggled?false:true);
@@ -490,9 +490,9 @@ 
             }
             if ($this->formElementType) {
                 if ($this->extra) {
-                    $table .= "\n" . $this->extra . "\n";
+                    $table .= "\n".$this->extra."\n";
                 }
-                $table .= "\n" . '</form>' . "\n";
+                $table .= "\n".'</form>'."\n";
             }
 
             return $table;
@@ -515,7 +515,7 @@ 
         $numPages = ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
         $nav = '';
         if ($numPages > 1) {
-            $currentURL = empty($qs) ? '' : '?' . $qs;
+            $currentURL = empty($qs) ? '' : '?'.$qs;
             if ($currentPage > 6) {
                 $nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
             }
@@ -540,7 +540,7 @@ 
                 $nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
             }
         }
-        $this->pageNav = ' ' . $nav;
+        $this->pageNav = ' '.$nav;
     }
 
     /**
@@ -556,14 +556,14 @@ 
     public function createPageLink($link = '', $pageNum, $displayText, $currentPage = false, $qs = '')
     {
         $modx = evolutionCMS();
-        $orderBy = !empty($_GET['orderby']) ? '&orderby=' . $_GET['orderby'] : '';
-        $orderDir = !empty($_GET['orderdir']) ? '&orderdir=' . $_GET['orderdir'] : '';
+        $orderBy = !empty($_GET['orderby']) ? '&orderby='.$_GET['orderby'] : '';
+        $orderDir = !empty($_GET['orderdir']) ? '&orderdir='.$_GET['orderdir'] : '';
         if (!empty($qs)) {
             $qs = "?$qs";
         }
         $link = empty($link) ? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'],
-            $qs . "page=$pageNum$orderBy$orderDir") : $this->prepareLink($link) . "page=$pageNum";
-        $nav = '<li' . ($currentPage ? ' class="currentPage"' : '') . '><a' . ($currentPage ? ' class="currentPage"' : '') . ' href="' . $link . '">' . $displayText . '</a></li>' . "\n";
+            $qs."page=$pageNum$orderBy$orderDir") : $this->prepareLink($link)."page=$pageNum";
+        $nav = '<li'.($currentPage ? ' class="currentPage"' : '').'><a'.($currentPage ? ' class="currentPage"' : '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
 
         return $nav;
     }
@@ -581,7 +581,7 @@ 
         $field = '';
         if ($this->formElementType) {
             $checked = $isChecked ? "checked " : "";
-            $field = "\t\t" . '<td><input type="' . $this->formElementType . '" name="' . ($this->formElementName ? $this->formElementName : $value) . '"  value="' . $value . '" ' . $checked . '/></td>' . "\n";
+            $field = "\t\t".'<td><input type="'.$this->formElementType.'" name="'.($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
         }
 
         return $field;
@@ -595,7 +595,7 @@ 
     public function handlePaging()
     {
         $offset = (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
-        $limitClause = ' LIMIT ' . ($offset * MAX_DISPLAY_RECORDS_NUM) . ', ' . MAX_DISPLAY_RECORDS_NUM;
+        $limitClause = ' LIMIT '.($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
 
         return $limitClause;
     }
@@ -610,10 +610,10 @@ 
     public function handleSorting($natural_order = false)
     {
         $orderByClause = '';
-        if ((bool)$natural_order === false) {
+        if ((bool) $natural_order === false) {
             $orderby = !empty($_GET['orderby']) ? $_GET['orderby'] : "id";
             $orderdir = !empty($_GET['orderdir']) ? $_GET['orderdir'] : "DESC";
-            $orderByClause = !empty($orderby) ? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ' : "";
+            $orderByClause = !empty($orderby) ? ' ORDER BY '.$orderby.' '.$orderdir.' ' : "";
         }
 
         return $orderByClause;
@@ -642,7 +642,7 @@ 
             }
         }
 
-        return '<a href="[~' . $modx->documentIdentifier . '~]?' . $qs . 'orderby=' . $key . $orderDir . '">' . $text . '</a>';
+        return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
     }
 
 }

Braces +2 added lines, -1 removed lines

@@ -457,7 +457,8 @@
             if ($this->formElementType) {
                 $table = "\n" . '<form id="' . $this->formName . '" name="' . $this->formName . '" action="' . $this->formAction . '" method="POST">' . $table;
             }
-            if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
+            if (strlen($this->pageNav) > 1) {
+//changed to display the pagination if exists.
                 /* commented this part because of cookie
                 $table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">';
                 $pageSizes= array (10, 25, 50, 100, 250);

manager/includes/src/Support/Paginate.php

Doc Comments +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
     /**
      * This function returns the current page number.
      *
-     * @return int
+     * @return string
      */
     public function getCurrentPage()
     {

Spacing +6 added lines, -6 removed lines

@@ -101,14 +101,14 @@ 
         $array_paging['total'] = $this->int_nbr_row;
 
         if ($this->int_cur_position != 0) {
-            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0" . $this->str_ext_argv . "\">";
-            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . ($this->int_cur_position - $this->int_num_result) . $this->str_ext_argv . "\">";
+            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0".$this->str_ext_argv."\">";
+            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=".($this->int_cur_position - $this->int_num_result).$this->str_ext_argv."\">";
         }
 
         if (($this->int_nbr_row - $this->int_cur_position) > $this->int_num_result) {
             $int_new_position = $this->int_cur_position + $this->int_num_result;
-            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . $this->int_nbr_row . $this->str_ext_argv . "\">";
-            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position" . $this->str_ext_argv . "\">";
+            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=".$this->int_nbr_row.$this->str_ext_argv."\">";
+            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position".$this->str_ext_argv."\">";
         }
 
         return $array_paging;
@@ -126,10 +126,10 @@ 
         for ($i = 0; $i < $this->getNumberOfPage(); $i++) {
             // if current page, do not make a link
             if ($i == $this->getCurrentPage()) {
-                $array_all_page[$i] = "<b>" . ($i + 1) . "</b>&nbsp;";
+                $array_all_page[$i] = "<b>".($i + 1)."</b>&nbsp;";
             } else {
                 $int_new_position = ($i * $this->int_num_result);
-                $array_all_page[$i] = "<a href=\"" . $PHP_SELF . "?int_cur_position=$int_new_position$this->str_ext_argv\">" . ($i + 1) . "</a>&nbsp;";
+                $array_all_page[$i] = "<a href=\"".$PHP_SELF."?int_cur_position=$int_new_position$this->str_ext_argv\">".($i + 1)."</a>&nbsp;";
             }
         }