evolution-cms / evolution

manager/includes/extenders/deprecated.functions.inc.php

Indentation +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
     public function getUserData() {
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
-    	return $client;
+        return $client;
     }
 
     # Returns true, install or interact when inside manager
@@ -60,12 +60,12 @@ 
 
     // deprecated
     public function putChunk($chunkName) { // alias name >.<
-    	global $modx;
+        global $modx;
         return $modx->getChunk($chunkName);
     }
 
     public function getDocGroups() {
-    	global $modx;
+        global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
@@ -74,7 +74,7 @@ 
     } // deprecated
 
     public function userLoggedIn() {
-    	global $modx;
+        global $modx;
         $userdetails= array ();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
             // web user
@@ -98,7 +98,7 @@ 
 
     public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
         //  function to retrieve form results into an associative array
-    	global $modx;
+        global $modx;
         $results= array ();
         $method= strtoupper($method);
         if ($method == "")
@@ -130,7 +130,7 @@ 
      * @param string $url URL to redirect to
      */
     public function webAlert($msg, $url= "") {
-    	global $modx;
+        global $modx;
         $msg= addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $act= "__WebAlert();";

Spacing +54 added lines, -54 removed lines

@@ -1,43 +1,43 @@ 
 <?php
 $this->old = new OldFunctions();
-class OldFunctions {
+class OldFunctions{
 
-    public function dbConnect()                 {global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
-    public function dbQuery($sql)               {global $modx;return $modx->db->query($sql);}
-    public function recordCount($rs)            {global $modx;return $modx->db->getRecordCount($rs);}
-    public function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);}
-    public function affectedRows($rs)           {global $modx;return $modx->db->getAffectedRows($rs);}
-    public function insertId($rs)               {global $modx;return $modx->db->getInsertId($rs);}
-    public function dbClose()                   {global $modx;       $modx->db->disconnect();}
+    public function dbConnect(){global $modx; $modx->db->connect(); $modx->rs = $modx->db->conn; }
+    public function dbQuery($sql){global $modx; return $modx->db->query($sql); }
+    public function recordCount($rs){global $modx; return $modx->db->getRecordCount($rs); }
+    public function fetchRow($rs, $mode = 'assoc'){global $modx; return $modx->db->getRow($rs, $mode); }
+    public function affectedRows($rs){global $modx; return $modx->db->getAffectedRows($rs); }
+    public function insertId($rs){global $modx; return $modx->db->getInsertId($rs); }
+    public function dbClose(){global $modx; $modx->db->disconnect(); }
 
-    public function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) {
+    public function makeList($array, $ulroot = 'root', $ulprefix = 'sub_', $type = '', $ordered = false, $tablevel = 0){
         // first find out whether the value passed is an array
         if (!is_array($array)) {
             return "<ul><li>Bad list</li></ul>";
         }
         if (!empty ($type)) {
-            $typestr= " style='list-style-type: $type'";
+            $typestr = " style='list-style-type: $type'";
         } else {
-            $typestr= "";
+            $typestr = "";
         }
-        $tabs= "";
-        for ($i= 0; $i < $tablevel; $i++) {
+        $tabs = "";
+        for ($i = 0; $i < $tablevel; $i++) {
             $tabs .= "\t";
         }
-        $listhtml= $ordered == true ? $tabs . "<ol class='$ulroot'$typestr>\n" : $tabs . "<ul class='$ulroot'$typestr>\n";
+        $listhtml = $ordered == true ? $tabs."<ol class='$ulroot'$typestr>\n" : $tabs."<ul class='$ulroot'$typestr>\n";
         foreach ($array as $key => $value) {
             if (is_array($value)) {
-                $listhtml .= $tabs . "\t<li>" . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix, $type, $ordered, $tablevel +2) . $tabs . "\t</li>\n";
+                $listhtml .= $tabs."\t<li>".$key."\n".$this->makeList($value, $ulprefix.$ulroot, $ulprefix, $type, $ordered, $tablevel + 2).$tabs."\t</li>\n";
             } else {
-                $listhtml .= $tabs . "\t<li>" . $value . "</li>\n";
+                $listhtml .= $tabs."\t<li>".$value."</li>\n";
             }
         }
-        $listhtml .= $ordered == true ? $tabs . "</ol>\n" : $tabs . "</ul>\n";
+        $listhtml .= $ordered == true ? $tabs."</ol>\n" : $tabs."</ul>\n";
         return $listhtml;
     }
 
 
-    public function getUserData() {
+    public function getUserData(){
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
     	return $client;
@@ -45,80 +45,80 @@ 
 
     # Returns true, install or interact when inside manager
     // deprecated
-    public function insideManager() {
-        $m= false;
-        if( defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
-            $m= true;
+    public function insideManager(){
+        $m = false;
+        if (defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
+            $m = true;
             if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true')
-                $m= "interact";
+                $m = "interact";
             else
                 if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true')
-                    $m= "install";
+                    $m = "install";
         }
         return $m;
     }
 
     // deprecated
-    public function putChunk($chunkName) { // alias name >.<
+    public function putChunk($chunkName){ // alias name >.<
     	global $modx;
         return $modx->getChunk($chunkName);
     }
 
-    public function getDocGroups() {
+    public function getDocGroups(){
     	global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
-    public function changePassword($o, $n) {
+    public function changePassword($o, $n){
         return changeWebUserPassword($o, $n);
     } // deprecated
 
-    public function userLoggedIn() {
+    public function userLoggedIn(){
     	global $modx;
-        $userdetails= array ();
+        $userdetails = array();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
             // web user
-            $userdetails['loggedIn']= true;
-            $userdetails['id']= $_SESSION['webInternalKey'];
-            $userdetails['username']= $_SESSION['webShortname'];
-            $userdetails['usertype']= 'web'; // added by Raymond
+            $userdetails['loggedIn'] = true;
+            $userdetails['id'] = $_SESSION['webInternalKey'];
+            $userdetails['username'] = $_SESSION['webShortname'];
+            $userdetails['usertype'] = 'web'; // added by Raymond
             return $userdetails;
         } else
             if ($modx->isBackend() && isset ($_SESSION['mgrValidated'])) {
                 // manager user
-                $userdetails['loggedIn']= true;
-                $userdetails['id']= $_SESSION['mgrInternalKey'];
-                $userdetails['username']= $_SESSION['mgrShortname'];
-                $userdetails['usertype']= 'manager'; // added by Raymond
+                $userdetails['loggedIn'] = true;
+                $userdetails['id'] = $_SESSION['mgrInternalKey'];
+                $userdetails['username'] = $_SESSION['mgrShortname'];
+                $userdetails['usertype'] = 'manager'; // added by Raymond
                 return $userdetails;
             } else {
                 return false;
             }
     }
 
-    public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
+    public function getFormVars($method = "", $prefix = "", $trim = "", $REQUEST_METHOD){
         //  function to retrieve form results into an associative array
     	global $modx;
-        $results= array ();
-        $method= strtoupper($method);
+        $results = array();
+        $method = strtoupper($method);
         if ($method == "")
-            $method= $REQUEST_METHOD;
+            $method = $REQUEST_METHOD;
         if ($method == "POST")
-            $method= & $_POST;
-        elseif ($method == "GET") $method= & $_GET;
+            $method = & $_POST;
+        elseif ($method == "GET") $method = & $_GET;
         else
             return false;
         reset($method);
         foreach ($method as $key => $value) {
             if (($prefix != "") && (substr($key, 0, strlen($prefix)) == $prefix)) {
                 if ($trim) {
-                    $pieces= explode($prefix, $key, 2);
-                    $key= $pieces[1];
-                    $results[$key]= $value;
+                    $pieces = explode($prefix, $key, 2);
+                    $key = $pieces[1];
+                    $results[$key] = $value;
                 } else
-                    $results[$key]= $value;
+                    $results[$key] = $value;
             }
-            elseif ($prefix == "") $results[$key]= $value;
+            elseif ($prefix == "") $results[$key] = $value;
         }
         return $results;
     }
@@ -129,16 +129,16 @@ 
      * @param string $msg Message to show
      * @param string $url URL to redirect to
      */
-    public function webAlert($msg, $url= "") {
+    public function webAlert($msg, $url = ""){
     	global $modx;
-        $msg= addslashes($modx->db->escape($msg));
+        $msg = addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
-            $act= "__WebAlert();";
-            $fnc= "function __WebAlert(){" . substr($url, 11) . "};";
+            $act = "__WebAlert();";
+            $fnc = "function __WebAlert(){".substr($url, 11)."};";
         } else {
-            $act= ($url ? "window.location.href='" . addslashes($url) . "';" : "");
+            $act = ($url ? "window.location.href='".addslashes($url)."';" : "");
         }
-        $html= "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
+        $html = "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
         if ($modx->isFrontend())
             $modx->regClientScript($html);
         else {

Braces +66 added lines, -35 removed lines

@@ -1,16 +1,32 @@ 
 <?php
 $this->old = new OldFunctions();
-class OldFunctions {
+class OldFunctions
+{
 
-    public function dbConnect()                 {global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
-    public function dbQuery($sql)               {global $modx;return $modx->db->query($sql);}
-    public function recordCount($rs)            {global $modx;return $modx->db->getRecordCount($rs);}
-    public function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);}
-    public function affectedRows($rs)           {global $modx;return $modx->db->getAffectedRows($rs);}
-    public function insertId($rs)               {global $modx;return $modx->db->getInsertId($rs);}
-    public function dbClose()                   {global $modx;       $modx->db->disconnect();}
+    public function dbConnect()
+    {
+global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
+    public function dbQuery($sql)
+    {
+global $modx;return $modx->db->query($sql);}
+    public function recordCount($rs)
+    {
+global $modx;return $modx->db->getRecordCount($rs);}
+    public function fetchRow($rs,$mode='assoc')
+    {
+global $modx;return $modx->db->getRow($rs, $mode);}
+    public function affectedRows($rs)
+    {
+global $modx;return $modx->db->getAffectedRows($rs);}
+    public function insertId($rs)
+    {
+global $modx;return $modx->db->getInsertId($rs);}
+    public function dbClose()
+    {
+global $modx;       $modx->db->disconnect();}
 
-    public function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) {
+    public function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0)
+    {
         // first find out whether the value passed is an array
         if (!is_array($array)) {
             return "<ul><li>Bad list</li></ul>";
@@ -37,7 +53,8 @@ 
     }
 
 
-    public function getUserData() {
+    public function getUserData()
+    {
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
     	return $client;
@@ -45,35 +62,42 @@ 
 
     # Returns true, install or interact when inside manager
     // deprecated
-    public function insideManager() {
+    public function insideManager()
+    {
         $m= false;
         if( defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
             $m= true;
-            if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true')
-                $m= "interact";
-            else
-                if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true')
-                    $m= "install";
+            if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true') {
+                            $m= "interact";
+            } else
+                if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true') {
+                                    $m= "install";
+                }
         }
         return $m;
     }
 
     // deprecated
-    public function putChunk($chunkName) { // alias name >.<
+    public function putChunk($chunkName)
+    {
+// alias name >.<
     	global $modx;
         return $modx->getChunk($chunkName);
     }
 
-    public function getDocGroups() {
+    public function getDocGroups()
+    {
     	global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
-    public function changePassword($o, $n) {
+    public function changePassword($o, $n)
+    {
         return changeWebUserPassword($o, $n);
     } // deprecated
 
-    public function userLoggedIn() {
+    public function userLoggedIn()
+    {
     	global $modx;
         $userdetails= array ();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
@@ -96,18 +120,22 @@ 
             }
     }
 
-    public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
+    public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD)
+    {
         //  function to retrieve form results into an associative array
     	global $modx;
         $results= array ();
         $method= strtoupper($method);
-        if ($method == "")
-            $method= $REQUEST_METHOD;
-        if ($method == "POST")
-            $method= & $_POST;
-        elseif ($method == "GET") $method= & $_GET;
-        else
-            return false;
+        if ($method == "") {
+                    $method= $REQUEST_METHOD;
+        }
+        if ($method == "POST") {
+                    $method= & $_POST;
+        } elseif ($method == "GET") {
+            $method= & $_GET;
+        } else {
+                    return false;
+        }
         reset($method);
         foreach ($method as $key => $value) {
             if (($prefix != "") && (substr($key, 0, strlen($prefix)) == $prefix)) {
@@ -115,10 +143,12 @@ 
                     $pieces= explode($prefix, $key, 2);
                     $key= $pieces[1];
                     $results[$key]= $value;
-                } else
-                    $results[$key]= $value;
+                } else {
+                                    $results[$key]= $value;
+                }
+            } elseif ($prefix == "") {
+                $results[$key]= $value;
             }
-            elseif ($prefix == "") $results[$key]= $value;
         }
         return $results;
     }
@@ -129,7 +159,8 @@ 
      * @param string $msg Message to show
      * @param string $url URL to redirect to
      */
-    public function webAlert($msg, $url= "") {
+    public function webAlert($msg, $url= "")
+    {
     	global $modx;
         $msg= addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
@@ -139,9 +170,9 @@ 
             $act= ($url ? "window.location.href='" . addslashes($url) . "';" : "");
         }
         $html= "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
-        if ($modx->isFrontend())
-            $modx->regClientScript($html);
-        else {
+        if ($modx->isFrontend()) {
+                    $modx->regClientScript($html);
+        } else {
             echo $html;
         }
     }

manager/includes/active_user_locks.inc.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <?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.");
 }
 
-$lockElementId = (int)$lockElementId;
+$lockElementId = (int) $lockElementId;
 
 if ($lockElementId > 0) {
     ?>
@@ -18,7 +18,7 @@ 
         var stay = document.getElementById('stay');
         // Trigger unlock
         if ((stay && stay.value !== '2') || !form_save) {
-          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType;?>&id=<?php echo $lockElementId;?>&o=' + Math.random();
+          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType; ?>&id=<?php echo $lockElementId; ?>&o=' + Math.random();
           if (navigator.sendBeacon) {
             navigator.sendBeacon(url)
           } else {

manager/includes/error.class.inc.php

Indentation +58 added lines, -58 removed lines

@@ -17,70 +17,70 @@ 
 
     public function __construct() {
 
-		$_lang = $this->include_lang('errormsg');
+        $_lang = $this->include_lang('errormsg');
 
-		$this->errors = array(
-		0	=>	$_lang["No errors occured."],
-		1	=>	$_lang["An error occured!"],
-		2	=>	$_lang["Document's ID not passed in request!"],
-		3	=>	$_lang["You don't have enough privileges for this action!"],
-		4	=>	$_lang["ID passed in request is NaN!"],
-		5	=>	$_lang["The document is locked!"],
-		6	=>	$_lang["Too many results returned from database!"],
-		7	=>	$_lang["Not enough/ no results returned from database!"],
-		8	=>	$_lang["Couldn't find parent document's name!"],
-		9	=>	$_lang["Logging error!"],
-		10	=>	$_lang["Table to optimise not found in request!"],
-		11	=>	$_lang["No settings found in request!"],
-		12	=>	$_lang["The document must have a title!"],
-		13	=>	$_lang["No user selected as recipient of this message!"],
-		14	=>	$_lang["No group selected as recipient of this message!"],
-		15	=>	$_lang["The document was not found!"],
+        $this->errors = array(
+        0	=>	$_lang["No errors occured."],
+        1	=>	$_lang["An error occured!"],
+        2	=>	$_lang["Document's ID not passed in request!"],
+        3	=>	$_lang["You don't have enough privileges for this action!"],
+        4	=>	$_lang["ID passed in request is NaN!"],
+        5	=>	$_lang["The document is locked!"],
+        6	=>	$_lang["Too many results returned from database!"],
+        7	=>	$_lang["Not enough/ no results returned from database!"],
+        8	=>	$_lang["Couldn't find parent document's name!"],
+        9	=>	$_lang["Logging error!"],
+        10	=>	$_lang["Table to optimise not found in request!"],
+        11	=>	$_lang["No settings found in request!"],
+        12	=>	$_lang["The document must have a title!"],
+        13	=>	$_lang["No user selected as recipient of this message!"],
+        14	=>	$_lang["No group selected as recipient of this message!"],
+        15	=>	$_lang["The document was not found!"],
 
-		100 =>	$_lang["Double action (GET & POST) posted!"],
-		600 =>	$_lang["Document cannot be it's own parent!"],
-		601 =>	$_lang["Document's ID not passed in request!"],
-		602 =>	$_lang["New parent not set in request!"],
-		900 =>	$_lang["don't know the user!"], // don't know the user!
-		901 =>	$_lang["wrong password!"], // wrong password!
-		902 =>	$_lang["Due to too many failed logins, you have been blocked!"],
-		903 =>	$_lang["You are blocked and cannot log in!"],
-		904 =>	$_lang["You are blocked and cannot log in! Please try again later."],
-		905 =>	$_lang["The security code you entered didn't validate! Please try to login again!"]
-	);
-	}
+        100 =>	$_lang["Double action (GET & POST) posted!"],
+        600 =>	$_lang["Document cannot be it's own parent!"],
+        601 =>	$_lang["Document's ID not passed in request!"],
+        602 =>	$_lang["New parent not set in request!"],
+        900 =>	$_lang["don't know the user!"], // don't know the user!
+        901 =>	$_lang["wrong password!"], // wrong password!
+        902 =>	$_lang["Due to too many failed logins, you have been blocked!"],
+        903 =>	$_lang["You are blocked and cannot log in!"],
+        904 =>	$_lang["You are blocked and cannot log in! Please try again later."],
+        905 =>	$_lang["The security code you entered didn't validate! Please try to login again!"]
+    );
+    }
 
-	function include_lang($context='common') {
-		global $modx;
-		$_lang = array();
+    function include_lang($context='common') {
+        global $modx;
+        $_lang = array();
 
-		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+        $context = trim($context,'/');
+        if(strpos($context,'..')!==false) return;
 
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
-		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
-		include_once($lang_path . 'english.inc.php');
-		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
-			include_once("{$lang_path}{$manager_language}.inc.php");
-		return $_lang;
-	}
+        if($context === 'common')
+            $lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+        else
+            $lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+        include_once($lang_path . 'english.inc.php');
+        $manager_language = $modx->config['manager_language'];
+        if(is_file("{$lang_path}{$manager_language}.inc.php"))
+            include_once("{$lang_path}{$manager_language}.inc.php");
+        return $_lang;
+    }
 
-	function setError($errorcode, $custommessage=""){
-		$this->errorcode=$errorcode;
-		$this->errormessage=$this->errors[$errorcode];
-		if($custommessage!="") {
-			$this->errormessage=$custommessage;
-		}
-	}
+    function setError($errorcode, $custommessage=""){
+        $this->errorcode=$errorcode;
+        $this->errormessage=$this->errors[$errorcode];
+        if($custommessage!="") {
+            $this->errormessage=$custommessage;
+        }
+    }
 
-	function getError() {
-		return $this->errorcode;
-	}
+    function getError() {
+        return $this->errorcode;
+    }
 
-	function dumpError(){
+    function dumpError(){
 ?>
 	<html>
 	<head>
@@ -98,7 +98,7 @@ 
 	</body>
 	</html>
 <?php
-		exit;
-	}
+        exit;
+    }
 }
 ?>

Spacing +15 added lines, -15 removed lines

@@ -15,7 +15,7 @@ 
      */
     public $errormessage;
 
-    public function __construct() {
+    public function __construct(){
 
 		$_lang = $this->include_lang('errormsg');
 
@@ -50,33 +50,33 @@ 
 	);
 	}
 
-	function include_lang($context='common') {
+	function include_lang($context = 'common'){
 		global $modx;
 		$_lang = array();
 
-		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+		$context = trim($context, '/');
+		if (strpos($context, '..') !== false) return;
 
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+		if ($context === 'common')
+			$lang_path = MODX_MANAGER_PATH.'includes/lang/';
 		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
-		include_once($lang_path . 'english.inc.php');
+			$lang_path = MODX_MANAGER_PATH."includes/lang/{$context}/";
+		include_once($lang_path.'english.inc.php');
 		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
+		if (is_file("{$lang_path}{$manager_language}.inc.php"))
 			include_once("{$lang_path}{$manager_language}.inc.php");
 		return $_lang;
 	}
 
-	function setError($errorcode, $custommessage=""){
-		$this->errorcode=$errorcode;
-		$this->errormessage=$this->errors[$errorcode];
-		if($custommessage!="") {
-			$this->errormessage=$custommessage;
+	function setError($errorcode, $custommessage = ""){
+		$this->errorcode = $errorcode;
+		$this->errormessage = $this->errors[$errorcode];
+		if ($custommessage != "") {
+			$this->errormessage = $custommessage;
 		}
 	}
 
-	function getError() {
+	function getError(){
 		return $this->errorcode;
 	}
 

Braces +23 added lines, -13 removed lines

@@ -1,6 +1,7 @@ 
 <?php
 // this is the old error handler. Here for legacy, until i replace all the old errors.
-class errorHandler{
+class errorHandler
+{
 
     /**
      * @var int
@@ -15,7 +16,8 @@ 
      */
     public $errormessage;
 
-    public function __construct() {
+    public function __construct()
+    {
 
 		$_lang = $this->include_lang('errormsg');
 
@@ -50,25 +52,31 @@ 
 	);
 	}
 
-	function include_lang($context='common') {
+	function include_lang($context='common')
+	{
 		global $modx;
 		$_lang = array();
 
 		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+		if(strpos($context,'..')!==false) {
+		    return;
+		}
 
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
-		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+		if($context === 'common') {
+					$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+		} else {
+					$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+		}
 		include_once($lang_path . 'english.inc.php');
 		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
-			include_once("{$lang_path}{$manager_language}.inc.php");
+		if(is_file("{$lang_path}{$manager_language}.inc.php")) {
+					include_once("{$lang_path}{$manager_language}.inc.php");
+		}
 		return $_lang;
 	}
 
-	function setError($errorcode, $custommessage=""){
+	function setError($errorcode, $custommessage="")
+	{
 		$this->errorcode=$errorcode;
 		$this->errormessage=$this->errors[$errorcode];
 		if($custommessage!="") {
@@ -76,11 +84,13 @@ 
 		}
 	}
 
-	function getError() {
+	function getError()
+	{
 		return $this->errorcode;
 	}
 
-	function dumpError(){
+	function dumpError()
+	{
 ?>
 	<html>
 	<head>

manager/includes/rss.inc.php

Indentation +31 added lines, -31 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
  *  MODX Manager Home Page Implmentation by pixelchutes (www.pixelchutes.com)
  *  Based on kudo's kRSS Module v1.0.72
  *
@@ -30,44 +30,44 @@ 
 require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 // Convert relative path into absolute url
 function rel2abs( $rel, $base ) {
-	// parse base URL  and convert to local variables: $scheme, $host,  $path
+    // parse base URL  and convert to local variables: $scheme, $host,  $path
     $tmp = parse_url( $base );
     extract( $tmp );
-	if ( strpos( $rel,"//" ) === 0 ) {
-		return $scheme . ':' . $rel;
-	}
-	// return if already absolute URL
-	if ( parse_url( $rel, PHP_URL_SCHEME ) != '' ) {
-		return $rel;
-	}
-	// queries and anchors
-	if ( $rel[0] == '#' || $rel[0] == '?' ) {
-		return $base . $rel;
-	}
-	// remove non-directory element from path
-	$path = preg_replace( '#/[^/]*$#', '', $path );
-	// destroy path if relative url points to root
-	if ( $rel[0] ==  '/' ) {
-		$path = '';
-	}
-	// dirty absolute URL
-	$abs = $host . $path . "/" . $rel;
-	// replace '//' or  '/./' or '/foo/../' with '/'
-	$abs = preg_replace( "/(\/\.?\/)/", "/", $abs );
-	$abs = preg_replace( "/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs );
-	// absolute URL is ready!
-	return $scheme . '://' . $abs;
+    if ( strpos( $rel,"//" ) === 0 ) {
+        return $scheme . ':' . $rel;
+    }
+    // return if already absolute URL
+    if ( parse_url( $rel, PHP_URL_SCHEME ) != '' ) {
+        return $rel;
+    }
+    // queries and anchors
+    if ( $rel[0] == '#' || $rel[0] == '?' ) {
+        return $base . $rel;
+    }
+    // remove non-directory element from path
+    $path = preg_replace( '#/[^/]*$#', '', $path );
+    // destroy path if relative url points to root
+    if ( $rel[0] ==  '/' ) {
+        $path = '';
+    }
+    // dirty absolute URL
+    $abs = $host . $path . "/" . $rel;
+    // replace '//' or  '/./' or '/foo/../' with '/'
+    $abs = preg_replace( "/(\/\.?\/)/", "/", $abs );
+    $abs = preg_replace( "/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs );
+    // absolute URL is ready!
+    return $scheme . '://' . $abs;
 }
 $feedData = array();
 
 // create Feed
 foreach ($urls as $section=>$url) {
-	$output = '';
+    $output = '';
     $rss = @fetch_rss($url);
     if( !$rss ){
-    	$feedData[$section] = 'Failed to retrieve ' . $url;
-    	continue;
-	}
+        $feedData[$section] = 'Failed to retrieve ' . $url;
+        continue;
+    }
     $output .= '<ul>';
 
     $items = array_slice($rss->items, 0, $itemsNumber);
@@ -85,5 +85,5 @@ 
     }
 
     $output .= '</ul>';
-	$feedData[$section] = $output;
+    $feedData[$section] = $output;
 }

Spacing +17 added lines, -17 removed lines

@@ -29,34 +29,34 @@ 
 // include MagPieRSS
 require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 // Convert relative path into absolute url
-function rel2abs( $rel, $base ) {
+function rel2abs($rel, $base){
 	// parse base URL  and convert to local variables: $scheme, $host,  $path
-    $tmp = parse_url( $base );
-    extract( $tmp );
-	if ( strpos( $rel,"//" ) === 0 ) {
-		return $scheme . ':' . $rel;
+    $tmp = parse_url($base);
+    extract($tmp);
+	if (strpos($rel, "//") === 0) {
+		return $scheme.':'.$rel;
 	}
 	// return if already absolute URL
-	if ( parse_url( $rel, PHP_URL_SCHEME ) != '' ) {
+	if (parse_url($rel, PHP_URL_SCHEME) != '') {
 		return $rel;
 	}
 	// queries and anchors
-	if ( $rel[0] == '#' || $rel[0] == '?' ) {
-		return $base . $rel;
+	if ($rel[0] == '#' || $rel[0] == '?') {
+		return $base.$rel;
 	}
 	// remove non-directory element from path
-	$path = preg_replace( '#/[^/]*$#', '', $path );
+	$path = preg_replace('#/[^/]*$#', '', $path);
 	// destroy path if relative url points to root
-	if ( $rel[0] ==  '/' ) {
+	if ($rel[0] == '/') {
 		$path = '';
 	}
 	// dirty absolute URL
-	$abs = $host . $path . "/" . $rel;
+	$abs = $host.$path."/".$rel;
 	// replace '//' or  '/./' or '/foo/../' with '/'
-	$abs = preg_replace( "/(\/\.?\/)/", "/", $abs );
-	$abs = preg_replace( "/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs );
+	$abs = preg_replace("/(\/\.?\/)/", "/", $abs);
+	$abs = preg_replace("/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs);
 	// absolute URL is ready!
-	return $scheme . '://' . $abs;
+	return $scheme.'://'.$abs;
 }
 $feedData = array();
 
@@ -64,15 +64,15 @@ 
 foreach ($urls as $section=>$url) {
 	$output = '';
     $rss = @fetch_rss($url);
-    if( !$rss ){
-    	$feedData[$section] = 'Failed to retrieve ' . $url;
+    if (!$rss) {
+    	$feedData[$section] = 'Failed to retrieve '.$url;
     	continue;
 	}
     $output .= '<ul>';
 
     $items = array_slice($rss->items, 0, $itemsNumber);
     foreach ($items as $item) {
-        $href = rel2abs($item['link'],'https://github.com');
+        $href = rel2abs($item['link'], 'https://github.com');
         $title = $item['title'];
         $pubdate = $item['pubdate'];
         $pubdate = $modx->toDateFormat(strtotime($pubdate));

Braces +3 added lines, -2 removed lines

@@ -29,7 +29,8 @@ 
 // include MagPieRSS
 require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 // Convert relative path into absolute url
-function rel2abs( $rel, $base ) {
+function rel2abs( $rel, $base )
+{
 	// parse base URL  and convert to local variables: $scheme, $host,  $path
     $tmp = parse_url( $base );
     extract( $tmp );
@@ -64,7 +65,7 @@ 
 foreach ($urls as $section=>$url) {
 	$output = '';
     $rss = @fetch_rss($url);
-    if( !$rss ){
+    if( !$rss ) {
     	$feedData[$section] = 'Failed to retrieve ' . $url;
     	continue;
 	}

manager/includes/tmplvars.format.inc.php

Indentation +323 added lines, -323 removed lines

@@ -7,366 +7,366 @@
 // Added by Raymond 20-Jan-2005
 function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
 
-	global $modx;
+    global $modx;
     $o = '';
 
     // process any TV commands in value
-	$docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
-	$value = ProcessTVCommand($value, $name, $docid);
+    $docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
+    $value = ProcessTVCommand($value, $name, $docid);
 
-	$params = array();
-	if($paramstring) {
-		$cp = explode("&", $paramstring);
-		foreach($cp as $p => $v) {
-			$v = trim($v); // trim
-			$ar = explode("=", $v);
-			if(is_array($ar) && count($ar) == 2) {
-				$params[$ar[0]] = decodeParamValue($ar[1]);
-			}
-		}
-	}
+    $params = array();
+    if($paramstring) {
+        $cp = explode("&", $paramstring);
+        foreach($cp as $p => $v) {
+            $v = trim($v); // trim
+            $ar = explode("=", $v);
+            if(is_array($ar) && count($ar) == 2) {
+                $params[$ar[0]] = decodeParamValue($ar[1]);
+            }
+        }
+    }
 
-	$id = "tv$name";
-	switch($format) {
-		case 'image':
-			$images = parseInput($value, '||', 'array');
-			foreach($images as $image) {
-				if(!is_array($image)) {
-					$image = explode('==', $image);
-				}
-				$src = $image[0];
+    $id = "tv$name";
+    switch($format) {
+        case 'image':
+            $images = parseInput($value, '||', 'array');
+            foreach($images as $image) {
+                if(!is_array($image)) {
+                    $image = explode('==', $image);
+                }
+                $src = $image[0];
 
-				if($src) {
-					// We have a valid source
-					$attributes = '';
-					$attr = array(
-						'class' => $params['class'],
-						'src' => $src,
-						'id' => ($params['id'] ? $params['id'] : ''),
-						'alt' => $modx->htmlspecialchars($params['alttext']),
-						'style' => $params['style']
-					);
-					if(isset($params['align']) && $params['align'] != 'none') {
-						$attr['align'] = $params['align'];
-					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib'];
+                if($src) {
+                    // We have a valid source
+                    $attributes = '';
+                    $attr = array(
+                        'class' => $params['class'],
+                        'src' => $src,
+                        'id' => ($params['id'] ? $params['id'] : ''),
+                        'alt' => $modx->htmlspecialchars($params['alttext']),
+                        'style' => $params['style']
+                    );
+                    if(isset($params['align']) && $params['align'] != 'none') {
+                        $attr['align'] = $params['align'];
+                    }
+                    foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                    $attributes .= ' ' . $params['attrib'];
 
-					// Output the image with attributes
-					$o .= '<img' . rtrim($attributes) . ' />';
-				}
-			}
-			break;
+                    // Output the image with attributes
+                    $o .= '<img' . rtrim($attributes) . ' />';
+                }
+            }
+            break;
 
-		case "delim":    // display as delimitted list
-			$value = parseInput($value, "||");
-			$p = $params['format'] ? $params['format'] : " ";
-			if($p == "\\n") {
-				$p = "\n";
-			}
-			$o = str_replace("||", $p, $value);
-			break;
+        case "delim":    // display as delimitted list
+            $value = parseInput($value, "||");
+            $p = $params['format'] ? $params['format'] : " ";
+            if($p == "\\n") {
+                $p = "\n";
+            }
+            $o = str_replace("||", $p, $value);
+            break;
 
-		case "string":
-			$value = parseInput($value);
-			$format = strtolower($params['format']);
-			if($format == 'upper case') {
-				$o = strtoupper($value);
-			} else if($format == 'lower case') {
-				$o = strtolower($value);
-			} else if($format == 'sentence case') {
-				$o = ucfirst($value);
-			} else if($format == 'capitalize') {
-				$o = ucwords($value);
-			} else {
-				$o = $value;
-			}
-			break;
+        case "string":
+            $value = parseInput($value);
+            $format = strtolower($params['format']);
+            if($format == 'upper case') {
+                $o = strtoupper($value);
+            } else if($format == 'lower case') {
+                $o = strtolower($value);
+            } else if($format == 'sentence case') {
+                $o = ucfirst($value);
+            } else if($format == 'capitalize') {
+                $o = ucwords($value);
+            } else {
+                $o = $value;
+            }
+            break;
 
-		case "date":
-			if($value != '' || $params['default'] == 'Yes') {
-				if(empty($value)) {
-					$value = 'now';
-				}
-				$timestamp = getUnixtimeFromDateString($value);
-				$p = $params['format'] ? $params['format'] : "%A %d, %B %Y";
-				$o = strftime($p, $timestamp);
-			} else {
-				$value = '';
-			}
-			break;
+        case "date":
+            if($value != '' || $params['default'] == 'Yes') {
+                if(empty($value)) {
+                    $value = 'now';
+                }
+                $timestamp = getUnixtimeFromDateString($value);
+                $p = $params['format'] ? $params['format'] : "%A %d, %B %Y";
+                $o = strftime($p, $timestamp);
+            } else {
+                $value = '';
+            }
+            break;
 
-		case "hyperlink":
-			$value = parseInput($value, "||", "array");
-			$o = '';
-			$countValue = count($value);
-			for($i = 0; $i < $countValue; $i++) {
-				list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
-				if(!$url) {
-					$url = $name;
-				}
-				if($url) {
-					if($o) {
-						$o .= '<br />';
-					}
-					$attributes = '';
-					// setup the link attributes
-					$attr = array(
-						'href' => $url,
-						'title' => $params['title'] ? $modx->htmlspecialchars($params['title']) : $name,
-						'class' => $params['class'],
-						'style' => $params['style'],
-						'target' => $params['target'],
-					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib']; // add extra
+        case "hyperlink":
+            $value = parseInput($value, "||", "array");
+            $o = '';
+            $countValue = count($value);
+            for($i = 0; $i < $countValue; $i++) {
+                list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
+                if(!$url) {
+                    $url = $name;
+                }
+                if($url) {
+                    if($o) {
+                        $o .= '<br />';
+                    }
+                    $attributes = '';
+                    // setup the link attributes
+                    $attr = array(
+                        'href' => $url,
+                        'title' => $params['title'] ? $modx->htmlspecialchars($params['title']) : $name,
+                        'class' => $params['class'],
+                        'style' => $params['style'],
+                        'target' => $params['target'],
+                    );
+                    foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                    $attributes .= ' ' . $params['attrib']; // add extra
 
-					// Output the link
-					$o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
-				}
-			}
-			break;
+                    // Output the link
+                    $o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
+                }
+            }
+            break;
 
-		case "htmltag":
-			$value = parseInput($value, "||", "array");
-			$tagid = $params['tagid'];
-			$tagname = ($params['tagname']) ? $params['tagname'] : 'div';
-			$o = '';
-			// Loop through a list of tags
+        case "htmltag":
+            $value = parseInput($value, "||", "array");
+            $tagid = $params['tagid'];
+            $tagname = ($params['tagname']) ? $params['tagname'] : 'div';
+            $o = '';
+            // Loop through a list of tags
             $countValue = count($value);
-			for($i = 0; $i < $countValue; $i++) {
-				$tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
-				if(!$tagvalue) {
-					continue;
-				}
+            for($i = 0; $i < $countValue; $i++) {
+                $tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
+                if(!$tagvalue) {
+                    continue;
+                }
 
-				$attributes = '';
-				$attr = array(
-					'id' => ($tagid ? $tagid : $id),
-					// 'tv' already added to id
-					'class' => $params['class'],
-					'style' => $params['style'],
-				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-				$attributes .= ' ' . $params['attrib']; // add extra
+                $attributes = '';
+                $attr = array(
+                    'id' => ($tagid ? $tagid : $id),
+                    // 'tv' already added to id
+                    'class' => $params['class'],
+                    'style' => $params['style'],
+                );
+                foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                $attributes .= ' ' . $params['attrib']; // add extra
 
-				// Output the HTML Tag
-				$o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
-			}
-			break;
+                // Output the HTML Tag
+                $o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+            }
+            break;
 
-		case "richtext":
-			$value = parseInput($value);
-			$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 .= $modx->htmlspecialchars($value);
-			$o .= '</textarea></div>';
-			$replace_richtext = array($id);
-			// setup editors
-			if(!empty($replace_richtext) && !empty($richtexteditor)) {
-				// invoke OnRichTextEditorInit event
-				$evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
-					'editor' => $richtexteditor,
-					'elements' => $replace_richtext,
-					'forfrontend' => 1,
-					'width' => $w,
-					'height' => $h
-				));
-				if(is_array($evtOut)) {
-					$o .= implode("", $evtOut);
-				}
-			}
-			break;
+        case "richtext":
+            $value = parseInput($value);
+            $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 .= $modx->htmlspecialchars($value);
+            $o .= '</textarea></div>';
+            $replace_richtext = array($id);
+            // setup editors
+            if(!empty($replace_richtext) && !empty($richtexteditor)) {
+                // invoke OnRichTextEditorInit event
+                $evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
+                    'editor' => $richtexteditor,
+                    'elements' => $replace_richtext,
+                    'forfrontend' => 1,
+                    'width' => $w,
+                    'height' => $h
+                ));
+                if(is_array($evtOut)) {
+                    $o .= implode("", $evtOut);
+                }
+            }
+            break;
 
-		case "unixtime":
-			$value = parseInput($value);
-			$o = getUnixtimeFromDateString($value);
-			break;
+        case "unixtime":
+            $value = parseInput($value);
+            $o = getUnixtimeFromDateString($value);
+            break;
 
-		case "viewport":
-			$value = parseInput($value);
-			$id = '_' . time();
-			if(!$params['vpid']) {
-				$params['vpid'] = $id;
-			}
-			$sTag = "<iframe";
-			$eTag = "</iframe>";
-			$autoMode = "0";
-			$w = $params['width'];
-			$h = $params['height'];
-			if($params['stretch'] == 'Yes') {
-				$w = "100%";
-				$h = "100%";
-			}
-			if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-				$autoMode = "3";  //both
-			} else if($params['awidth'] == 'Yes') {
-				$autoMode = "1"; //width only
-			} else if($params['aheight'] == 'Yes') {
-				$autoMode = "2";    //height only
-			}
+        case "viewport":
+            $value = parseInput($value);
+            $id = '_' . time();
+            if(!$params['vpid']) {
+                $params['vpid'] = $id;
+            }
+            $sTag = "<iframe";
+            $eTag = "</iframe>";
+            $autoMode = "0";
+            $w = $params['width'];
+            $h = $params['height'];
+            if($params['stretch'] == 'Yes') {
+                $w = "100%";
+                $h = "100%";
+            }
+            if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
+                $autoMode = "3";  //both
+            } else if($params['awidth'] == 'Yes') {
+                $autoMode = "1"; //width only
+            } else if($params['aheight'] == 'Yes') {
+                $autoMode = "2";    //height only
+            }
 
-			$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'] . "' ";
-			if($params['class']) {
-				$o .= " class='" . $params['class'] . "' ";
-			}
-			if($params['style']) {
-				$o .= " style='" . $params['style'] . "' ";
-			}
-			if($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 .= ">";
-			$o .= $eTag;
-			break;
+            $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'] . "' ";
+            if($params['class']) {
+                $o .= " class='" . $params['class'] . "' ";
+            }
+            if($params['style']) {
+                $o .= " style='" . $params['style'] . "' ";
+            }
+            if($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 .= ">";
+            $o .= $eTag;
+            break;
 
-		case "datagrid":
-			include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
-			$grd = new DataGrid('', $value);
+        case "datagrid":
+            include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+            $grd = new DataGrid('', $value);
 
-			$grd->noRecordMsg = $params['egmsg'];
+            $grd->noRecordMsg = $params['egmsg'];
 
-			$grd->columnHeaderClass = $params['chdrc'];
-			$grd->cssClass = $params['tblc'];
-			$grd->itemClass = $params['itmc'];
-			$grd->altItemClass = $params['aitmc'];
+            $grd->columnHeaderClass = $params['chdrc'];
+            $grd->cssClass = $params['tblc'];
+            $grd->itemClass = $params['itmc'];
+            $grd->altItemClass = $params['aitmc'];
 
-			$grd->columnHeaderStyle = $params['chdrs'];
-			$grd->cssStyle = $params['tbls'];
-			$grd->itemStyle = $params['itms'];
-			$grd->altItemStyle = $params['aitms'];
+            $grd->columnHeaderStyle = $params['chdrs'];
+            $grd->cssStyle = $params['tbls'];
+            $grd->itemStyle = $params['itms'];
+            $grd->altItemStyle = $params['aitms'];
 
-			$grd->columns = $params['cols'];
-			$grd->fields = $params['flds'];
-			$grd->colWidths = $params['cwidth'];
-			$grd->colAligns = $params['calign'];
-			$grd->colColors = $params['ccolor'];
-			$grd->colTypes = $params['ctype'];
+            $grd->columns = $params['cols'];
+            $grd->fields = $params['flds'];
+            $grd->colWidths = $params['cwidth'];
+            $grd->colAligns = $params['calign'];
+            $grd->colColors = $params['ccolor'];
+            $grd->colTypes = $params['ctype'];
 
-			$grd->cellPadding = $params['cpad'];
-			$grd->cellSpacing = $params['cspace'];
-			$grd->header = $params['head'];
-			$grd->footer = $params['foot'];
-			$grd->pageSize = $params['psize'];
-			$grd->pagerLocation = $params['ploc'];
-			$grd->pagerClass = $params['pclass'];
-			$grd->pagerStyle = $params['pstyle'];
-			$o = $grd->render();
-			break;
+            $grd->cellPadding = $params['cpad'];
+            $grd->cellSpacing = $params['cspace'];
+            $grd->header = $params['head'];
+            $grd->footer = $params['foot'];
+            $grd->pageSize = $params['psize'];
+            $grd->pagerLocation = $params['ploc'];
+            $grd->pagerClass = $params['pclass'];
+            $grd->pagerStyle = $params['pstyle'];
+            $o = $grd->render();
+            break;
 
-		case 'htmlentities':
-			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
-				// remove delimiter from checkbox and listbox-multiple TVs
-				$value = str_replace('||', '', $value);
-			}
-			$o = htmlentities($value, ENT_NOQUOTES, $modx->config['modx_charset']);
-			break;
+        case 'htmlentities':
+            $value = parseInput($value);
+            if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+                // remove delimiter from checkbox and listbox-multiple TVs
+                $value = str_replace('||', '', $value);
+            }
+            $o = htmlentities($value, ENT_NOQUOTES, $modx->config['modx_charset']);
+            break;
 
-		case 'custom_widget':
-			$widget_output = '';
-			$o = '';
-			/* If we are loading a file */
-			if(substr($params['output'], 0, 5) == "@FILE") {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
-				if(!file_exists($file_name)) {
-					$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));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
-				} else {
-					/* The included file needs to set $widget_output. Can be string, array, object */
-					include $file_name;
-				}
-			} elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
-				$chunk_name = trim(substr($params['output'], 7));
-				$widget_output = $modx->getChunk($chunk_name);
-			} elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
-				$eval_str = trim(substr($params['output'], 6));
-				$widget_output = eval($eval_str);
-			} elseif($value !== '') {
-				$widget_output = $params['output'];
-			} else {
-				$widget_output = '';
-			}
-			if(is_string($widget_output)) {
-				$_ = $modx->config['enable_filter'];
-				$modx->config['enable_filter'] = 1;
-				$widget_output = $modx->parseText($widget_output, array('value' => $value));
-				$modx->config['enable_filter'] = $_;
-				$o = $modx->parseDocumentSource($widget_output);
-			} else {
-				$o = $widget_output;
-			}
-			break;
+        case 'custom_widget':
+            $widget_output = '';
+            $o = '';
+            /* If we are loading a file */
+            if(substr($params['output'], 0, 5) == "@FILE") {
+                $file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
+                if(!file_exists($file_name)) {
+                    $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));
+                if(!file_exists($file_name)) {
+                    $widget_output = $file_name . ' does not exist';
+                } else {
+                    /* The included file needs to set $widget_output. Can be string, array, object */
+                    include $file_name;
+                }
+            } elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
+                $chunk_name = trim(substr($params['output'], 7));
+                $widget_output = $modx->getChunk($chunk_name);
+            } elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
+                $eval_str = trim(substr($params['output'], 6));
+                $widget_output = eval($eval_str);
+            } elseif($value !== '') {
+                $widget_output = $params['output'];
+            } else {
+                $widget_output = '';
+            }
+            if(is_string($widget_output)) {
+                $_ = $modx->config['enable_filter'];
+                $modx->config['enable_filter'] = 1;
+                $widget_output = $modx->parseText($widget_output, array('value' => $value));
+                $modx->config['enable_filter'] = $_;
+                $o = $modx->parseDocumentSource($widget_output);
+            } else {
+                $o = $widget_output;
+            }
+            break;
 
-		default:
-			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
-				// add separator
-				$value = explode('||', $value);
-				$value = implode($sep, $value);
-			}
-			$o = $value;
-			break;
-	}
-	return $o;
+        default:
+            $value = parseInput($value);
+            if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+                // add separator
+                $value = explode('||', $value);
+                $value = implode($sep, $value);
+            }
+            $o = $value;
+            break;
+    }
+    return $o;
 }
 
 function decodeParamValue($s) {
-	$s = str_replace("%3D", '=', $s); // =
-	$s = str_replace("%26", '&', $s); // &
-	return $s;
+    $s = str_replace("%3D", '=', $s); // =
+    $s = str_replace("%26", '&', $s); // &
+    return $s;
 }
 
 // returns an array if a delimiter is present. returns array is a recordset is present
 function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
-	global $modx;
-	if($modx->db->isResult($src)) {
-		// must be a recordset
-		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
-		return ($type == "array") ? $rows : implode($delim, $rows);
-	} else {
-		// must be a text
-		if($type == "array") {
-			return explode($delim, $src);
-		} else {
-			return $src;
-		}
-	}
+    global $modx;
+    if($modx->db->isResult($src)) {
+        // must be a recordset
+        $rows = array();
+        while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+        return ($type == "array") ? $rows : implode($delim, $rows);
+    } else {
+        // must be a text
+        if($type == "array") {
+            return explode($delim, $src);
+        } else {
+            return $src;
+        }
+    }
 }
 
 function getUnixtimeFromDateString($value) {
-	$timestamp = false;
-	// Check for MySQL or legacy style date
-	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
-	$date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
-	$matches = array();
-	if(strpos($value, '-') !== false) {
-		if(preg_match($date_match_1, $value, $matches)) {
-			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
-		} elseif(preg_match($date_match_2, $value, $matches)) {
-			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
-		}
-	}
-	// If those didn't work, use strtotime to figure out the date
-	if($timestamp === false || $timestamp === -1) {
-		$timestamp = strtotime($value);
-	}
-	return $timestamp;
+    $timestamp = false;
+    // Check for MySQL or legacy style date
+    $date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
+    $date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
+    $matches = array();
+    if(strpos($value, '-') !== false) {
+        if(preg_match($date_match_1, $value, $matches)) {
+            $timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
+        } elseif(preg_match($date_match_2, $value, $matches)) {
+            $timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+        }
+    }
+    // If those didn't work, use strtotime to figure out the date
+    if($timestamp === false || $timestamp === -1) {
+        $timestamp = strtotime($value);
+    }
+    return $timestamp;
 }

Spacing +79 added lines, -79 removed lines

@@ -5,38 +5,38 @@ 
  */
 
 // Added by Raymond 20-Jan-2005
-function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
+function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = ''){
 
 	global $modx;
     $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();
-	if($paramstring) {
+	if ($paramstring) {
 		$cp = explode("&", $paramstring);
-		foreach($cp as $p => $v) {
+		foreach ($cp as $p => $v) {
 			$v = trim($v); // trim
 			$ar = explode("=", $v);
-			if(is_array($ar) && count($ar) == 2) {
+			if (is_array($ar) && count($ar) == 2) {
 				$params[$ar[0]] = decodeParamValue($ar[1]);
 			}
 		}
 	}
 
 	$id = "tv$name";
-	switch($format) {
+	switch ($format) {
 		case 'image':
 			$images = parseInput($value, '||', 'array');
-			foreach($images as $image) {
-				if(!is_array($image)) {
+			foreach ($images as $image) {
+				if (!is_array($image)) {
 					$image = explode('==', $image);
 				}
 				$src = $image[0];
 
-				if($src) {
+				if ($src) {
 					// We have a valid source
 					$attributes = '';
 					$attr = array(
@@ -46,14 +46,14 @@ 
 						'alt' => $modx->htmlspecialchars($params['alttext']),
 						'style' => $params['style']
 					);
-					if(isset($params['align']) && $params['align'] != 'none') {
+					if (isset($params['align']) && $params['align'] != 'none') {
 						$attr['align'] = $params['align'];
 					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib'];
+					foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+					$attributes .= ' '.$params['attrib'];
 
 					// Output the image with attributes
-					$o .= '<img' . rtrim($attributes) . ' />';
+					$o .= '<img'.rtrim($attributes).' />';
 				}
 			}
 			break;
@@ -61,7 +61,7 @@ 
 		case "delim":    // display as delimitted list
 			$value = parseInput($value, "||");
 			$p = $params['format'] ? $params['format'] : " ";
-			if($p == "\\n") {
+			if ($p == "\\n") {
 				$p = "\n";
 			}
 			$o = str_replace("||", $p, $value);
@@ -70,13 +70,13 @@ 
 		case "string":
 			$value = parseInput($value);
 			$format = strtolower($params['format']);
-			if($format == 'upper case') {
+			if ($format == 'upper case') {
 				$o = strtoupper($value);
-			} else if($format == 'lower case') {
+			} else if ($format == 'lower case') {
 				$o = strtolower($value);
-			} else if($format == 'sentence case') {
+			} else if ($format == 'sentence case') {
 				$o = ucfirst($value);
-			} else if($format == 'capitalize') {
+			} else if ($format == 'capitalize') {
 				$o = ucwords($value);
 			} else {
 				$o = $value;
@@ -84,8 +84,8 @@ 
 			break;
 
 		case "date":
-			if($value != '' || $params['default'] == 'Yes') {
-				if(empty($value)) {
+			if ($value != '' || $params['default'] == 'Yes') {
+				if (empty($value)) {
 					$value = 'now';
 				}
 				$timestamp = getUnixtimeFromDateString($value);
@@ -100,13 +100,13 @@ 
 			$value = parseInput($value, "||", "array");
 			$o = '';
 			$countValue = count($value);
-			for($i = 0; $i < $countValue; $i++) {
+			for ($i = 0; $i < $countValue; $i++) {
 				list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
-				if(!$url) {
+				if (!$url) {
 					$url = $name;
 				}
-				if($url) {
-					if($o) {
+				if ($url) {
+					if ($o) {
 						$o .= '<br />';
 					}
 					$attributes = '';
@@ -118,11 +118,11 @@ 
 						'style' => $params['style'],
 						'target' => $params['target'],
 					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib']; // add extra
+					foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+					$attributes .= ' '.$params['attrib']; // add extra
 
 					// Output the link
-					$o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
+					$o .= '<a'.rtrim($attributes).'>'.($params['text'] ? $modx->htmlspecialchars($params['text']) : $name).'</a>';
 				}
 			}
 			break;
@@ -134,9 +134,9 @@ 
 			$o = '';
 			// Loop through a list of tags
             $countValue = count($value);
-			for($i = 0; $i < $countValue; $i++) {
+			for ($i = 0; $i < $countValue; $i++) {
 				$tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
-				if(!$tagvalue) {
+				if (!$tagvalue) {
 					continue;
 				}
 
@@ -147,11 +147,11 @@ 
 					'class' => $params['class'],
 					'style' => $params['style'],
 				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-				$attributes .= ' ' . $params['attrib']; // add extra
+				foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+				$attributes .= ' '.$params['attrib']; // add extra
 
 				// Output the HTML Tag
-				$o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+				$o .= '<'.$tagname.rtrim($attributes).'>'.$tagvalue.'</'.$tagname.'>';
 			}
 			break;
 
@@ -160,12 +160,12 @@ 
 			$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->htmlspecialchars($value);
 			$o .= '</textarea></div>';
 			$replace_richtext = array($id);
 			// setup editors
-			if(!empty($replace_richtext) && !empty($richtexteditor)) {
+			if (!empty($replace_richtext) && !empty($richtexteditor)) {
 				// invoke OnRichTextEditorInit event
 				$evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
 					'editor' => $richtexteditor,
@@ -174,7 +174,7 @@ 
 					'width' => $w,
 					'height' => $h
 				));
-				if(is_array($evtOut)) {
+				if (is_array($evtOut)) {
 					$o .= implode("", $evtOut);
 				}
 			}
@@ -187,8 +187,8 @@ 
 
 		case "viewport":
 			$value = parseInput($value);
-			$id = '_' . time();
-			if(!$params['vpid']) {
+			$id = '_'.time();
+			if (!$params['vpid']) {
 				$params['vpid'] = $id;
 			}
 			$sTag = "<iframe";
@@ -196,42 +196,42 @@ 
 			$autoMode = "0";
 			$w = $params['width'];
 			$h = $params['height'];
-			if($params['stretch'] == 'Yes') {
+			if ($params['stretch'] == 'Yes') {
 				$w = "100%";
 				$h = "100%";
 			}
-			if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-				$autoMode = "3";  //both
-			} else if($params['awidth'] == 'Yes') {
+			if ($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
+				$autoMode = "3"; //both
+			} else if ($params['awidth'] == 'Yes') {
 				$autoMode = "1"; //width only
-			} else if($params['aheight'] == 'Yes') {
-				$autoMode = "2";    //height only
+			} else if ($params['aheight'] == 'Yes') {
+				$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'] . "' ";
-			if($params['class']) {
-				$o .= " class='" . $params['class'] . "' ";
+			$o = $sTag." id='".$params['vpid']."' name='".$params['vpid']."' ";
+			if ($params['class']) {
+				$o .= " class='".$params['class']."' ";
 			}
-			if($params['style']) {
-				$o .= " style='" . $params['style'] . "' ";
+			if ($params['style']) {
+				$o .= " style='".$params['style']."' ";
 			}
-			if($params['attrib']) {
-				$o .= $params['attrib'] . " ";
+			if ($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'];
@@ -266,7 +266,7 @@ 
 
 		case 'htmlentities':
 			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+			if ($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
 				// remove delimiter from checkbox and listbox-multiple TVs
 				$value = str_replace('||', '', $value);
 			}
@@ -277,33 +277,33 @@ 
 			$widget_output = '';
 			$o = '';
 			/* If we are loading a file */
-			if(substr($params['output'], 0, 5) == "@FILE") {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
+			if (substr($params['output'], 0, 5) == "@FILE") {
+				$file_name = MODX_BASE_PATH.trim(substr($params['output'], 6));
+				if (!file_exists($file_name)) {
+					$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));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
+			} elseif (substr($params['output'], 0, 8) == '@INCLUDE') {
+				$file_name = MODX_BASE_PATH.trim(substr($params['output'], 9));
+				if (!file_exists($file_name)) {
+					$widget_output = $file_name.' does not exist';
 				} else {
 					/* The included file needs to set $widget_output. Can be string, array, object */
 					include $file_name;
 				}
-			} elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
+			} elseif (substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
 				$chunk_name = trim(substr($params['output'], 7));
 				$widget_output = $modx->getChunk($chunk_name);
-			} elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
+			} elseif (substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
 				$eval_str = trim(substr($params['output'], 6));
 				$widget_output = eval($eval_str);
-			} elseif($value !== '') {
+			} elseif ($value !== '') {
 				$widget_output = $params['output'];
 			} else {
 				$widget_output = '';
 			}
-			if(is_string($widget_output)) {
+			if (is_string($widget_output)) {
 				$_ = $modx->config['enable_filter'];
 				$modx->config['enable_filter'] = 1;
 				$widget_output = $modx->parseText($widget_output, array('value' => $value));
@@ -316,7 +316,7 @@ 
 
 		default:
 			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+			if ($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
 				// add separator
 				$value = explode('||', $value);
 				$value = implode($sep, $value);
@@ -327,23 +327,23 @@ 
 	return $o;
 }
 
-function decodeParamValue($s) {
+function decodeParamValue($s){
 	$s = str_replace("%3D", '=', $s); // =
 	$s = str_replace("%26", '&', $s); // &
 	return $s;
 }
 
 // returns an array if a delimiter is present. returns array is a recordset is present
-function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
+function parseInput($src, $delim = "||", $type = "string", $columns = true){ // type can be: string, array
 	global $modx;
-	if($modx->db->isResult($src)) {
+	if ($modx->db->isResult($src)) {
 		// must be a recordset
 		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		while ($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
 		return ($type == "array") ? $rows : implode($delim, $rows);
 	} else {
 		// must be a text
-		if($type == "array") {
+		if ($type == "array") {
 			return explode($delim, $src);
 		} else {
 			return $src;
@@ -351,21 +351,21 @@ 
 	}
 }
 
-function getUnixtimeFromDateString($value) {
+function getUnixtimeFromDateString($value){
 	$timestamp = false;
 	// Check for MySQL or legacy style date
 	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
 	$date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
 	$matches = array();
-	if(strpos($value, '-') !== false) {
-		if(preg_match($date_match_1, $value, $matches)) {
+	if (strpos($value, '-') !== false) {
+		if (preg_match($date_match_1, $value, $matches)) {
 			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
-		} elseif(preg_match($date_match_2, $value, $matches)) {
+		} elseif (preg_match($date_match_2, $value, $matches)) {
 			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
 		}
 	}
 	// If those didn't work, use strtotime to figure out the date
-	if($timestamp === false || $timestamp === -1) {
+	if ($timestamp === false || $timestamp === -1) {
 		$timestamp = strtotime($value);
 	}
 	return $timestamp;

Braces +21 added lines, -8 removed lines

@@ -5,7 +5,8 @@ 
  */
 
 // Added by Raymond 20-Jan-2005
-function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
+function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '')
+{
 
 	global $modx;
     $o = '';
@@ -49,7 +50,9 @@ 
 					if(isset($params['align']) && $params['align'] != 'none') {
 						$attr['align'] = $params['align'];
 					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					foreach($attr as $k => $v) {
+					    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					}
 					$attributes .= ' ' . $params['attrib'];
 
 					// Output the image with attributes
@@ -118,7 +121,9 @@ 
 						'style' => $params['style'],
 						'target' => $params['target'],
 					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					foreach($attr as $k => $v) {
+					    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					}
 					$attributes .= ' ' . $params['attrib']; // add extra
 
 					// Output the link
@@ -147,7 +152,9 @@ 
 					'class' => $params['class'],
 					'style' => $params['style'],
 				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+				foreach($attr as $k => $v) {
+				    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+				}
 				$attributes .= ' ' . $params['attrib']; // add extra
 
 				// Output the HTML Tag
@@ -327,19 +334,24 @@ 
 	return $o;
 }
 
-function decodeParamValue($s) {
+function decodeParamValue($s)
+{
 	$s = str_replace("%3D", '=', $s); // =
 	$s = str_replace("%26", '&', $s); // &
 	return $s;
 }
 
 // returns an array if a delimiter is present. returns array is a recordset is present
-function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
+function parseInput($src, $delim = "||", $type = "string", $columns = true)
+{
+// type can be: string, array
 	global $modx;
 	if($modx->db->isResult($src)) {
 		// must be a recordset
 		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		while($cols = $modx->db->getRow($src, 'num')) {
+		    $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		}
 		return ($type == "array") ? $rows : implode($delim, $rows);
 	} else {
 		// must be a text
@@ -351,7 +363,8 @@ 
 	}
 }
 
-function getUnixtimeFromDateString($value) {
+function getUnixtimeFromDateString($value)
+{
 	$timestamp = false;
 	// Check for MySQL or legacy style date
 	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';

manager/media/script/air-datepicker/datepicker.inc.php

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
         if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
-		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
+        $modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
     public function getLangCode() {

Spacing +7 added lines, -7 removed lines

@@ -1,21 +1,21 @@
 <?php
-class DATEPICKER {
-    public function getDP() {
+class DATEPICKER{
+    public function getDP(){
         global $modx;
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if (!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
-    public function getLangCode() {
+    public function getLangCode(){
         global $modx, $modx_lang_attribute;
 
-        if(!$modx_lang_attribute) return 'en';
+        if (!$modx_lang_attribute) return 'en';
 
         $lc = $modx_lang_attribute;
-        if($lc === 'uk') return 'ru';
-        $dp_path = str_replace('\\','/',dirname(__FILE__));
+        if ($lc === 'uk') return 'ru';
+        $dp_path = str_replace('\\', '/', dirname(__FILE__));
 
         return (is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) ? $modx_lang_attribute : 'en';
     }

Braces +15 added lines, -6 removed lines

@@ -1,20 +1,29 @@
 <?php
-class DATEPICKER {
-    public function getDP() {
+class DATEPICKER
+{
+    public function getDP()
+    {
         global $modx;
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if(!isset($modx->config['lang_code'])) {
+            $modx->config['lang_code'] = $this->getLangCode();
+        }
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
-    public function getLangCode() {
+    public function getLangCode()
+    {
         global $modx, $modx_lang_attribute;
 
-        if(!$modx_lang_attribute) return 'en';
+        if(!$modx_lang_attribute) {
+            return 'en';
+        }
 
         $lc = $modx_lang_attribute;
-        if($lc === 'uk') return 'ru';
+        if($lc === 'uk') {
+            return 'ru';
+        }
         $dp_path = str_replace('\\','/',dirname(__FILE__));
 
         return (is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) ? $modx_lang_attribute : 'en';

manager/processors/delete_plugin.processor.php

Indentation +8 added lines, -8 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_plugin')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // Set the item name for logger
@@ -17,9 +17,9 @@ 
 
 // invoke OnBeforePluginFormDelete event
 $modx->invokeEvent("OnBeforePluginFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the plugin.
 $modx->db->delete($modx->getFullTableName('site_plugins'), "id='{$id}'");
@@ -29,9 +29,9 @@ 
 
 // invoke OnPluginFormDelete event
 $modx->invokeEvent("OnPluginFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

Spacing +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@ 
 <?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.");
 }
-if(!$modx->hasPermission('delete_plugin')) {
+if (!$modx->hasPermission('delete_plugin')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -37,5 +37,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=76&r=2";
+$header = "Location: index.php?a=76&r=2";
 header($header);

manager/processors/delete_htmlsnippet.processor.php

Indentation +8 added lines, -8 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_snippet')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // Set the item name for logger
@@ -17,18 +17,18 @@ 
 
 // invoke OnBeforeChunkFormDelete event
 $modx->invokeEvent("OnBeforeChunkFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the chunk.
 $modx->db->delete($modx->getFullTableName('site_htmlsnippets'), "id='{$id}'");
 
 // invoke OnChunkFormDelete event
 $modx->invokeEvent("OnChunkFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

Spacing +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@ 
 <?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.");
 }
-if(!$modx->hasPermission('delete_snippet')) {
+if (!$modx->hasPermission('delete_snippet')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -34,5 +34,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=76&r=2";
+$header = "Location: index.php?a=76&r=2";
 header($header);

manager/processors/delete_template.processor.php

Indentation +16 added lines, -16 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_template')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
 if($id == 0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // delete the template, but first check it doesn't have any documents using it
 $rs = $modx->db->select('id, pagetitle,introtext', $modx->getFullTableName('site_content'), "template='{$id}' AND deleted=0");
 $limit = $modx->db->getRecordCount($rs);
 if($limit > 0) {
-	include "header.inc.php";
-	?>
+    include "header.inc.php";
+    ?>
 
 	<h1><?php echo $_lang['manage_templates']; ?></h1>
 
@@ -28,20 +28,20 @@ 
 			<p>Documents using this template:</p>
 			<ul>
 				<?php
-				while($row = $modx->db->getRow($rs)) {
-					echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['introtext'] != '' ? ' - ' . $row['introtext'] : '') . '</li>';
-				}
-				?>
+                while($row = $modx->db->getRow($rs)) {
+                    echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['introtext'] != '' ? ' - ' . $row['introtext'] : '') . '</li>';
+                }
+                ?>
 			</ul>
 		</div>
 	</div>
 	<?php
-	include_once "footer.inc.php";
-	exit;
+    include_once "footer.inc.php";
+    exit;
 }
 
 if($id == $default_template) {
-	$modx->webAlertAndQuit("This template is set as the default template. Please choose a different default template in the MODX configuration before deleting this template.");
+    $modx->webAlertAndQuit("This template is set as the default template. Please choose a different default template in the MODX configuration before deleting this template.");
 }
 
 // Set the item name for logger
@@ -50,8 +50,8 @@ 
 
 // invoke OnBeforeTempFormDelete event
 $modx->invokeEvent("OnBeforeTempFormDelete", array(
-		"id" => $id
-	));
+        "id" => $id
+    ));
 
 // delete the document.
 $modx->db->delete($modx->getFullTableName('site_templates'), "id='{$id}'");
@@ -60,8 +60,8 @@ 
 
 // invoke OnTempFormDelete event
 $modx->invokeEvent("OnTempFormDelete", array(
-		"id" => $id
-	));
+        "id" => $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

Spacing +8 added lines, -8 removed lines

@@ -1,20 +1,20 @@ 
 <?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.");
 }
-if(!$modx->hasPermission('delete_template')) {
+if (!$modx->hasPermission('delete_template')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
-if($id == 0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // delete the template, but first check it doesn't have any documents using it
 $rs = $modx->db->select('id, pagetitle,introtext', $modx->getFullTableName('site_content'), "template='{$id}' AND deleted=0");
 $limit = $modx->db->getRecordCount($rs);
-if($limit > 0) {
+if ($limit > 0) {
 	include "header.inc.php";
 	?>
 
@@ -28,8 +28,8 @@ 
 			<p>Documents using this template:</p>
 			<ul>
 				<?php
-				while($row = $modx->db->getRow($rs)) {
-					echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['introtext'] != '' ? ' - ' . $row['introtext'] : '') . '</li>';
+				while ($row = $modx->db->getRow($rs)) {
+					echo '<li><span style="width: 200px"><a href="index.php?id='.$row['id'].'&a=27">'.$row['pagetitle'].'</a></span>'.($row['introtext'] != '' ? ' - '.$row['introtext'] : '').'</li>';
 				}
 				?>
 			</ul>
@@ -40,7 +40,7 @@ 
 	exit;
 }
 
-if($id == $default_template) {
+if ($id == $default_template) {
 	$modx->webAlertAndQuit("This template is set as the default template. Please choose a different default template in the MODX configuration before deleting this template.");
 }