evolution-cms / evolution

manager/index.php

Braces +37 added lines, -18 removed lines

@@ -61,9 +61,13 @@ 
 $mgr_dir   = substr($self_dir,strrpos($self_dir,'/')+1);
 $base_path = str_replace($mgr_dir . '/index.php','',$self);
 $site_mgr_path = $base_path . 'assets/cache/siteManager.php';
-if(is_file($site_mgr_path)) include_once($site_mgr_path);
+if(is_file($site_mgr_path)) {
+    include_once($site_mgr_path);
+}
 $site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
-if(is_file($site_hostnames_path)) include_once($site_hostnames_path);
+if(is_file($site_hostnames_path)) {
+    include_once($site_hostnames_path);
+}
 if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
 	$src = "<?php\n";
 	$src .= "define('MGR_DIR', '{$mgr_dir}');\n";
@@ -117,9 +121,15 @@ 
 $incPath = str_replace("\\","/",dirname(__FILE__)."/includes/"); // Mod by Raymond
 set_include_path(get_include_path() . PATH_SEPARATOR . $incPath);
 
-if (!defined('ENT_COMPAT')) define('ENT_COMPAT', 2);
-if (!defined('ENT_NOQUOTES')) define('ENT_NOQUOTES', 0);
-if (!defined('ENT_QUOTES')) define('ENT_QUOTES', 3);
+if (!defined('ENT_COMPAT')) {
+    define('ENT_COMPAT', 2);
+}
+if (!defined('ENT_NOQUOTES')) {
+    define('ENT_NOQUOTES', 0);
+}
+if (!defined('ENT_QUOTES')) {
+    define('ENT_QUOTES', 3);
+}
 
 // set the document_root :|
 if(!isset($_SERVER['DOCUMENT_ROOT']) || empty($_SERVER['DOCUMENT_ROOT'])) {
@@ -182,10 +192,11 @@ 
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
-foreach($_lang as $k=>$v)
-{
-	if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
-}
+foreach($_lang as $k=>$v) {
+	if(strpos($v,'[+')!==false) {
+	    $_lang[$k] = str_replace($s, $r, $v);
+	}
+	}
 
 // send the charset header
 header('Content-Type: text/html; charset='.$modx_manager_charset);
@@ -198,7 +209,7 @@ 
 include_once "accesscontrol.inc.php";
 
 // double check the session
-if(!isset($_SESSION['mgrValidated'])){
+if(!isset($_SESSION['mgrValidated'])) {
 	echo "Not Logged In!";
 	exit;
 }
@@ -215,7 +226,9 @@ 
 }
 
 // Initialize System Alert Message Queque
-if (!isset($_SESSION['SystemAlertMsgQueque'])) $_SESSION['SystemAlertMsgQueque'] = array();
+if (!isset($_SESSION['SystemAlertMsgQueque'])) {
+    $_SESSION['SystemAlertMsgQueque'] = array();
+}
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
 // first we check to see if this is a frameset request
@@ -223,7 +236,7 @@ 
 	// this looks to be a top-level frameset request, so let's serve up a frameset
 	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
 		include_once "media/style/".$manager_theme."/frames/1.php";
-	}else{
+	} else {
 		include_once "frames/1.php";
 	}
 	exit;
@@ -231,10 +244,15 @@ 
 
 // OK, let's retrieve the action directive from the request
 $option = array('min_range'=>1,'max_range'=>2000);
-if(isset($_GET['a']) && isset($_POST['a'])) $modx->webAlertAndQuit($_lang['error_double_action']);
-elseif(isset($_GET['a']))  $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
-elseif(isset($_POST['a'])) $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
-else                       $action = null;
+if(isset($_GET['a']) && isset($_POST['a'])) {
+    $modx->webAlertAndQuit($_lang['error_double_action']);
+} elseif(isset($_GET['a'])) {
+    $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
+} elseif(isset($_POST['a'])) {
+    $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
+} else {
+    $action = null;
+}
 
 if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) {
 	include_once 'messageCount.inc.php';
@@ -264,11 +282,12 @@ 
 $modx->invokeEvent("OnManagerPageInit", array("action" => $action));
 
 // return element filepath
-function includeFileProcessor ($filepath,$manager_theme) {
+function includeFileProcessor ($filepath,$manager_theme)
+{
 	$element = "";
 	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
 		$element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
-	}else{
+	} else {
 		$element = $filepath;
 	}
 	return $element;

manager/frames/tree.php

Braces +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@ 
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 

 // invoke OnManagerTreeInit event

 $evtOut = $modx->invokeEvent('OnManagerTreeInit', $_REQUEST);

-if(is_array($evtOut)) {

+if(is_array($evtOut)) {
 	echo implode("\n", $evtOut);

 }

 ?>

@@ -54,7 +54,7 @@ 
 		<?php

 		// invoke OnManagerTreePrerender event

 		$evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->db->escape($_REQUEST));

-		if(is_array($evtOut)) {

+		if(is_array($evtOut)) {
 			echo implode("\n", $evtOut);

 		}

 		?>

@@ -66,7 +66,7 @@ 
 		<?php

 		// invoke OnManagerTreeRender event

 		$evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->db->escape($_REQUEST));

-		if(is_array($evtOut)) {

+		if(is_array($evtOut)) {
 			echo implode("\n", $evtOut);

 		}

 		?>

install/sqlParser.class.php

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);
 	}
 }

manager/actions/bkmanager.static.php

Braces +3 added lines, -1 removed lines

@@ -597,7 +597,9 @@
                 $insertdump = $lf;
                 $insertdump .= "INSERT INTO `{$tblval}` VALUES (";
                 $arr = $this->object2Array($row);
-                if( ! is_array($arr)) $arr = array();
+                if( ! is_array($arr)) {
+                    $arr = array();
+                }
                 foreach ($arr as $key => $value) {
                     if (is_null($value)) {
                         $value = 'NULL';

manager/includes/document.parser.class.inc.php

Braces +55 added lines, -26 removed lines

@@ -695,13 +695,15 @@ 
             $this->virtualDir = '';
         }
 
-        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
+        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) {
+/* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
                 if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
-                } else { /* not a valid id in terms of virtualDir, treat as alias */
+                } else {
+/* not a valid id in terms of virtualDir, treat as alias */
                     $this->documentMethod = 'alias';
                     return $q;
                 }
@@ -709,7 +711,8 @@ 
                 $this->documentMethod = 'id';
                 return $q;
             }
-        } else { /* we didn't get an ID back, so instead we assume it's an alias */
+        } else {
+/* we didn't get an ID back, so instead we assume it's an alias */
             if ($this->config['friendly_alias_urls'] != 1) {
                 $q = $qOrig;
             }
@@ -739,13 +742,14 @@ 
      * @param $id
      * @return array|mixed|null|string
      */
-    public function makePageCacheKey($id){
+    public function makePageCacheKey($id)
+    {
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if(!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -754,7 +758,7 @@ 
             }
         }
         $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -1165,10 +1169,18 @@ 
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if($left==='{{' && strpos($content,';}}')!==false) {
+            $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
+        }
+        if($left==='{{' && strpos($content,'{{}}')!==false) {
+            $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]]')!==false) {
+            $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]')!==false) {
+            $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        }
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
@@ -1221,7 +1233,8 @@ 
                         }
                     }
 
-                    if (!in_array($fetch, $tags)) {  // Avoid double Matches
+                    if (!in_array($fetch, $tags)) {
+// Avoid double Matches
                         $tags[] = $fetch; // Fetch
                     };
                     $fetch = ''; // and reset
@@ -1239,7 +1252,9 @@ 
             }
         }
         foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+            if(strpos($tag,$spacer)!==false) {
+                $tags[$i] = str_replace($spacer, '', $tag);
+            }
         }
         return $tags;
     }
@@ -1279,7 +1294,10 @@ 
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if(strpos($key,'[+')!==false) {
+                continue;
+            }
+            // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -2004,7 +2022,8 @@ 
      * @return mixed|string
      */
     public function _getSGVar($value)
-    { // Get super globals
+    {
+// Get super globals
         $key = $value;
         $_ = $this->config['enable_filter'];
         $this->config['enable_filter'] = 1;
@@ -2409,7 +2428,8 @@ 
         if ($this->config['friendly_urls'] == 1) {
             $aliases = array();
             if (is_array($this->documentListing)) {
-                foreach ($this->documentListing as $path => $docid) { // This is big Loop on large site!
+                foreach ($this->documentListing as $path => $docid) {
+// This is big Loop on large site!
                     $aliases[$docid] = $path;
                     $isfolder[$docid] = $this->aliasListing[$docid]['isfolder'];
                 }
@@ -2442,7 +2462,7 @@ 
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff){
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -4214,7 +4234,8 @@ 
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
             $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
-        } else { // not in cache so let's check the db
+        } else {
+// not in cache so let's check the db
             $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "'  AND ss.disabled=0;";
             $result = $this->db->query($sql);
             if ($this->db->getRecordCount($result) == 1) {
@@ -4718,7 +4739,7 @@ 
             $result = $this->db->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if(is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -5197,12 +5218,16 @@ 
             return '';
         } // nothing to register
         if (!is_array($options)) {
-            if (is_bool($options))  // backward compatibility with old plaintext parameter
+            if (is_bool($options)) {
+                // backward compatibility with old plaintext parameter
             {
                 $options = array('plaintext' => $options);
-            } elseif (is_string($options)) // Also allow script name as 2nd param
+            }
+            } elseif (is_string($options)) {
+                // Also allow script name as 2nd param
             {
                 $options = array('name' => $options);
+            }
             } else {
                 $options = array();
             }
@@ -5214,7 +5239,8 @@ 
         unset($overwritepos); // probably unnecessary--just making sure
 
         $useThisVer = true;
-        if (isset($this->loadedjscripts[$key])) { // a matching script was found
+        if (isset($this->loadedjscripts[$key])) {
+// a matching script was found
             // if existing script is a startup script, make sure the candidate is also a startup script
             if ($this->loadedjscripts[$key]['startup']) {
                 $startup = true;
@@ -5234,7 +5260,8 @@ 
                     // overwrite the old script (the position may be important for dependent scripts)
                     $overwritepos = $this->loadedjscripts[$key]['pos'];
                 }
-            } else { // Use the original version
+            } else {
+// Use the original version
                 if ($startup == true && $this->loadedjscripts[$key]['startup'] == false) {
                     // need to move the exisiting script to the head
                     $version = $this->loadedjscripts[$key][$version];
@@ -5358,7 +5385,8 @@ 
         }
 
         $results = null;
-        foreach ($this->pluginEvent[$evtName] as $pluginName) { // start for loop
+        foreach ($this->pluginEvent[$evtName] as $pluginName) {
+// start for loop
             if ($this->dumpPlugins) {
                 $eventtime = $this->getMicroTime();
             }
@@ -5906,7 +5934,8 @@ 
      * @return bool
      */
     public function isSafeCode($phpcode = '', $safe_functions = '')
-    { // return true or false
+    {
+// return true or false
         if ($safe_functions == '') {
             return false;
         }
@@ -6322,7 +6351,7 @@ 
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val){
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {

install/actions/action_connection.php

Braces +12 added lines, -9 removed lines

@@ -9,21 +9,24 @@
     $table_prefix = base_convert(rand(10, 20), 10, 36).substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), rand(0, 33), 3).'_';
 } else {
     $database_name = '';
-    if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) $upgradeable = 0;
-    else {
+    if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) {
+        $upgradeable = 0;
+    } else {
         // Include the file so we can test its validity
         include($base_path.MGR_DIR.'/includes/config.inc.php');
         // We need to have all connection settings - but prefix may be empty so we have to ignore it
         if ($dbase) {
             $database_name = trim($dbase, '`');
-            if (!$conn = mysqli_connect($database_server, $database_user, $database_password))
-                $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
-            elseif (! mysqli_select_db($conn, trim($dbase, '`')))
-                $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
-            else
-                $upgradeable = 1;
+            if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) {
+                            $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
+            } elseif (! mysqli_select_db($conn, trim($dbase, '`'))) {
+                            $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
+            } else {
+                            $upgradeable = 1;
+            }
+        } else {
+            $upgradable= 2;
         }
-        else $upgradable= 2;
     }
 }
 

manager/includes/extenders/modifiers/mdf_moduser.inc.php

Braces +5 added lines, -2 removed lines

@@ -1,8 +1,11 @@
 <?php
 $userid = (int)$value;
 if (!isset($modx->filter->cache['ui'][$userid])) {
-    if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
-    else             $user = $modx->getUserInfo($userid);
+    if ($userid < 0) {
+        $user = $modx->getWebUserInfo(abs($userid));
+    } else {
+        $user = $modx->getUserInfo($userid);
+    }
     $modx->filter->cache['ui'][$userid] = $user;
 } else {
     $user = $modx->filter->cache['ui'][$userid];

manager/includes/extenders/modifiers/mdf_summary.inc.php

Braces +28 added lines, -13 removed lines

@@ -1,9 +1,11 @@ 
 <?php
-if(strpos($opt,',')) list($limit,$delim) = explode(',', $opt);
-elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';}
-else {$limit=124;$delim='';}
+if(strpos($opt,',')) {
+    list($limit,$delim) = explode(',', $opt);
+} elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';} else {$limit=124;$delim='';}
 
-if($delim==='') $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+if($delim==='') {
+    $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+}
 $limit = (int)$limit;
 
 $content = $modx->filter->parseDocumentSource($value);
@@ -11,8 +13,9 @@ 
 $content = strip_tags($content);
 
 $content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'),' ',$content);
-if(preg_match('/\s+/',$content))
+if(preg_match('/\s+/',$content)) {
     $content = preg_replace('/\s+/',' ',$content);
+}
 $content = trim($content);
 
 $pos = $modx->filter->strpos($content, $delim);
@@ -21,23 +24,35 @@ 
     $_ = explode($delim, $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.$delim)) break;
+        if($limit <= $modx->filter->strlen($text.$v.$delim)) {
+            break;
+        }
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
-}
+    if($text) {
+        $content = $text;
+    }
+    }
 
 if($limit<$modx->filter->strlen($content) && strpos($content,' ')!==false) {
     $_ = explode(' ', $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.' ')) break;
+        if($limit <= $modx->filter->strlen($text.$v.' ')) {
+            break;
+        }
         $text .= $v . ' ';
     }
-    if($text!=='') $content = $text;
-}
+    if($text!=='') {
+        $content = $text;
+    }
+    }
 
-if($limit < $modx->filter->strlen($content)) $content = $modx->filter->substr($content, 0, $limit);
-if($modx->filter->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if($limit < $modx->filter->strlen($content)) {
+    $content = $modx->filter->substr($content, 0, $limit);
+}
+if($modx->filter->substr($content,-1)==$delim) {
+    $content = rtrim($content,$delim) . $delim;
+}
 
 return $content;

manager/includes/controls/datagrid.class.php

Braces +15 added lines, -7 removed lines

@@ -10,7 +10,8 @@ 
 
 $__DataGridCnt = 0;
 
-class DataGrid {
+class DataGrid
+{
 
 	public $ds; // datasource
     public $id;
@@ -72,7 +73,8 @@ 
      */
     public $cdelim;
 
-    public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
+    public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1)
+    {
 		global $__DataGridCnt;
 
 		// set id
@@ -88,11 +90,13 @@ 
 		$this->pagerLocation = 'top-right';
 	}
 
-    public function setDataSource($ds) {
+    public function setDataSource($ds)
+    {
 		$this->ds = $ds;
 	}
 
-    public function render() {
+    public function render()
+    {
 		global $modx;
 		$columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
 		$columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
@@ -127,7 +131,9 @@ 
 
 		if($this->_isDataset && !$this->columns) {
 			$cols = $modx->db->numFields($this->ds);
-			for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->db->fieldName($this->ds, $i);
+			for($i = 0; $i < $cols; $i++) {
+			    $this->columns .= ($i ? "," : "") . $modx->db->fieldName($this->ds, $i);
+			}
 		}
 
 		// start grid
@@ -207,7 +213,8 @@ 
 
 	// format column values
 
-    public function RenderRowFnc($n, $row) {
+    public function RenderRowFnc($n, $row)
+    {
 		if($this->_alt == 0) {
 			$Style = $this->_itemStyle;
 			$Class = $this->_itemClass;
@@ -237,7 +244,8 @@ 
 		return $o;
 	}
 
-    public function formatColumnValue($row, $value, $type, &$align) {
+    public function formatColumnValue($row, $value, $type, &$align)
+    {
 		if(strpos($type, ":") !== false) {
 			list($type, $type_format) = explode(":", $type, 2);
 		}