evolution-cms / evolution

manager/includes/extenders/phpcompat.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -6,17 +6,17 @@
 	{
 	}
 	
-	function htmlspecialchars($str='', $flags = ENT_COMPAT, $encode='')
+	function htmlspecialchars($str = '', $flags = ENT_COMPAT, $encode = '')
 	{
 		global $modx;
 		
-		if($str=='') return '';
+		if ($str == '') return '';
 		
-		if($encode=='') $encode = $modx->config['modx_charset'];
+		if ($encode == '') $encode = $modx->config['modx_charset'];
 		
 		$ent_str = htmlspecialchars($str, $flags, $encode);
 		
-		if(!empty($str) && empty($ent_str))
+		if (!empty($str) && empty($ent_str))
 		{
 			$detect_order = implode(',', mb_detect_order());
 			$ent_str = mb_convert_encoding($str, $encode, $detect_order); 

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

Spacing +342 added lines, -342 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if(!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+if (!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
 
-class MODIFIERS {
+class MODIFIERS{
     
     var $placeholders = array();
     var $vars = array();
@@ -24,14 +24,14 @@ 
         $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir';
     }
     
-    function phxFilter($key,$value,$modifiers)
+    function phxFilter($key, $value, $modifiers)
     {
         global $modx;
-        if(substr($modifiers,0,3)!=='id(') $value = $this->parseDocumentSource($value);
+        if (substr($modifiers, 0, 3) !== 'id(') $value = $this->parseDocumentSource($value);
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
-        $modifiers = ':'.trim($modifiers,':');
-        $modifiers = str_replace(array("\r\n","\r"), "\n", $modifiers);
+        $modifiers = ':'.trim($modifiers, ':');
+        $modifiers = str_replace(array("\r\n", "\r"), "\n", $modifiers);
         $modifiers = $this->splitEachModifiers($modifiers);
         
         $this->placeholders = array();
@@ -39,117 +39,117 @@ 
         $this->placeholders['dummy'] = '';
         $this->condition = array();
         $this->vars = array();
-        $this->vars['name']    = & $key;
-        $value = $this->parsePhx($key,$value,$modifiers);
+        $this->vars['name'] = & $key;
+        $value = $this->parsePhx($key, $value, $modifiers);
         $this->vars = array();
         return $value;
     }
     
-    function _getDelim($mode,$modifiers) {
-        $c = substr($modifiers,0,1);
-        if(!in_array($c, array('"', "'", '`')) ) return false;
+    function _getDelim($mode, $modifiers){
+        $c = substr($modifiers, 0, 1);
+        if (!in_array($c, array('"', "'", '`'))) return false;
         
-        $modifiers = substr($modifiers,1);
-        $closure = $mode=='(' ? "{$c})" : $c;
-        if(strpos($modifiers, $closure)===false) return false;
+        $modifiers = substr($modifiers, 1);
+        $closure = $mode == '(' ? "{$c})" : $c;
+        if (strpos($modifiers, $closure) === false) return false;
         
         return  $c;
     }
     
-    function _getOpt($mode,$delim,$modifiers) {
-        if($delim) {
-            if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+    function _getOpt($mode, $delim, $modifiers){
+        if ($delim) {
+            if ($mode == '(') return substr($modifiers, 1, strpos($modifiers, $delim.')') - 1);
             
-            return substr($modifiers,1,strpos($modifiers,$delim,1)-1);
+            return substr($modifiers, 1, strpos($modifiers, $delim, 1) - 1);
         }
         else {
-            if($mode=='(') return substr($modifiers,0,strpos($modifiers, ')') );
+            if ($mode == '(') return substr($modifiers, 0, strpos($modifiers, ')'));
             
             $chars = str_split($modifiers);
-            $opt='';
-            foreach($chars as $c) {
-                if($c==':' || $c==')') break;
-                $opt .=$c;
+            $opt = '';
+            foreach ($chars as $c) {
+                if ($c == ':' || $c == ')') break;
+                $opt .= $c;
             }
             return $opt;
         }
     }
-    function _getRemainModifiers($mode,$delim,$modifiers) {
-        if($delim) {
-            if($mode=='(')
-                return $this->_fetchContent($modifiers, $delim . ')');
+    function _getRemainModifiers($mode, $delim, $modifiers){
+        if ($delim) {
+            if ($mode == '(')
+                return $this->_fetchContent($modifiers, $delim.')');
             else {
                 $modifiers = trim($modifiers);
-                $modifiers = substr($modifiers,1);
+                $modifiers = substr($modifiers, 1);
                 return $this->_fetchContent($modifiers, $delim);
             }
         }
         else {
-            if($mode=='(') return $this->_fetchContent($modifiers, ')');
+            if ($mode == '(') return $this->_fetchContent($modifiers, ')');
             $chars = str_split($modifiers);
-            foreach($chars as $c) {
-                if($c==':') return $modifiers;
-                else $modifiers = substr($modifiers,1);
+            foreach ($chars as $c) {
+                if ($c == ':') return $modifiers;
+                else $modifiers = substr($modifiers, 1);
             }
             return $modifiers;
         }
     }
     
-    function _fetchContent($string,$delim) {
+    function _fetchContent($string, $delim){
         $len = strlen($delim);
         $string = $this->parseDocumentSource($string);
-        return substr($string,strpos($string, $delim)+$len);
+        return substr($string, strpos($string, $delim) + $len);
     }
     
-    function splitEachModifiers($modifiers) {
+    function splitEachModifiers($modifiers){
         global $modx;
         
         $cmd = '';
         $bt = '';
-        while($bt!==$modifiers) {
+        while ($bt !== $modifiers) {
             $bt = $modifiers;
-            $c = substr($modifiers,0,1);
-            $modifiers = substr($modifiers,1);
+            $c = substr($modifiers, 0, 1);
+            $modifiers = substr($modifiers, 1);
             
-            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
-                $c = substr($modifiers,strlen($match[1]),1);
+            if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+                $c = substr($modifiers, strlen($match[1]), 1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
-                if($c==='(') $modifiers = substr($modifiers,strlen($match[1])+1);
-                else         $modifiers = substr($modifiers,strlen($match[1]));
+                if ($c === '(') $modifiers = substr($modifiers, strlen($match[1]) + 1);
+                else         $modifiers = substr($modifiers, strlen($match[1]));
                 
-                $delim     = $this->_getDelim($c,$modifiers);
-                $opt       = $this->_getOpt($c,$delim,$modifiers);
-                $modifiers = trim($this->_getRemainModifiers($c,$delim,$modifiers));
+                $delim     = $this->_getDelim($c, $modifiers);
+                $opt       = $this->_getOpt($c, $delim, $modifiers);
+                $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
                 
-                $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($match[1]), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
                 $cmd = '';
             }
-            elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
-                $modifiers = substr($modifiers,strlen($match[0]));
-                $result[]=array('cmd'=>'math','opt'=>'%s'.$c.$match[0]);
+            elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+                $modifiers = substr($modifiers, strlen($match[0]));
+                $result[] = array('cmd'=>'math', 'opt'=>'%s'.$c.$match[0]);
                 $cmd = '';
             }
-            elseif($c==='(' || $c==='=') {
+            elseif ($c === '(' || $c === '=') {
                 $modifiers = $m1 = trim($modifiers);
-                $delim     = $this->_getDelim($c,$modifiers);
-                $opt       = $this->_getOpt($c,$delim,$modifiers);
-                $modifiers = trim($this->_getRemainModifiers($c,$delim,$modifiers));
+                $delim     = $this->_getDelim($c, $modifiers);
+                $opt       = $this->_getOpt($c, $delim, $modifiers);
+                $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
                 $debuginfo = "#i=1 #c=[{$c}] #delim=[{$delim}] #m1=[{$m1}] remainMdf=[{$modifiers}]";
                 
-                $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
                 
                 $cmd = '';
             }
-            elseif($c==':') {
+            elseif ($c == ':') {
                 $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]";
-                if($cmd!=='') $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                if ($cmd !== '') $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
                 
                 $cmd = '';
             }
-            elseif(trim($modifiers)=='' && trim($cmd)!=='') {
+            elseif (trim($modifiers) == '' && trim($cmd) !== '') {
                 $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]";
                 $cmd .= $c;
-                $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
                 
                 break;
             }
@@ -158,64 +158,64 @@ 
             }
         }
         
-        if(empty($result)) return array();
+        if (empty($result)) return array();
         
-        foreach($result as $i=>$a)
+        foreach ($result as $i=>$a)
         {
             $a['opt'] = $this->parseDocumentSource($a['opt']);
-            $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'],$this->placeholders);
+            $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'], $this->placeholders);
         }
         
         return $result;
     }
     
-    function parsePhx($key,$value,$modifiers)
+    function parsePhx($key, $value, $modifiers)
     {
         global $modx;
-        $cacheKey = md5(sprintf('parsePhx#%s#%s#%s',$key,$value,print_r($modifiers,true)));
-        if(isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
-        if(empty($modifiers)) return '';
+        $cacheKey = md5(sprintf('parsePhx#%s#%s#%s', $key, $value, print_r($modifiers, true)));
+        if (isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
+        if (empty($modifiers)) return '';
         
-        foreach($modifiers as $m)
+        foreach ($modifiers as $m)
         {
             $lastKey = strtolower($m['cmd']);
         }
-        $_ = explode(',',$this->condModifiers);
-        if(in_array($lastKey,$_))
+        $_ = explode(',', $this->condModifiers);
+        if (in_array($lastKey, $_))
         {
-            $modifiers[] = array('cmd'=>'then','opt'=>'1');
-            $modifiers[] = array('cmd'=>'else','opt'=>'0');
+            $modifiers[] = array('cmd'=>'then', 'opt'=>'1');
+            $modifiers[] = array('cmd'=>'else', 'opt'=>'0');
         }
         
-        foreach($modifiers as $i=>$a)
+        foreach ($modifiers as $i=>$a)
         {
-            $value = $this->Filter($key,$value, $a['cmd'], $a['opt']);
+            $value = $this->Filter($key, $value, $a['cmd'], $a['opt']);
         }
         $this->tmpCache[$cacheKey] = $value;
         return $value;
     }
     
     // Parser: modifier detection and eXtended processing if needed
-    function Filter($key, $value, $cmd, $opt='')
+    function Filter($key, $value, $cmd, $opt = '')
     {
         global $modx;
         
-        if($key==='documentObject') $value = $modx->documentIdentifier;
+        if ($key === 'documentObject') $value = $modx->documentIdentifier;
         $cmd = $this->parseDocumentSource($cmd);
-        if(preg_match('@^[1-9][/0-9]*$@',$cmd))
+        if (preg_match('@^[1-9][/0-9]*$@', $cmd))
         {
-            if(strpos($cmd,'/')!==false)
-                $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+            if (strpos($cmd, '/') !== false)
+                $cmd = $this->substr($cmd, strrpos($cmd, '/') + 1);
             $opt = $cmd;
             $cmd = 'id';
         }
         
-        if(isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
-        elseif(isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
+        if (isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
+        elseif (isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
         else                                           $this->elmName = '';
         
         $cmd = strtolower($cmd);
-        if($this->elmName!=='')
+        if ($this->elmName !== '')
             $value = $this->getValueFromElement($key, $value, $cmd, $opt);
         else
             $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
@@ -225,12 +225,12 @@ 
         return $value;
     }
     
-    function isEmpty($cmd,$value)
+    function isEmpty($cmd, $value)
     {
-        if($value!=='') return false;
+        if ($value !== '') return false;
         
-        $_ = explode(',', $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
-        if(in_array($cmd,$_)) return false;
+        $_ = explode(',', $this->condModifiers.',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
+        if (in_array($cmd, $_)) return false;
         else                  return true;
     }
     
@@ -238,7 +238,7 @@ 
     {
         global $modx;
         
-        if($this->isEmpty($cmd,$value)) return '';
+        if ($this->isEmpty($cmd, $value)) return '';
         
         $this->key = $key;
         $this->value  = $value;
@@ -249,7 +249,7 @@ 
             #####  Conditional Modifiers 
             case 'input':
             case 'if':
-                if(!$opt) return $value;
+                if (!$opt) return $value;
                 return $opt;
             case '=':
             case 'eq':
@@ -262,9 +262,9 @@ 
             case 'isnot':
             case 'isnt':
             case 'not':
-                $this->condition[] = intval($value != $opt);break;
+                $this->condition[] = intval($value != $opt); break;
             case '%':
-                $this->condition[] = intval($value%$opt==0);break;
+                $this->condition[] = intval($value % $opt == 0); break;
             case 'isempty':
                 $this->condition[] = intval(empty($value)); break;
             case 'isntempty':
@@ -274,57 +274,57 @@ 
             case 'gte':
             case 'eg':
             case 'isgte':
-                $this->condition[] = intval($value >= $opt);break;
+                $this->condition[] = intval($value >= $opt); break;
             case '<=':
             case 'lte':
             case 'el':
             case 'islte':
-                $this->condition[] = intval($value <= $opt);break;
+                $this->condition[] = intval($value <= $opt); break;
             case '>':
             case 'gt':
             case 'greaterthan':
             case 'isgreaterthan':
             case 'isgt':
-                $this->condition[] = intval($value > $opt);break;
+                $this->condition[] = intval($value > $opt); break;
             case '<':
             case 'lt':
             case 'lowerthan':
             case 'islowerthan':
             case 'islt':
-                $this->condition[] = intval($value < $opt);break;
+                $this->condition[] = intval($value < $opt); break;
             case 'find':
-                $this->condition[] = intval(strpos($value, $opt)!==false);break;
+                $this->condition[] = intval(strpos($value, $opt) !== false); break;
             case 'inarray':
             case 'in_array':
             case 'in':
                 $opt = explode(',', $opt);
-                $this->condition[] = intval(in_array($value, $opt)!==false);break;
+                $this->condition[] = intval(in_array($value, $opt) !== false); break;
             case 'wildcard_match':
             case 'wcard_match':
             case 'wildcard':
             case 'wcard':
             case 'fnmatch':
-                $this->condition[] = intval(fnmatch($opt, $value)!==false);break;
+                $this->condition[] = intval(fnmatch($opt, $value) !== false); break;
             case 'is_file':
             case 'is_dir':
             case 'file_exists':
             case 'is_readable':
             case 'is_writable':
-                if(!$opt) $path = $value;
+                if (!$opt) $path = $value;
                 else      $path = $opt;
-                if(strpos($path,MODX_MANAGER_PATH)!==false) exit('Can not read core path');
-                if(strpos($path,$modx->config['base_path'])===false) $path = ltrim($path,'/');
-                $this->condition[] = intval($cmd($path)!==false);break;
+                if (strpos($path, MODX_MANAGER_PATH) !== false) exit('Can not read core path');
+                if (strpos($path, $modx->config['base_path']) === false) $path = ltrim($path, '/');
+                $this->condition[] = intval($cmd($path) !== false); break;
             case 'is_image':
-                if(!$opt) $path = $value;
+                if (!$opt) $path = $value;
                 else      $path = $opt;
-                if(!is_file($path)) {$this->condition[]='0';break;}
+                if (!is_file($path)) {$this->condition[] = '0'; break; }
                 $_ = getimagesize($path);
-                $this->condition[] = intval($_[0]);break;
+                $this->condition[] = intval($_[0]); break;
             case 'regex':
             case 'preg':
             case 'preg_match':
-                $this->condition[] = intval(preg_match($opt,$value));break;
+                $this->condition[] = intval(preg_match($opt, $value)); break;
             case 'isinrole':
             case 'ir':
             case 'memberof':
@@ -333,50 +333,50 @@ 
                 $this->condition[] = $this->includeMdfFile('memberof');
                 break;
             case 'or':
-                $this->condition[] = '||';break;
+                $this->condition[] = '||'; break;
             case 'and':
-                $this->condition[] = '&&';break;
+                $this->condition[] = '&&'; break;
             case 'show':
             case 'this':
-                $conditional = join(' ',$this->condition);
+                $conditional = join(' ', $this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));
                 if ($isvalid) return $this->srcValue;
                 return NULL;
             case 'then':
-                $conditional = join(' ',$this->condition);
+                $conditional = join(' ', $this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));
                 if ($isvalid)  return $opt;
                 return null;
             case 'else':
-                $conditional = join(' ',$this->condition);
+                $conditional = join(' ', $this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));
                 if (!$isvalid) return $opt;
                 break;
             case 'select':
             case 'switch':
-                $raw = explode('&',$opt);
+                $raw = explode('&', $opt);
                 $map = array();
                 $c = count($raw);
-                for($m=0; $m<$c; $m++) {
-                    $mi = explode('=',$raw[$m],2);
+                for ($m = 0; $m < $c; $m++) {
+                    $mi = explode('=', $raw[$m], 2);
                     $map[$mi[0]] = $mi[1];
                 }
-                if(isset($map[$value])) return $map[$value];
+                if (isset($map[$value])) return $map[$value];
                 else                    return '';
             ##### End of Conditional Modifiers
             
             #####  Encode / Decode / Hash / Escape
             case 'htmlent':
             case 'htmlentities':
-                return htmlentities($value,ENT_QUOTES,$modx->config['modx_charset']);
+                return htmlentities($value, ENT_QUOTES, $modx->config['modx_charset']);
             case 'html_entity_decode':
             case 'decode_html':
             case 'html_decode':
-                return html_entity_decode($value,ENT_QUOTES,$modx->config['modx_charset']);
+                return html_entity_decode($value, ENT_QUOTES, $modx->config['modx_charset']);
             case 'esc':
             case 'escape':
                 $value = preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
-                return str_replace(array('[', ']', '`'),array('&#91;', '&#93;', '&#96;'),$value);
+                return str_replace(array('[', ']', '`'), array('&#91;', '&#93;', '&#96;'), $value);
             case 'sql_escape':
             case 'encode_js':
                 return $modx->db->escape($value);
@@ -386,39 +386,39 @@ 
             case 'html_encode':
                 return preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
             case 'spam_protect':
-                return str_replace(array('@','.'),array('&#64;','&#46;'),$value);
+                return str_replace(array('@', '.'), array('&#64;', '&#46;'), $value);
             case 'strip':
-                if($opt==='') $opt = ' ';
+                if ($opt === '') $opt = ' ';
                 return preg_replace('/[\n\r\t\s]+/', $opt, $value);
             case 'strip_linefeeds':
-                return str_replace(array("\n","\r"), '', $value);
+                return str_replace(array("\n", "\r"), '', $value);
             case 'notags':
             case 'strip_tags':
             case 'remove_html':
-                if($opt!=='')
+                if ($opt !== '')
                 {
                     $param = array();
-                    foreach(explode(',',$opt) as $v)
+                    foreach (explode(',', $opt) as $v)
                     {
-                        $v = trim($v,'</> ');
+                        $v = trim($v, '</> ');
                         $param[] = "<{$v}>";
                     }
-                    $params = join(',',$param);
+                    $params = join(',', $param);
                 }
                 else $params = '';
-                if(!strpos($params,'<br>')===false) {
-                    $value = preg_replace('@(<br[ /]*>)\n@','$1',$value);
-                    $value = preg_replace('@<br[ /]*>@',"\n",$value);
+                if (!strpos($params, '<br>') === false) {
+                    $value = preg_replace('@(<br[ /]*>)\n@', '$1', $value);
+                    $value = preg_replace('@<br[ /]*>@', "\n", $value);
                 }
-                return $this->strip_tags($value,$params);
+                return $this->strip_tags($value, $params);
             case 'urlencode':
             case 'url_encode':
             case 'encode_url':
                 return urlencode($value);
             case 'base64_decode':
-                if($opt!=='false') $opt = true;
+                if ($opt !== 'false') $opt = true;
                 else               $opt = false;
-                return base64_decode($value,$opt);
+                return base64_decode($value, $opt);
             case 'encode_sha1': $cmd = 'sha1';
             case 'addslashes':
             case 'urldecode':
@@ -442,18 +442,18 @@ 
             case 'upper_case':
                 return $this->strtoupper($value);
             case 'capitalize':
-                $_ = explode(' ',$value);
-                foreach($_ as $i=>$v)
+                $_ = explode(' ', $value);
+                foreach ($_ as $i=>$v)
                 {
                     $_[$i] = ucfirst($v);
                 }
-                return join(' ',$_);
+                return join(' ', $_);
             case 'zenhan':
-                if(empty($opt)) $opt='VKas';
-                return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
+                if (empty($opt)) $opt = 'VKas';
+                return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'hanzen':
-                if(empty($opt)) $opt='VKAS';
-                return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
+                if (empty($opt)) $opt = 'VKAS';
+                return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'str_shuffle':
             case 'shuffle':
                 return $this->str_shuffle($value);
@@ -467,7 +467,7 @@ 
                 return $this->strlen($value);
             case 'count_words':
                 $value = trim($value);
-                return count(preg_split('/\s+/',$value));
+                return count(preg_split('/\s+/', $value));
             case 'str_word_count':
             case 'word_count':
             case 'wordcount':
@@ -475,55 +475,55 @@ 
             case 'count_paragraphs':
                 $value = trim($value);
                 $value = preg_replace('/\r/', '', $value);
-                return count(preg_split('/\n+/',$value));
+                return count(preg_split('/\n+/', $value));
             case 'strpos':
-                if($opt!=0&&empty($opt)) return $value;
-                return $this->strpos($value,$opt);
+                if ($opt != 0 && empty($opt)) return $value;
+                return $this->strpos($value, $opt);
             case 'wordwrap':
                 // default: 70
                   $wrapat = intval($opt) ? intval($opt) : 70;
                 if (version_compare(PHP_VERSION, '5.3.0') >= 0) return $this->includeMdfFile('wordwrap');
-                else return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                else return preg_replace("@(\b\w+\b)@e", "wordwrap('\\1',\$wrapat,' ',1)", $value);
             case 'wrap_text':
-                $width = preg_match('/^[1-9][0-9]*$/',$opt) ? $opt : 70;
-                if($modx->config['manager_language']==='japanese-utf8') {
+                $width = preg_match('/^[1-9][0-9]*$/', $opt) ? $opt : 70;
+                if ($modx->config['manager_language'] === 'japanese-utf8') {
                     $chunk = array();
-                    $bt='';
-                    while($bt!=$value) {
+                    $bt = '';
+                    while ($bt != $value) {
                         $bt = $value;
-                        if($this->strlen($value)<$width) {
+                        if ($this->strlen($value) < $width) {
                             $chunk[] = $value;
                             break;
                         }
-                        $chunk[] = $this->substr($value,0,$width);
-                        $value = $this->substr($value,$width);
+                        $chunk[] = $this->substr($value, 0, $width);
+                        $value = $this->substr($value, $width);
                     }
-                    return join("\n",$chunk);
+                    return join("\n", $chunk);
                 }
                 else
-                    return wordwrap($value,$width,"\n",true);
+                    return wordwrap($value, $width, "\n", true);
             case 'substr':
-                if(empty($opt)) break;
-                if(strpos($opt,',')!==false) {
-                    list($b,$e) = explode(',',$opt,2);
-                    return $this->substr($value,$b,(int)$e);
+                if (empty($opt)) break;
+                if (strpos($opt, ',') !== false) {
+                    list($b, $e) = explode(',', $opt, 2);
+                    return $this->substr($value, $b, (int) $e);
                 }
-                else return $this->substr($value,$opt);
+                else return $this->substr($value, $opt);
             case 'limit':
             case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html
-                if(strpos($opt,'+')!==false)
-                    list($len,$str) = explode('+',$opt,2);
+                if (strpos($opt, '+') !== false)
+                    list($len, $str) = explode('+', $opt, 2);
                 else {
                     $len = $opt;
                     $str = '';
                 }
-                if($len==='') $len = 100;
-                if(abs($len) > $this->strlen($value)) $str ='';
-                if(preg_match('/^[1-9][0-9]*$/',$len)) {
-                    return $this->substr($value,0,$len) . $str;
+                if ($len === '') $len = 100;
+                if (abs($len) > $this->strlen($value)) $str = '';
+                if (preg_match('/^[1-9][0-9]*$/', $len)) {
+                    return $this->substr($value, 0, $len).$str;
                 }
-                elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
-                    return $str . $this->substr($value,$len);
+                elseif (preg_match('/^\-[1-9][0-9]*$/', $len)) {
+                    return $str.$this->substr($value, $len);
                 }
                 break;
             case 'summary':
@@ -532,81 +532,81 @@ 
                 return $this->includeMdfFile('summary');
             case 'replace':
             case 'str_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                if    (substr_count($opt, ',') ==1) $delim = ',';
-                elseif(substr_count($opt, '|') ==1) $delim = '|';
-                elseif(substr_count($opt, '=>')==1) $delim = '=>';
-                elseif(substr_count($opt, '/') ==1) $delim = '/';
+                if (empty($opt) || strpos($opt, ',') === false) break;
+                if (substr_count($opt, ',') == 1) $delim = ',';
+                elseif (substr_count($opt, '|') == 1) $delim = '|';
+                elseif (substr_count($opt, '=>') == 1) $delim = '=>';
+                elseif (substr_count($opt, '/') == 1) $delim = '/';
                 else break;
-                list($s,$r) = explode($delim,$opt);
-                if($value!=='') return str_replace($s,$r,$value);
+                list($s, $r) = explode($delim, $opt);
+                if ($value !== '') return str_replace($s, $r, $value);
                 break;
             case 'replace_to':
             case 'tpl':
-                if($value!=='') return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                if ($value !== '') return str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $value, $opt);
                 break;
             case 'eachtpl':
-                $value = explode('||',$value);
+                $value = explode('||', $value);
                 $_ = array();
-                foreach($value as $v) {
-                    $_[] = str_replace(array('[+value+]','[+output+]','{value}','%s'),$v,$opt);
+                foreach ($value as $v) {
+                    $_[] = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $v, $opt);
                 }
                 return join("\n", $_);
             case 'array_pop':
             case 'array_shift':
-                if(strpos($value,'||')!==false) $delim = '||';
+                if (strpos($value, '||') !== false) $delim = '||';
                 else                            $delim = ',';
-                return $cmd(explode($delim,$value));
+                return $cmd(explode($delim, $value));
             case 'preg_replace':
             case 'regex_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                list($s,$r) = explode(',',$opt,2);
-                if($value!=='') return preg_replace($s,$r,$value);
+                if (empty($opt) || strpos($opt, ',') === false) break;
+                list($s, $r) = explode(',', $opt, 2);
+                if ($value !== '') return preg_replace($s, $r, $value);
                 break;
             case 'cat':
             case 'concatenate':
             case '.':
-                if($value!=='') return $value . $opt;
+                if ($value !== '') return $value.$opt;
                 break;
             case 'sprintf':
             case 'string_format':
-                if($value!=='') return sprintf($opt,$value);
+                if ($value !== '') return sprintf($opt, $value);
                 break;
             case 'number_format':
-                    if($opt=='') $opt = 0;
-                    return number_format($value,$opt);
+                    if ($opt == '') $opt = 0;
+                    return number_format($value, $opt);
             case 'money_format':
-                    setlocale(LC_MONETARY,setlocale(LC_TIME,0));
-                    if($value!=='') return money_format($opt,(double)$value);
+                    setlocale(LC_MONETARY, setlocale(LC_TIME, 0));
+                    if ($value !== '') return money_format($opt, (double) $value);
                     break;
             case 'tobool':
                 return boolval($value);
             case 'nl2lf':
-                if($value!=='') return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                if ($value !== '') return str_replace(array("\r\n", "\n", "\r"), '\n', $value);
                 break;
             case 'br2nl':
                 return preg_replace('@<br[\s/]*>@i', "\n", $value);
             case 'nl2br':
                 if (version_compare(PHP_VERSION, '5.3.0', '<'))
                     return nl2br($value);
-                if($opt!=='')
+                if ($opt !== '')
                 {
                     $opt = trim($opt);
                     $opt = strtolower($opt);
-                    if($opt==='false') $opt = false;
-                    elseif($opt==='0') $opt = false;
+                    if ($opt === 'false') $opt = false;
+                    elseif ($opt === '0') $opt = false;
                     else               $opt = true;
                 }
-                elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
+                elseif (isset($modx->config['mce_element_format']) && $modx->config['mce_element_format'] === 'html')
                                        $opt = false;
                 else                   $opt = true;
-                return nl2br($value,$opt);
+                return nl2br($value, $opt);
             case 'ltrim':
             case 'rtrim':
             case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html
-                if($opt==='')
+                if ($opt === '')
                     return $cmd($value);
-                else return $cmd($value,$opt);
+                else return $cmd($value, $opt);
             // These are all straight wrappers for PHP functions
             case 'ucfirst':
             case 'lcfirst':
@@ -617,16 +617,16 @@ 
             case 'strftime':
             case 'date':
             case 'dateformat':
-                if(empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                if(strpos($opt,'%')!==false)
-                    return strftime($opt,0+$value);
+                if (empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
+                if (!preg_match('@^[0-9]+$@', $value)) $value = strtotime($value);
+                if (strpos($opt, '%') !== false)
+                    return strftime($opt, 0 + $value);
                 else
-                    return date($opt,0+$value);
+                    return date($opt, 0 + $value);
             case 'time':
-                if(empty($opt)) $opt = '%H:%M';
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                return strftime($opt,0+$value);
+                if (empty($opt)) $opt = '%H:%M';
+                if (!preg_match('@^[0-9]+$@', $value)) $value = strtotime($value);
+                return strftime($opt, 0 + $value);
             case 'strtotime':
                 return strtotime($value);
             #####  mathematical function
@@ -635,40 +635,40 @@ 
             case 'tofloat':
                 return floatval($value);
             case 'round':
-                if(!$opt) $opt = 0;
-                return $cmd($value,$opt);
+                if (!$opt) $opt = 0;
+                return $cmd($value, $opt);
             case 'max':
             case 'min':
-                return $cmd(explode(',',$value));
+                return $cmd(explode(',', $value));
             case 'floor':
             case 'ceil':
             case 'abs':
                 return $cmd($value);
             case 'math':
             case 'calc':
-                $value = (int)$value;
-                if(empty($value)) $value = '0';
-                $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'),'?',$opt);
-                $filter = preg_replace('@([a-zA-Z\n\r\t\s])@','',$filter);
-                if(strpos($filter,'?')===false) $filter = "?{$filter}";
-                $filter = str_replace('?',$value,$filter);
+                $value = (int) $value;
+                if (empty($value)) $value = '0';
+                $filter = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), '?', $opt);
+                $filter = preg_replace('@([a-zA-Z\n\r\t\s])@', '', $filter);
+                if (strpos($filter, '?') === false) $filter = "?{$filter}";
+                $filter = str_replace('?', $value, $filter);
                 return eval("return {$filter};");
             case 'count':
-                if($value=='') return 0;
-                $value = explode(',',$value);
+                if ($value == '') return 0;
+                $value = explode(',', $value);
                 return count($value);
             case 'sort':
             case 'rsort':
-                if(strpos($value,"\n")!==false) $delim="\n";
+                if (strpos($value, "\n") !== false) $delim = "\n";
                 else $delim = ',';
-                $swap = explode($delim,$value);
-                if(!$opt) $opt = SORT_REGULAR;
+                $swap = explode($delim, $value);
+                if (!$opt) $opt = SORT_REGULAR;
                 else      $opt = constant($opt);
-                $cmd($swap,$opt);
-                return join($delim,$swap);
+                $cmd($swap, $opt);
+                return join($delim, $swap);
             #####  Resource fields
             case 'id':
-                if($opt) return $this->getDocumentObject($opt,$key);
+                if ($opt) return $this->getDocumentObject($opt, $key);
                 break;
             case 'type':
             case 'contenttype':
@@ -705,36 +705,36 @@ 
             case 'privatemgr':
             case 'content_dispo':
             case 'hidemenu':
-                if($cmd==='contenttype') $cmd = 'contentType';
-                return $this->getDocumentObject($value,$cmd);
+                if ($cmd === 'contenttype') $cmd = 'contentType';
+                return $this->getDocumentObject($value, $cmd);
             case 'title':
-                $pagetitle = $this->getDocumentObject($value,'pagetitle');
-                $longtitle = $this->getDocumentObject($value,'longtitle');
+                $pagetitle = $this->getDocumentObject($value, 'pagetitle');
+                $longtitle = $this->getDocumentObject($value, 'longtitle');
                 return $longtitle ? $longtitle : $pagetitle;
             case 'shorttitle':
-                $pagetitle = $this->getDocumentObject($value,'pagetitle');
-                $menutitle = $this->getDocumentObject($value,'menutitle');
+                $pagetitle = $this->getDocumentObject($value, 'pagetitle');
+                $menutitle = $this->getDocumentObject($value, 'menutitle');
                 return $menutitle ? $menutitle : $pagetitle;
             case 'templatename':
-                $rs = $modx->db->select('templatename','[+prefix+]site_templates',"id='{$value}'");
+                $rs = $modx->db->select('templatename', '[+prefix+]site_templates', "id='{$value}'");
                 $templateName = $modx->db->getValue($rs);
                 return !$templateName ? '(blank)' : $templateName;
             case 'getfield':
-                if(!$opt) $opt = 'content';
-                return $modx->getField($opt,$value);
+                if (!$opt) $opt = 'content';
+                return $modx->getField($opt, $value);
             case 'children':
             case 'childids':
-                if($value=='') $value = 0; // 値がない場合はルートと見なす
+                if ($value == '') $value = 0; // 値がない場合はルートと見なす
                 $published = 1;
-                if($opt=='') $opt = 'page';
-                $_ = explode(',',$opt);
+                if ($opt == '') $opt = 'page';
+                $_ = explode(',', $opt);
                 $where = array();
-                foreach($_ as $opt) {
-                    switch(trim($opt)) {
+                foreach ($_ as $opt) {
+                    switch (trim($opt)) {
                         case 'page'; case '!folder'; case '!isfolder': $where[] = 'sc.isfolder=0'; break;
                         case 'folder'; case 'isfolder':                $where[] = 'sc.isfolder=1'; break;
-                        case  'menu';  case  'show_menu':              $where[] = 'sc.hidemenu=0'; break;
-                        case '!menu';  case '!show_menu':              $where[] = 'sc.hidemenu=1'; break;
+                        case  'menu'; case  'show_menu':              $where[] = 'sc.hidemenu=0'; break;
+                        case '!menu'; case '!show_menu':              $where[] = 'sc.hidemenu=1'; break;
                         case  'published':                             $published = 1; break;
                         case '!published':                             $published = 0; break;
                     }
@@ -742,69 +742,69 @@ 
                 $where = join(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach((array)$children as $child){
+                foreach ((array) $children as $child) {
                     $result[] = $child['id'];
                 }
                 return join(',', $result);
             case 'fullurl':
-                if(!is_numeric($value)) return $value;
+                if (!is_numeric($value)) return $value;
                 return $modx->makeUrl($value);
             case 'makeurl':
-                if(!is_numeric($value)) return $value;
-                if(!$opt) $opt = 'full';
-                return $modx->makeUrl($value,'','',$opt);
+                if (!is_numeric($value)) return $value;
+                if (!$opt) $opt = 'full';
+                return $modx->makeUrl($value, '', '', $opt);
                 
             #####  File system
             case 'getimageinfo':
             case 'imageinfo':
-                if(!is_file($value)) return '';
+                if (!is_file($value)) return '';
                 $_ = getimagesize($value);
-                if(!$_[0]) return '';
+                if (!$_[0]) return '';
                 $info['width']  = $_[0];
                 $info['height'] = $_[1];
-                if    ($_[0] > $_[1]) $info['aspect'] = 'landscape';
-                elseif($_[0] < $_[1]) $info['aspect'] = 'portrait';
+                if ($_[0] > $_[1]) $info['aspect'] = 'landscape';
+                elseif ($_[0] < $_[1]) $info['aspect'] = 'portrait';
                 else                  $info['aspect'] = 'square';
-                switch($_[2]) {
+                switch ($_[2]) {
                     case IMAGETYPE_GIF  : $info['type'] = 'gif'; break;
                     case IMAGETYPE_JPEG : $info['type'] = 'jpg'; break;
                     case IMAGETYPE_PNG  : $info['type'] = 'png'; break;
                     default             : $info['type'] = 'unknown';
                 }
                 $info['attrib'] = $_[3];
-                switch($opt) {
+                switch ($opt) {
                     case 'width' : return $info['width'];
                     case 'height': return $info['height'];
                     case 'aspect': return $info['aspect'];
                     case 'type'  : return $info['type'];
                     case 'attrib': return $info['attrib'];
-                    default      : return print_r($info,true);
+                    default      : return print_r($info, true);
                 }
             
             case 'file_get_contents':
             case 'readfile':
-                if(!is_file($value)) return $value;
+                if (!is_file($value)) return $value;
                 $value = realpath($value);
-                if(strpos($value,MODX_MANAGER_PATH)!==false) exit('Can not read core file');
-                $ext = strtolower(substr($value,-4));
-                if($ext==='.php') exit('Can not read php file');
-                if($ext==='.cgi') exit('Can not read cgi file');
+                if (strpos($value, MODX_MANAGER_PATH) !== false) exit('Can not read core file');
+                $ext = strtolower(substr($value, -4));
+                if ($ext === '.php') exit('Can not read php file');
+                if ($ext === '.cgi') exit('Can not read cgi file');
                 return file_get_contents($value);
             case 'filesize':
-                if($value == '') return '';
+                if ($value == '') return '';
                 $filename = $value;
                 
                 $site_url = $modx->config['site_url'];
-                if(strpos($filename,$site_url) === 0)
-                    $filename = substr($filename,0,strlen($site_url));
-                $filename = trim($filename,'/');
+                if (strpos($filename, $site_url) === 0)
+                    $filename = substr($filename, 0, strlen($site_url));
+                $filename = trim($filename, '/');
                 
-                $opt = trim($opt,'/');
-                if($opt!=='') $opt .= '/';
+                $opt = trim($opt, '/');
+                if ($opt !== '') $opt .= '/';
                 
                 $filename = MODX_BASE_PATH.$opt.$filename;
                 
-                if(is_file($filename)){
+                if (is_file($filename)) {
                     clearstatcache();
                     $size = filesize($filename);
                     return $size;
@@ -837,10 +837,10 @@ 
                 $this->opt = $cmd;
                 return $this->includeMdfFile('moduser');
             case 'userinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if (empty($opt)) $this->opt = 'username';
                 return $this->includeMdfFile('moduser');
             case 'webuserinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if (empty($opt)) $this->opt = 'username';
                 $this->value = -$value;
                 return $this->includeMdfFile('moduser');
             #####  Special functions 
@@ -851,28 +851,28 @@ 
             case 'ifnotempty':
                 if (!empty($value)) return $opt; break;
             case 'datagrid':
-                include_once(MODX_CORE_PATH . 'controls/datagrid.class.php');
+                include_once(MODX_CORE_PATH.'controls/datagrid.class.php');
                 $grd = new DataGrid();
                 $grd->ds = trim($value);
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
-                $pos = strpos($value,"\n");
-                if($pos) $_ = substr($value,0,$pos);
+                $pos = strpos($value, "\n");
+                if ($pos) $_ = substr($value, 0, $pos);
                 else $_ = $pos;
-                $grd->cdelim = strpos($_,"\t")!==false ? 'tab' : ',';
+                $grd->cdelim = strpos($_, "\t") !== false ? 'tab' : ',';
                 return $grd->render();
             case 'rotate':
             case 'evenodd':
-                if(strpos($opt,',')===false) $opt = 'odd,even';
+                if (strpos($opt, ',') === false) $opt = 'odd,even';
                 $_ = explode(',', $opt);
                 $c = count($_);
                 $i = $value + $c;
                 $i = $i % $c;
                 return $_[$i];
             case 'takeval':
-                $arr = explode(",",$opt);
+                $arr = explode(",", $opt);
                 $idx = $value;
-                if(!is_numeric($idx)) return $value;
+                if (!is_numeric($idx)) return $value;
                 return $arr[$idx];
             case 'getimage':
                 return $this->includeMdfFile('getimage');
@@ -880,17 +880,17 @@ 
                     return $modx->nicesize($value);
             case 'googlemap':
             case 'googlemaps':
-                if(empty($opt)) $opt = 'border:none;width:500px;height:350px;';
+                if (empty($opt)) $opt = 'border:none;width:500px;height:350px;';
                 $tpl = '<iframe style="[+style+]" src="https://maps.google.co.jp/maps?ll=[+value+]&output=embed&z=15"></iframe>';
                 $ph['style'] = $opt;
                 $ph['value'] = $value;
-                return $modx->parseText($tpl,$ph);
+                return $modx->parseText($tpl, $ph);
             case 'youtube':
             case 'youtube16x9':
-                if(empty($opt)) $opt = 560;
-                $h = round($opt*0.5625);
+                if (empty($opt)) $opt = 560;
+                $h = round($opt * 0.5625);
                 $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>';
-                return sprintf($tpl,$opt,$h,$value);
+                return sprintf($tpl, $opt, $h, $value);
             //case 'youtube4x3':%s*0.75＋25
             case 'setvar':
                 $modx->placeholders[$opt] = $value;
@@ -920,7 +920,7 @@ 
         return $value;
     }
 
-    function includeMdfFile($cmd) {
+    function includeMdfFile($cmd){
         global $modx;
         $key = $this->key;
         $value  = $this->value;
@@ -931,54 +931,54 @@ 
     function getValueFromElement($key, $value, $cmd, $opt)
     {
         global $modx;
-        if( isset($modx->snippetCache[$this->elmName]) )
+        if (isset($modx->snippetCache[$this->elmName]))
         {
             $php = $modx->snippetCache[$this->elmName];
         }
         else
         {
             $esc_elmName = $modx->db->escape($this->elmName);
-            $result = $modx->db->select('snippet','[+prefix+]site_snippets',"name='{$esc_elmName}'");
+            $result = $modx->db->select('snippet', '[+prefix+]site_snippets', "name='{$esc_elmName}'");
             $total = $modx->db->getRecordCount($result);
-            if($total == 1)
+            if ($total == 1)
             {
                 $row = $modx->db->getRow($result);
                 $php = $row['snippet'];
             }
-            elseif($total == 0)
+            elseif ($total == 0)
             {
                 $assets_path = MODX_BASE_PATH.'assets/';
-                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
+                if (is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
                     $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
-                elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
+                elseif (is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
                     $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
-                elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
+                elseif (is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
                     $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
                 else $modifiers_path = false;
                 
-                if($modifiers_path) {
+                if ($modifiers_path) {
                     $php = @file_get_contents($modifiers_path);
                     $php = trim($php);
-                    if(substr($php,0,5)==='<?php') $php = substr($php,6);
-                    if(substr($php,0,2)==='<?')    $php = substr($php,3);
-                    if(substr($php,-2)==='?>')     $php = substr($php,0,-2);
-                    if($this->elmName!=='')
+                    if (substr($php, 0, 5) === '<?php') $php = substr($php, 6);
+                    if (substr($php, 0, 2) === '<?')    $php = substr($php, 3);
+                    if (substr($php, -2) === '?>')     $php = substr($php, 0, -2);
+                    if ($this->elmName !== '')
                         $modx->snippetCache[$this->elmName.'Props'] = '';
                 }
                 else
                     $php = false;
             }
             else $php = false;
-            if($this->elmName!=='') $modx->snippetCache[$this->elmName]= $php;
+            if ($this->elmName !== '') $modx->snippetCache[$this->elmName] = $php;
         }
-        if($php==='') $php=false;
+        if ($php === '') $php = false;
         
-        if($php===false) $html = $modx->getChunk($this->elmName);
+        if ($php === false) $html = $modx->getChunk($this->elmName);
         else             $html = false;
 
         $self = '[+output+]';
         
-        if($php !== false)
+        if ($php !== false)
         {
             ob_start();
             $options = $opt;
@@ -991,71 +991,71 @@ 
             $this->vars['options'] = & $opt;
             $custom = eval($php);
             $msg = ob_get_contents();
-            if($value===$this->bt) $value = $msg . $custom;
+            if ($value === $this->bt) $value = $msg.$custom;
             ob_end_clean();
         }
-        elseif($html!==false && isset($value) && $value!=='')
+        elseif ($html !== false && isset($value) && $value !== '')
         {
-            $html = str_replace(array($self,'[+value+]'), $value, $html);
-            $value = str_replace(array('[+options+]','[+param+]'), $opt, $html);
+            $html = str_replace(array($self, '[+value+]'), $value, $html);
+            $value = str_replace(array('[+options+]', '[+param+]'), $opt, $html);
         }
         else return false;
         
-        if($php===false && $html===false && $value!==''
-           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false))
+        if ($php === false && $html === false && $value !== ''
+           && (strpos($cmd, '[+value+]') !== false || strpos($cmd, $self) !== false))
         {
-            $value = str_replace(array('[+value+]',$self),$value,$cmd);
+            $value = str_replace(array('[+value+]', $self), $value, $cmd);
         }
         return $value;
     }
     
-    function parseDocumentSource($content='')
+    function parseDocumentSource($content = '')
     {
         global $modx;
         
-        if(strpos($content,'[')===false && strpos($content,'{')===false) return $content;
+        if (strpos($content, '[') === false && strpos($content, '{') === false) return $content;
         
-        if(!$modx->maxParserPasses) $modx->maxParserPasses = 10;
-        $bt='';
-        $i=0;
-        while($bt!==$content)
+        if (!$modx->maxParserPasses) $modx->maxParserPasses = 10;
+        $bt = '';
+        $i = 0;
+        while ($bt !== $content)
         {
             $bt = $content;
-            if(strpos($content,'[*')!==false && $modx->documentIdentifier)
+            if (strpos($content, '[*') !== false && $modx->documentIdentifier)
                                               $content = $modx->mergeDocumentContent($content);
-            if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
-            if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
-            if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
-            if(strpos($content,'[[')!==false) $content = $modx->evalSnippets($content);
+            if (strpos($content, '[(') !== false) $content = $modx->mergeSettingsContent($content);
+            if (strpos($content, '{{') !== false) $content = $modx->mergeChunkContent($content);
+            if (strpos($content, '[!') !== false) $content = str_replace(array('[!', '!]'), array('[[', ']]'), $content);
+            if (strpos($content, '[[') !== false) $content = $modx->evalSnippets($content);
             
-            if($content===$bt)              break;
-            if($modx->maxParserPasses < $i) break;
+            if ($content === $bt)              break;
+            if ($modx->maxParserPasses < $i) break;
             $i++;
         }
         return $content;
     }
     
-    function getDocumentObject($target='',$field='pagetitle')
+    function getDocumentObject($target = '', $field = 'pagetitle')
     {
         global $modx;
         
         $target = trim($target);
-        if(empty($target)) $target = $modx->config['site_start'];
-        if(preg_match('@^[1-9][0-9]*$@',$target)) $method='id';
+        if (empty($target)) $target = $modx->config['site_start'];
+        if (preg_match('@^[1-9][0-9]*$@', $target)) $method = 'id';
         else $method = 'alias';
 
-        if(!isset($this->documentObject[$target]))
+        if (!isset($this->documentObject[$target]))
         {
-            $this->documentObject[$target] = $modx->getDocumentObject($method,$target,'direct');
+            $this->documentObject[$target] = $modx->getDocumentObject($method, $target, 'direct');
         }
         
-        if($this->documentObject[$target]['publishedon']==='0')
+        if ($this->documentObject[$target]['publishedon'] === '0')
             return '';
-        elseif(isset($this->documentObject[$target][$field]))
+        elseif (isset($this->documentObject[$target][$field]))
         {
-            if(is_array($this->documentObject[$target][$field]))
+            if (is_array($this->documentObject[$target][$field]))
             {
-                $a = $modx->getTemplateVarOutput($field,$target);
+                $a = $modx->getTemplateVarOutput($field, $target);
                 $this->documentObject[$target][$field] = $a[$field];
             }
         }
@@ -1064,8 +1064,8 @@ 
         return $this->documentObject[$target][$field];
     }
     
-    function setPlaceholders($value = '', $key = '', $path = '') {
-        if($path!=='') $key = "{$path}.{$key}";
+    function setPlaceholders($value = '', $key = '', $path = ''){
+        if ($path !== '') $key = "{$path}.{$key}";
         if (is_array($value)) {
             foreach ($value as $subkey => $subval) {
                 $this->setPlaceholders($subval, $subkey, $key);
@@ -1075,77 +1075,77 @@ 
     }
     
     // Sets a placeholder variable which can only be access by Modifiers
-    function setModifiersVariable($key, $value) {
+    function setModifiersVariable($key, $value){
         if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
     }
     
     //mbstring
-    function substr($str, $s, $l = null) {
+    function substr($str, $s, $l = null){
         global $modx;
-        if(is_null($l)) $l = $this->strlen($str);
+        if (is_null($l)) $l = $this->strlen($str);
         if (function_exists('mb_substr'))
         {
-            if(strpos($str,"\r")!==false)
-                $str = str_replace(array("\r\n","\r"), "\n", $str);
+            if (strpos($str, "\r") !== false)
+                $str = str_replace(array("\r\n", "\r"), "\n", $str);
             return mb_substr($str, $s, $l, $modx->config['modx_charset']);
         }
         return substr($str, $s, $l);
     }
-    function strpos($haystack,$needle,$offset=0) {
+    function strpos($haystack, $needle, $offset = 0){
         global $modx;
-        if (function_exists('mb_strpos')) return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
-        return strpos($haystack,$needle,$offset);
+        if (function_exists('mb_strpos')) return mb_strpos($haystack, $needle, $offset, $modx->config['modx_charset']);
+        return strpos($haystack, $needle, $offset);
     }
-    function strlen($str) {
+    function strlen($str){
         global $modx;
-        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str), $modx->config['modx_charset']);
         return strlen($str);
     }
-    function strtolower($str) {
+    function strtolower($str){
         if (function_exists('mb_strtolower')) return mb_strtolower($str);
         return strtolower($str);
     }
-    function strtoupper($str) {
+    function strtoupper($str){
         if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
         return strtoupper($str);
     }
-    function ucfirst($str) {
+    function ucfirst($str){
         if (function_exists('mb_strtoupper')) 
             return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         return ucfirst($str);
     }
-    function lcfirst($str) {
+    function lcfirst($str){
         if (function_exists('mb_strtolower')) 
             return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         return lcfirst($str);
     }
-    function ucwords($str) {
+    function ucwords($str){
         if (function_exists('mb_convert_case'))
             return mb_convert_case($str, MB_CASE_TITLE);
         return ucwords($str);
     }
-    function strrev($str) {
+    function strrev($str){
         preg_match_all('/./us', $str, $ar);
         return join(array_reverse($ar[0]));
     }
-    function str_shuffle($str) {
+    function str_shuffle($str){
         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
         return join($ar[0]);
     }
-    function str_word_count($str) {
-        return count(preg_split('~[^\p{L}\p{N}\']+~u',$str));
+    function str_word_count($str){
+        return count(preg_split('~[^\p{L}\p{N}\']+~u', $str));
     }
-    function strip_tags($value,$params='') {
+    function strip_tags($value, $params = ''){
         global $modx;
 
-        if(stripos($params,'style')===false && stripos($value,'</style>')!==false) {
+        if (stripos($params, 'style') === false && stripos($value, '</style>') !== false) {
             $value = preg_replace('@<style.*?>.*?</style>@is', '', $value);
         }
-        if(stripos($params,'script')===false && stripos($value,'</script>')!==false) {
+        if (stripos($params, 'script') === false && stripos($value, '</script>') !== false) {
             $value = preg_replace('@<script.*?>.*?</script>@is', '', $value);        
         }
   
-        return trim(strip_tags($value,$params));
+        return trim(strip_tags($value, $params));
     }
 }

manager/includes/extenders/ex_modxmailer.inc.php

Spacing +2 added lines, -2 removed lines

@@ -6,9 +6,9 @@
  * Time: 14:17
  */
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/modxmailer.class.inc.php')){
+if (!include_once(MODX_MANAGER_PATH.'includes/extenders/modxmailer.class.inc.php')) {
     return false;
-}else{
+} else {
     $this->mail = new MODxMailer;
     $this->mail->init($this);
     return true;

install/actions/action_summary.php

Spacing +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! function_exists('f_owc')){
+if (!function_exists('f_owc')) {
     /**
      * @param $path
      * @param $data
@@ -12,30 +12,30 @@ 
             fwrite($hnd, $data);
             fclose($hnd);
 
-            if(null !== $mode) chmod($path, $mode);
-        }catch(Exception $e){
+            if (null !== $mode) chmod($path, $mode);
+        } catch (Exception $e) {
             // Nothing, this is NOT normal
             unset($e);
         }
     }
 }
 
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
-if( ! isset($_lang)) $_lang = array();
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
+if (!isset($_lang)) $_lang = array();
 
 echo '<div class="stepcontainer">
       <ul class="progressbar">
-          <li class="visited">' . $_lang['choose_language'] . '</li>
-          <li class="visited">' . $_lang['installation_mode'] . '</li>
-          <li class="visited">' . $_lang['optional_items'] . '</li>
-          <li class="active">' . $_lang['preinstall_validation'] . '</li>
-          <li>' . $_lang['install_results'] . '</li>
+          <li class="visited">' . $_lang['choose_language'].'</li>
+          <li class="visited">' . $_lang['installation_mode'].'</li>
+          <li class="visited">' . $_lang['optional_items'].'</li>
+          <li class="active">' . $_lang['preinstall_validation'].'</li>
+          <li>' . $_lang['install_results'].'</li>
   </ul>
   <div class="clearleft"></div>
 </div>';
 
-echo '<h2>' . $_lang['preinstall_validation'] . '</h2>';
-echo '<h3>' . $_lang['summary_setup_check'] . '</h3>';
+echo '<h2>'.$_lang['preinstall_validation'].'</h2>';
+echo '<h3>'.$_lang['summary_setup_check'].'</h3>';
 
 $errors = 0;
 
@@ -43,73 +43,73 @@ 
 // check PHP version
 define('PHP_MIN_VERSION', '5.4.0');
 $phpMinVersion = PHP_MIN_VERSION; // Maybe not necessary. For backward compatibility
-echo '<p>' . $_lang['checking_php_version'];
+echo '<p>'.$_lang['checking_php_version'];
 // -1 if left is less, 0 if equal, +1 if left is higher
 if (version_compare(phpversion(), PHP_MIN_VERSION) < 0) {
     $errors++;
-    $tmp = $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
-    echo '<span class="notok">' . $_lang['failed'] . '</span>' . $tmp . '</p>';
+    $tmp = $_lang['you_running_php'].phpversion().str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
+    echo '<span class="notok">'.$_lang['failed'].'</span>'.$tmp.'</p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check if iconv is available
-echo '<p>' . $_lang['checking_iconv'];
+echo '<p>'.$_lang['checking_iconv'];
 $iconv = (int) function_exists('iconv');
-if ($iconv == '0'){
-    echo '<span class="notok">' . $_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
+if ($iconv == '0') {
+    echo '<span class="notok">'.$_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 // check sessions
-echo '<p>' . $_lang['checking_sessions'];
+echo '<p>'.$_lang['checking_sessions'];
 if ($_SESSION['test'] != 1) {
-    echo '<span class="notok">' . $_lang['failed'].  '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check directories
 // cache exists?
-echo '<p>' . $_lang['checking_if_cache_exist'];
+echo '<p>'.$_lang['checking_if_cache_exist'];
 if (!file_exists("../assets/cache") || !file_exists("../assets/cache/rss")) {
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache writable?
-echo '<p>' . $_lang['checking_if_cache_writable'];
+echo '<p>'.$_lang['checking_if_cache_writable'];
 if (!is_writable("../assets/cache")) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache files writable?
-echo '<p>' . $_lang['checking_if_cache_file_writable'];
+echo '<p>'.$_lang['checking_if_cache_file_writable'];
 $tmp = "../assets/cache/siteCache.idx.php";
-if ( ! file_exists($tmp)) {
+if (!file_exists($tmp)) {
     f_owc($tmp, "<?php //EVO site cache file ?>");
 }
-if ( ! is_writable($tmp)) {
+if (!is_writable($tmp)) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
     echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 echo '<p>'.$_lang['checking_if_cache_file2_writable'];
-if ( ! is_writable("../assets/cache/sitePublishing.idx.php")) {
+if (!is_writable("../assets/cache/sitePublishing.idx.php")) {
     $errors++;
     echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
@@ -119,7 +119,7 @@ 
 
 // File Browser directories exists?
 echo '<p>'.$_lang['checking_if_images_exist'];
-switch(true){
+switch (true) {
     case !file_exists("../assets/images"):
     case !file_exists("../assets/files"):
     case !file_exists("../assets/backup"):
@@ -134,7 +134,7 @@ 
 
 // File Browser directories writable?
 echo '<p>'.$_lang['checking_if_images_writable'];
-switch(true){
+switch (true) {
     case !is_writable("../assets/images"):
     case !is_writable("../assets/files"):
     case !is_writable("../assets/backup"):
@@ -194,7 +194,7 @@ 
     $database_charset = substr($database_collation, 0, strpos($database_collation, '_') - 1);
     $database_connection_charset = $_POST['database_connection_charset'];
     $database_connection_method = $_POST['database_connection_method'];
-    $dbase = '`' . $_POST['database_name'] . '`';
+    $dbase = '`'.$_POST['database_name'].'`';
     $table_prefix = $_POST['tableprefix'];
 }
 echo '<p>'.$_lang['creating_database_connection'];
@@ -234,54 +234,54 @@ 
 
 // check table prefix
 if ($conn && $installMode == 0) {
-    echo '<p>' . $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if ($rs= mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_already_inuse'] . '</p>';
+    echo '<p>'.$_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if ($rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed'].'</span></b>'.$_lang['table_prefix_already_inuse'].'</p>';
         $errors++;
-        echo "<p>" . $_lang['table_prefix_already_inuse_note'] . '</p>';
+        echo "<p>".$_lang['table_prefix_already_inuse_note'].'</p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 } elseif ($conn && $installMode == 2) {
-    echo '<p>' . $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_not_exist'] . '</p>';
+    echo '<p>'.$_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed'].'</span></b>'.$_lang['table_prefix_not_exist'].'</p>';
         $errors++;
-        echo '<p>' . $_lang['table_prefix_not_exist_note'] . '</p>';
+        echo '<p>'.$_lang['table_prefix_not_exist_note'].'</p>';
   } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
   }
 }
 
 // check mysql version
 if ($conn) {
-    echo '<p>' . $_lang['checking_mysql_version'];
-    if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
-        echo '<span class="notok">'  . $_lang['warning'] . '</span></b>&nbsp;&nbsp;<strong>' . $_lang['mysql_5051'] . '</strong></p>';
-        echo '<p><span class="notok">' . $_lang['mysql_5051_warning'] . '</span></p>';
+    echo '<p>'.$_lang['checking_mysql_version'];
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
+        echo '<span class="notok">'.$_lang['warning'].'</span></b>&nbsp;&nbsp;<strong>'.$_lang['mysql_5051'].'</strong></p>';
+        echo '<p><span class="notok">'.$_lang['mysql_5051_warning'].'</span></p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span>&nbsp;&nbsp;<strong>' . $_lang['mysql_version_is'] . mysqli_get_server_info($conn) . '</strong></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span>&nbsp;&nbsp;<strong>'.$_lang['mysql_version_is'].mysqli_get_server_info($conn).'</strong></p>';
     }
 }
 
 // check for strict mode
 if ($conn) {
-    echo '<p>'. $_lang['checking_mysql_strict_mode'];
+    echo '<p>'.$_lang['checking_mysql_strict_mode'];
     $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode");
-    if (mysqli_num_rows($mysqlmode) > 0){
+    if (mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         //$modes = array("STRICT_TRANS_TABLES"); // for testing
         // print_r($modes);
         foreach ($modes as $mode) {
             if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
-                echo '<span class="notok">' . $_lang['warning'] . '</span></b> <strong>&nbsp;&nbsp;' . $_lang['strict_mode'] . '</strong></p>';
-                echo '<p><span class="notok">' . $_lang['strict_mode_error'] . '</span></p>';
+                echo '<span class="notok">'.$_lang['warning'].'</span></b> <strong>&nbsp;&nbsp;'.$_lang['strict_mode'].'</strong></p>';
+                echo '<p><span class="notok">'.$_lang['strict_mode_error'].'</span></p>';
             } else {
-                echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+                echo '<span class="ok">'.$_lang['ok'].'</span></p>';
             }
         }
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 }
 // Version and strict mode check end
@@ -297,18 +297,18 @@ 
     f_owc("../assets/cache/installProc.inc.php", '<?php $installStartTime = '.time().'; ?>');
 }
 
-if($installMode > 0 && $_POST['installdata'] == "1") {
-    echo '<p class="notes"><strong>' . $_lang['sample_web_site'] . ':</strong> ' . $_lang['sample_web_site_note'] . '</p>';
+if ($installMode > 0 && $_POST['installdata'] == "1") {
+    echo '<p class="notes"><strong>'.$_lang['sample_web_site'].':</strong> '.$_lang['sample_web_site_note'].'</p>';
 }
 
 if ($errors > 0) {
     echo '<p>';
-    echo $_lang['setup_cannot_continue'] . ' ';
+    echo $_lang['setup_cannot_continue'].' ';
 
-    if($errors > 1){
-        echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
-    }else{
-        echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again'];
+    if ($errors > 1) {
+        echo $errors." ".$_lang['errors'].$_lang['please_correct_errors'].$_lang['and_try_again_plural'];
+    } else {
+        echo $_lang['error'].$_lang['please_correct_error'].$_lang['and_try_again'];
     }
 
     echo $_lang['visit_forum'];
@@ -317,10 +317,10 @@ 
 
 echo '<p>&nbsp;</p>';
 
-$nextAction= $errors > 0 ? 'summary' : 'install';
-$nextButton= $errors > 0 ? $_lang['retry'] : $_lang['install'];
-$nextVisibility= $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
-$agreeToggle= $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
+$nextAction = $errors > 0 ? 'summary' : 'install';
+$nextButton = $errors > 0 ? $_lang['retry'] : $_lang['install'];
+$nextVisibility = $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
+$agreeToggle = $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
 ?>
 <form name="install" id="install_form" action="index.php?action=<?php echo $nextAction ?>" method="post">
   <div>
@@ -342,32 +342,32 @@ 
 
     <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" />
 <?php
-    $templates = isset ($_POST['template']) ? $_POST['template'] : array ();
+    $templates = isset ($_POST['template']) ? $_POST['template'] : array();
     foreach ($templates as $i => $template) echo '<input type="hidden" name="template[]" value="'.$template.'" />';
 
-    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
+    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array();
     foreach ($tvs as $i => $tv) echo '<input type="hidden" name="tv[]" value="'.$tv.'" />';
 
-    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
+    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array();
     foreach ($chunks as $i => $chunk) echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />';
 
-    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
+    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array();
     foreach ($snippets as $i => $snippet) echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />';
 
-    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
+    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array();
     foreach ($plugins as $i => $plugin) echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />';
 
-    $modules = isset ($_POST['module']) ? $_POST['module'] : array ();
+    $modules = isset ($_POST['module']) ? $_POST['module'] : array();
     foreach ($modules as $i => $module) echo '<input type="hidden" name="module[]" value="'.$module.'" />';
 ?>
 </div>
 
-<h2><?php echo $_lang['agree_to_terms'];?></h2>
+<h2><?php echo $_lang['agree_to_terms']; ?></h2>
 <p>
-<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ':""; ?><?php echo $agreeToggle;?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
+<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ' : ""; ?><?php echo $agreeToggle; ?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
 </p>
     <p class="buttonlinks">
         <a href="javascript:document.getElementById('install_form').action='index.php?action=options&language=<?php echo $install_language?>';document.getElementById('install_form').submit();" class="prev" title="<?php echo $_lang['btnback_value']?>"><span><?php echo $_lang['btnback_value']?></span></a>
-        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility;?>"><span><?php echo $nextButton ?></span></a>
+        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility; ?>"><span><?php echo $nextButton ?></span></a>
     </p>
 </form>

install/actions/action_mode.php

Spacing +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 // Determine upgradeability
 $upgradeable = 0;
-if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity
-    include $base_path . MGR_DIR . '/includes/config.inc.php';
+if (is_file($base_path.MGR_DIR.'/includes/config.inc.php')) { // 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 - tho prefix may be empty so we have to ignore it
     if (isset($dbase)) {
         if (!$conn = @mysqli_connect($database_server, $database_user, $database_password))
@@ -17,16 +17,16 @@ 
 }
 
 $ph['moduleName']       = $moduleName;
-$ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';
-$ph['displayUpg']       = ($upgradeable==0) ? 'display:none;' : '';
+$ph['displayNew']       = ($upgradeable != 0) ? 'display:none;' : '';
+$ph['displayUpg']       = ($upgradeable == 0) ? 'display:none;' : '';
 $ph['displayAdvUpg']    = $ph['displayUpg'];
-$ph['checkedNew']       = !$upgradeable     ? 'checked' : '';
-$ph['checkedUpg']       = ($_POST['installmode']==1 || $upgradeable==1) ? 'checked' : '';
-$ph['checkedAdvUpg']    = ($_POST['installmode']==2 || $upgradeable==2) ? 'checked' : '';
+$ph['checkedNew']       = !$upgradeable ? 'checked' : '';
+$ph['checkedUpg']       = ($_POST['installmode'] == 1 || $upgradeable == 1) ? 'checked' : '';
+$ph['checkedAdvUpg']    = ($_POST['installmode'] == 2 || $upgradeable == 2) ? 'checked' : '';
 $ph['install_language'] = $install_language;
-$ph['disabledUpg']      = ($upgradeable!=1) ? 'disabled' : '';
-$ph['disabledAdvUpg']   = ($upgradeable==0) ? 'disabled' : '';
+$ph['disabledUpg']      = ($upgradeable != 1) ? 'disabled' : '';
+$ph['disabledAdvUpg']   = ($upgradeable == 0) ? 'disabled' : '';
 
-$tpl = file_get_contents($base_path . 'install/actions/tpl_mode.html');
+$tpl = file_get_contents($base_path.'install/actions/tpl_mode.html');
 $content = parse($tpl, $ph);
-echo parse($content, $_lang,'[%','%]');
+echo parse($content, $_lang, '[%', '%]');

manager/includes/extenders/maketable.class.php

Spacing +124 added lines, -124 removed lines

@@ -8,7 +8,7 @@ 
  *
  * @author Jason Coward <jason@opengeek.com> (MODX)
  */
-class MakeTable {
+class MakeTable{
 	var $actionField;
 	var $cellAction;
 	var $linkAction;
@@ -31,26 +31,26 @@ 
 	var $columnWidths;
 	var $selectedValues;
 
-	function __construct() {
-		$this->fieldHeaders= array();
-		$this->excludeFields= array();
-		$this->actionField= '';
-		$this->cellAction= '';
-		$this->linkAction= '';
-		$this->tableWidth= '';
-		$this->tableClass= '';
-		$this->rowHeaderClass= '';
-		$this->columnHeaderClass= '';
-		$this->rowRegularClass= '';
-		$this->rowAlternateClass= 'alt';
-		$this->formName= 'tableForm';
-		$this->formAction= '[~[*id*]~]';
-		$this->formElementName= '';
-		$this->formElementType= '';
-		$this->rowAlternatingScheme= 'EVEN';
-		$this->allOption= 0;
-		$this->selectedValues= array();
-		$this->extra= '';
+	function __construct(){
+		$this->fieldHeaders = array();
+		$this->excludeFields = array();
+		$this->actionField = '';
+		$this->cellAction = '';
+		$this->linkAction = '';
+		$this->tableWidth = '';
+		$this->tableClass = '';
+		$this->rowHeaderClass = '';
+		$this->columnHeaderClass = '';
+		$this->rowRegularClass = '';
+		$this->rowAlternateClass = 'alt';
+		$this->formName = 'tableForm';
+		$this->formAction = '[~[*id*]~]';
+		$this->formElementName = '';
+		$this->formElementType = '';
+		$this->rowAlternatingScheme = 'EVEN';
+		$this->allOption = 0;
+		$this->selectedValues = array();
+		$this->extra = '';
 	}
 
 	/**
@@ -58,8 +58,8 @@ 
 	 *
 	 * @param $value A URL to execute when table cells are clicked.
 	 */
-	function setCellAction($value) {
-		$this->cellAction= $this->prepareLink($value);
+	function setCellAction($value){
+		$this->cellAction = $this->prepareLink($value);
 	}
 
 	/**
@@ -67,8 +67,8 @@ 
 	 *
 	 * @param $value A URL to execute when text within table cells are clicked.
 	 */
-	function setLinkAction($value) {
-		$this->linkAction= $this->prepareLink($value);
+	function setLinkAction($value){
+		$this->linkAction = $this->prepareLink($value);
 	}
 
 	/**
@@ -76,8 +76,8 @@ 
 	 *
 	 * @param $value A valid width attribute for the HTML TABLE tag
 	 */
-	function setTableWidth($value) {
-		$this->tableWidth= $value;
+	function setTableWidth($value){
+		$this->tableWidth = $value;
 	}
 
 	/**
@@ -85,8 +85,8 @@ 
 	 *
 	 * @param $value A class for the main HTML TABLE.
 	 */
-	function setTableClass($value) {
-		$this->tableClass= $value;
+	function setTableClass($value){
+		$this->tableClass = $value;
 	}
 
 	/**
@@ -94,8 +94,8 @@ 
 	 *
 	 * @param $value A class for the main HTML TABLE.
 	 */
-	function setTableID($value) {
-		$this->tableID= $value;
+	function setTableID($value){
+		$this->tableID = $value;
 	}
 
 	/**
@@ -103,8 +103,8 @@ 
 	 *
 	 * @param $value A class for the table header row.
 	 */
-	function setRowHeaderClass($value) {
-		$this->rowHeaderClass= $value;
+	function setRowHeaderClass($value){
+		$this->rowHeaderClass = $value;
 	}
 
 		/**
@@ -112,8 +112,8 @@ 
 	 *
 	 * @param $value A class for the table header row.
 	 */
-	function setThHeaderClass($value) {
-		$this->thClass= $value;
+	function setThHeaderClass($value){
+		$this->thClass = $value;
 	}
 
 	/**
@@ -121,8 +121,8 @@ 
 	 *
 	 * @param $value A class for the column header row.
 	 */
-	function setColumnHeaderClass($value) {
-		$this->columnHeaderClass= $value;
+	function setColumnHeaderClass($value){
+		$this->columnHeaderClass = $value;
 	}
 
 	/**
@@ -130,8 +130,8 @@ 
 	 *
 	 * @param $value A class for regular table rows.
 	 */
-	function setRowRegularClass($value) {
-		$this->rowRegularClass= $value;
+	function setRowRegularClass($value){
+		$this->rowRegularClass = $value;
 	}
 
 	/**
@@ -139,8 +139,8 @@ 
 	 *
 	 * @param $value A class for alternate table rows.
 	 */
-	function setRowAlternateClass($value) {
-		$this->rowAlternateClass= $value;
+	function setRowAlternateClass($value){
+		$this->rowAlternateClass = $value;
 	}
 
 	/**
@@ -148,8 +148,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-	function setFormElementType($value) {
-		$this->formElementType= $value;
+	function setFormElementType($value){
+		$this->formElementType = $value;
 	}
 
 	/**
@@ -157,8 +157,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element name attribute.
 	 */
-	function setFormElementName($value) {
-		$this->formElementName= $value;
+	function setFormElementName($value){
+		$this->formElementName = $value;
 	}
 
 	/**
@@ -167,8 +167,8 @@ 
 	 *
 	 * @param $value Indicates the FORM name attribute.
 	 */
-	function setFormName($value) {
-		$this->formName= $value;
+	function setFormName($value){
+		$this->formName = $value;
 	}
 
 	/**
@@ -176,8 +176,8 @@ 
 	 *
 	 * @param $value Indicates the FORM action attribute.
 	 */
-	function setFormAction($value) {
-		$this->formAction= $value;
+	function setFormAction($value){
+		$this->formAction = $value;
 	}
 
 	/**
@@ -185,8 +185,8 @@ 
 	 *
 	 * @param $value An Array of field keys to exclude from the table.
 	 */
-	function setExcludeFields($value) {
-		$this->excludeFields= $value;
+	function setExcludeFields($value){
+		$this->excludeFields = $value;
 	}
 
 	/**
@@ -194,8 +194,8 @@ 
 	 *
 	 * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
 	 */
-	function setRowAlternatingScheme($value) {
-		$this->rowAlternatingScheme= $value;
+	function setRowAlternatingScheme($value){
+		$this->rowAlternatingScheme = $value;
 	}
 
 	/**
@@ -204,8 +204,8 @@ 
 	 *
 	 * @param $value The key of the field to add as a query string parameter.
 	 */
-	function setActionFieldName($value) {
-		$this->actionField= $value;
+	function setActionFieldName($value){
+		$this->actionField = $value;
 	}
 
 	/**
@@ -214,8 +214,8 @@ 
 	 * @param $value An Array of column widths in the order of the keys in the
 	 * 			source table array.
 	 */
-	function setColumnWidths($widthArray) {
-		$this->columnWidths= $widthArray;
+	function setColumnWidths($widthArray){
+		$this->columnWidths = $widthArray;
 	}
 
 	/**
@@ -223,8 +223,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-	function setSelectedValues($valueArray) {
-		$this->selectedValues= $valueArray;
+	function setSelectedValues($valueArray){
+		$this->selectedValues = $valueArray;
 	}
 
 	/**
@@ -233,8 +233,8 @@ 
 	 *
 	 * @param $value A string of additional content.
 	 */
-	function setExtra($value) {
-		$this->extra= $value;
+	function setExtra($value){
+		$this->extra = $value;
 	}
 
 	/**
@@ -242,10 +242,10 @@ 
 	 *
 	 * @param $columnPosition The index of the column to get the width for.
 	 */
-	function getColumnWidth($columnPosition) {
-		$currentWidth= '';
+	function getColumnWidth($columnPosition){
+		$currentWidth = '';
 		if (is_array($this->columnWidths)) {
-			$currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
+			$currentWidth = $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
 		}
 		return $currentWidth;
 	}
@@ -255,19 +255,19 @@ 
 	 *
 	 * @param $value The position of the current row being rendered.
 	 */
-	function determineRowClass($position) {
+	function determineRowClass($position){
 		switch ($this->rowAlternatingScheme) {
 			case 'ODD' :
-				$modRemainder= 1;
+				$modRemainder = 1;
 				break;
 			case 'EVEN' :
-				$modRemainder= 0;
+				$modRemainder = 0;
 				break;
 		}
 		if ($position % 2 == $modRemainder) {
-			$currentClass= $this->rowRegularClass;
+			$currentClass = $this->rowRegularClass;
 		} else {
-			$currentClass= $this->rowAlternateClass;
+			$currentClass = $this->rowAlternateClass;
 		}
 		return ' class="'.$currentClass.'"';
 	}
@@ -278,9 +278,9 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-	function getCellAction($currentActionFieldValue) {
+	function getCellAction($currentActionFieldValue){
 		if ($this->cellAction) {
-			$cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
+			$cellAction = ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
 		}
 		return $cellAction;
 	}
@@ -291,10 +291,10 @@ 
 	 * @param $currentActionFieldValue The value to be applied to the link action.
 	 * @param $value The value of the cell.
 	 */
-	function createCellText($currentActionFieldValue, $value) {
+	function createCellText($currentActionFieldValue, $value){
 		$cell .= $value;
 		if ($this->linkAction) {
-			$cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
+			$cell = '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
 		}
 		return $cell;
 	}
@@ -303,8 +303,8 @@ 
 	 * Sets an option to generate a check all link when checkbox is indicated
 	 * as the table formElementType.
 	 */
-	function setAllOption() {
-		$this->allOption= 1;
+	function setAllOption(){
+		$this->allOption = 1;
 	}
 
 	/**
@@ -312,11 +312,11 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-	function prepareLink($link) {
+	function prepareLink($link){
 		if (strstr($link, '?')) {
-			$end= '&';
+			$end = '&';
 		} else {
-			$end= '?';
+			$end = '?';
 		}
 		return $link.$end;
 	}
@@ -331,20 +331,20 @@ 
 	 * the $fieldsArray where the values represent the alt heading content
 	 * for each column.
 	 */
-	function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") {
+	function create($fieldsArray, $fieldHeadersArray = array(), $linkpage = ""){
 	global $_lang;
 		if (is_array($fieldsArray)) {
-			$i= 0;
+			$i = 0;
 			foreach ($fieldsArray as $fieldName => $fieldValue) {
 				$table .= "\t<tr".$this->determineRowClass($i).">\n";
-				$currentActionFieldValue= $fieldValue[$this->actionField];
+				$currentActionFieldValue = $fieldValue[$this->actionField];
 				if (is_array($this->selectedValues)) {
-					$isChecked= array_search($currentActionFieldValue, $this->selectedValues)===false? 0 : 1;
+					$isChecked = array_search($currentActionFieldValue, $this->selectedValues) === false ? 0 : 1;
 				} else {
-					$isChecked= false;
+					$isChecked = false;
 				}
 				$table .= $this->addFormField($currentActionFieldValue, $isChecked);
-				$colPosition= 0;
+				$colPosition = 0;
 				foreach ($fieldValue as $key => $value) {
 					if (!in_array($key, $this->excludeFields)) {
 						$table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
@@ -352,20 +352,20 @@ 
 						$table .= "</td>\n";
 						if ($i == 0) {
 							if (empty ($header) && $this->formElementType) {
-								$header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">". ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
+								$header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">".($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
 							}
-							$headerText= array_key_exists($key, $fieldHeadersArray)? $fieldHeadersArray[$key]: $key;
+							$headerText = array_key_exists($key, $fieldHeadersArray) ? $fieldHeadersArray[$key] : $key;
 							$header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
 						}
-						$colPosition ++;
+						$colPosition++;
 					}
 				}
-				$i ++;
+				$i++;
 				$table .= "\t</tr>\n";
 			}
-			$table= "\n".'<table'. ($this->tableWidth ? ' width="'.$this->tableWidth.'"' : ''). ($this->tableClass ? ' class="'.$this->tableClass.'"' : ''). ($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n". ($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
+			$table = "\n".'<table'.($this->tableWidth ? ' width="'.$this->tableWidth.'"' : '').($this->tableClass ? ' class="'.$this->tableClass.'"' : '').($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n".($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
 			if ($this->formElementType) {
-				$table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
+				$table = "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
 			}
 			if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
 				/* commented this part because of cookie
@@ -400,9 +400,9 @@ 
 			}
 			if ($this->formElementType) {
 				if ($this->extra) {
-					$table.= "\n".$this->extra."\n";
+					$table .= "\n".$this->extra."\n";
 				}
-				$table.= "\n".'</form>'."\n";
+				$table .= "\n".'</form>'."\n";
 			}
 			return $table;
 		}
@@ -414,36 +414,36 @@ 
 	 * @param $numRecords The number of records to show per page.
 	 * @param $qs An optional query string to be appended to the paging links
 	 */
-	function createPagingNavigation($numRecords, $qs='') {
+	function createPagingNavigation($numRecords, $qs = ''){
 		global $_lang;
-		$currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
-		$numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
+		$currentPage = (is_numeric($_GET['page']) ? $_GET['page'] : 1);
+		$numPages = ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
 		if ($numPages > 1) {
-			$currentURL= empty($qs)? '': '?'.$qs;
+			$currentURL = empty($qs) ? '' : '?'.$qs;
 			if ($currentPage > 6) {
 				$nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
 			}
 			if ($currentPage != 1) {
-				$nav .= $this->createPageLink($currentURL, $currentPage -1, '&lt;&lt;');
+				$nav .= $this->createPageLink($currentURL, $currentPage - 1, '&lt;&lt;');
 			}
-			$offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
-			$i= 1;
+			$offset = -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
+			$i = 1;
 			while ($i < 10 && ($currentPage + $offset <= $numPages)) {
 				if ($currentPage == $currentPage + $offset)
 					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
 				else
 					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
-				$i ++;
-				$offset ++;
+				$i++;
+				$offset++;
 			}
 			if ($currentPage < $numPages) {
-				$nav .= $this->createPageLink($currentURL, $currentPage +1, '&gt;&gt;');
+				$nav .= $this->createPageLink($currentURL, $currentPage + 1, '&gt;&gt;');
 			}
 			if ($currentPage != $numPages) {
 				$nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
 			}
 		}
-		$this->pageNav= ' '.$nav;
+		$this->pageNav = ' '.$nav;
 	}
 
 	/**
@@ -455,13 +455,13 @@ 
 	 * @param $currentPage Indicates if the link is to the current page.
 	 * @param $qs And optional query string to be appended to the link.
 	 */
-	function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') {
+	function createPageLink($link = '', $pageNum, $displayText, $currentPage = false, $qs = ''){
 		global $modx;
-		$orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
-		$orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
-		if (!empty($qs)) $qs= "?$qs";
-		$link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
-		$nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
+		$orderBy = !empty($_GET['orderby']) ? '&orderby='.$_GET['orderby'] : '';
+		$orderDir = !empty($_GET['orderdir']) ? '&orderdir='.$_GET['orderdir'] : '';
+		if (!empty($qs)) $qs = "?$qs";
+		$link = empty($link) ? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs."page=$pageNum$orderBy$orderDir") : $this->prepareLink($link)."page=$pageNum";
+		$nav .= '<li'.($currentPage ? ' class="currentPage"' : '').'><a'.($currentPage ? ' class="currentPage"' : '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
 		return $nav;
 	}
 
@@ -472,10 +472,10 @@ 
 	 * @param $isChecked Indicates if the checked attribute should apply to the
 	 * element.
 	 */
-	function addFormField($value, $isChecked) {
+	function addFormField($value, $isChecked){
 		if ($this->formElementType) {
-			$checked= $isChecked? "checked ": "";
-			$field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
+			$checked = $isChecked ? "checked " : "";
+			$field = "\t\t".'<td><input type="'.$this->formElementType.'" name="'.($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
 		}
 		return $field;
 	}
@@ -484,9 +484,9 @@ 
 	 * Generates the proper LIMIT clause for queries to retrieve paged results in
 	 * a MakeTable $fieldsArray.
 	 */
-	function handlePaging() {
-		$offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
-		$limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
+	function handlePaging(){
+		$offset = (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
+		$limitClause = ' LIMIT '.($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
 		return $limitClause;
 	}
 
@@ -496,12 +496,12 @@ 
 	 *
 	 * @param $natural_order If true, the results are returned in natural order.
 	 */
-	function handleSorting($natural_order=false) {
-		$orderByClause= '';
+	function handleSorting($natural_order = false){
+		$orderByClause = '';
 		if (!$natural_order) {
-			$orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
-			$orderdir= !empty($_GET['orderdir'])? $_GET['orderdir']: "DESC";
-			$orderbyClause= !empty($orderby)? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ': "";
+			$orderby = !empty($_GET['orderby']) ? $_GET['orderby'] : "id";
+			$orderdir = !empty($_GET['orderdir']) ? $_GET['orderdir'] : "DESC";
+			$orderbyClause = !empty($orderby) ? ' ORDER BY '.$orderby.' '.$orderdir.' ' : "";
 		}
 		return $orderbyClause;
 	}
@@ -514,15 +514,15 @@ 
 	 * @param $text The text for the link (e.g. table column header).
 	 * @param $qs An optional query string to append to the order by link.
 	 */
-	function prepareOrderByLink($key, $text, $qs='') {
+	function prepareOrderByLink($key, $text, $qs = ''){
 		global $modx;
 		if (!empty($_GET['orderdir'])) {
-			$orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
+			$orderDir = strtolower($_GET['orderdir']) == 'desc' ? '&orderdir=asc' : '&orderdir=desc';
 		} else {
-			$orderDir= '&orderdir=asc';
+			$orderDir = '&orderdir=asc';
 		}
 		if (!empty($qs)) {
-			if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
+			if (!strrpos($qs, '&') == strlen($qs) - 1) $qs .= '&';
 		}
 		return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
 	}

manager/media/rss/rss_cache.inc

Spacing +48 added lines, -48 removed lines

@@ -16,27 +16,27 @@ 
  *
  */
 
-class RSSCache {
-    var $BASE_CACHE = './cache';    // where the cache files are stored
-    var $MAX_AGE    = 3600;         // when are files stale, default one hour
-    var $ERROR      = "";           // accumulate error messages
+class RSSCache{
+    var $BASE_CACHE = './cache'; // where the cache files are stored
+    var $MAX_AGE    = 3600; // when are files stale, default one hour
+    var $ERROR      = ""; // accumulate error messages
 
-    function __construct($base='', $age='') {
-        if ( $base ) {
+    function __construct($base = '', $age = ''){
+        if ($base) {
             $this->BASE_CACHE = $base;
         }
-        if ( $age ) {
+        if ($age) {
             $this->MAX_AGE = $age;
         }
 
         // attempt to make the cache directory
-        if ( ! file_exists( $this->BASE_CACHE ) ) {
-            $status = @mkdir( $this->BASE_CACHE, 0755 );
+        if (!file_exists($this->BASE_CACHE)) {
+            $status = @mkdir($this->BASE_CACHE, 0755);
 
             // if make failed
-            if ( ! $status ) {
+            if (!$status) {
                 $this->error(
-                    "Cache couldn't make dir '" . $this->BASE_CACHE . "'."
+                    "Cache couldn't make dir '".$this->BASE_CACHE."'."
                 );
             }
         }
@@ -48,12 +48,12 @@ 
     Input:      url from wich the rss file was fetched
     Output:     true on sucess
 \*=======================================================================*/
-    function set ($url, $rss) {
+    function set($url, $rss){
         $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
-        $fp = @fopen( $cache_file, 'w' );
+        $cache_file = $this->file_name($url);
+        $fp = @fopen($cache_file, 'w');
 
-        if ( ! $fp ) {
+        if (!$fp) {
             $this->error(
                 "Cache unable to open file for writing: $cache_file"
             );
@@ -61,9 +61,9 @@ 
         }
 
 
-        $data = $this->serialize( $rss );
-        fwrite( $fp, $data );
-        fclose( $fp );
+        $data = $this->serialize($rss);
+        fwrite($fp, $data);
+        fclose($fp);
 
         return $cache_file;
     }
@@ -74,11 +74,11 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS
 \*=======================================================================*/
-    function get ($url) {
+    function get($url){
         $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
+        $cache_file = $this->file_name($url);
 
-        if ( ! file_exists( $cache_file ) ) {
+        if (!file_exists($cache_file)) {
             $this->debug(
                 "Cache doesn't contain: $url (cache file: $cache_file)"
             );
@@ -86,16 +86,16 @@ 
         }
 
         $fp = @fopen($cache_file, 'r');
-        if ( ! $fp ) {
+        if (!$fp) {
             $this->error(
                 "Failed to open cache file for reading: $cache_file"
             );
             return 0;
         }
 
-        if ($filesize = filesize($cache_file) ) {
-        	$data = fread( $fp, filesize($cache_file) );
-        	$rss = $this->unserialize( $data );
+        if ($filesize = filesize($cache_file)) {
+        	$data = fread($fp, filesize($cache_file));
+        	$rss = $this->unserialize($data);
 
         	return $rss;
     	}
@@ -110,16 +110,16 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS
 \*=======================================================================*/
-    function check_cache ( $url ) {
+    function check_cache($url){
         $this->ERROR = "";
-        $filename = $this->file_name( $url );
+        $filename = $this->file_name($url);
 
-        if ( file_exists( $filename ) ) {
+        if (file_exists($filename)) {
             // find how long ago the file was added to the cache
             // and whether that is longer then MAX_AGE
-            $mtime = filemtime( $filename );
+            $mtime = filemtime($filename);
             $age = time() - $mtime;
-            if ( $this->MAX_AGE > $age ) {
+            if ($this->MAX_AGE > $age) {
                 // object exists and is current
                 return 'HIT';
             }
@@ -134,10 +134,10 @@ 
         }
     }
 
-	function cache_age( $cache_key ) {
-		$filename = $this->file_name( $url );
-		if ( file_exists( $filename ) ) {
-			$mtime = filemtime( $filename );
+	function cache_age($cache_key){
+		$filename = $this->file_name($url);
+		if (file_exists($filename)) {
+			$mtime = filemtime($filename);
             $age = time() - $mtime;
 			return $age;
 		}
@@ -149,15 +149,15 @@ 
 /*=======================================================================*\
     Function:   serialize
 \*=======================================================================*/
-    function serialize ( $rss ) {
-        return serialize( $rss );
+    function serialize($rss){
+        return serialize($rss);
     }
 
 /*=======================================================================*\
     Function:   unserialize
 \*=======================================================================*/
-    function unserialize ( $data ) {
-        return unserialize( $data );
+    function unserialize($data){
+        return unserialize($data);
     }
 
 /*=======================================================================*\
@@ -166,31 +166,31 @@ 
     Input:      url from wich the rss file was fetched
     Output:     a file name
 \*=======================================================================*/
-    function file_name ($url) {
-        $filename = md5( $url );
-        return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
+    function file_name($url){
+        $filename = md5($url);
+        return join(DIRECTORY_SEPARATOR, array($this->BASE_CACHE, $filename));
     }
 
 /*=======================================================================*\
     Function:   error
     Purpose:    register error
 \*=======================================================================*/
-    function error ($errormsg, $lvl=E_USER_WARNING) {
+    function error($errormsg, $lvl = E_USER_WARNING){
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) {
+        if (isset($php_errormsg)) {
             $errormsg .= " ($php_errormsg)";
         }
         $this->ERROR = $errormsg;
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);
+        if (MAGPIE_DEBUG) {
+            trigger_error($errormsg, $lvl);
         }
         else {
-            error_log( $errormsg, 0);
+            error_log($errormsg, 0);
         }
     }
 
-    function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-        if ( MAGPIE_DEBUG ) {
+    function debug($debugmsg, $lvl = E_USER_NOTICE){
+        if (MAGPIE_DEBUG) {
             $this->error("MagpieRSS [debug] $debugmsg", $lvl);
         }
     }

manager/media/rss/rss_utils.inc

Spacing +12 added lines, -12 removed lines

@@ -22,35 +22,35 @@
     NOTE: http://www.w3.org/TR/NOTE-datetime
 \*======================================================================*/
 
-function parse_w3cdtf ( $date_str ) {
+function parse_w3cdtf($date_str){
 
     # regex to match wc3dtf
     $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
 
-    if ( preg_match( $pat, $date_str, $match ) ) {
-        list( $year, $month, $day, $hours, $minutes, $seconds) =
-            array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
+    if (preg_match($pat, $date_str, $match)) {
+        list($year, $month, $day, $hours, $minutes, $seconds) =
+            array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
 
         # calc epoch for current date assuming GMT
-        $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+        $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
 
         $offset = 0;
-        if ( $match[10] == 'Z' ) {
+        if ($match[10] == 'Z') {
             # zulu time, aka GMT
         }
         else {
-            list( $tz_mod, $tz_hour, $tz_min ) =
-                array( $match[8], $match[9], $match[10]);
+            list($tz_mod, $tz_hour, $tz_min) =
+                array($match[8], $match[9], $match[10]);
 
             # zero out the variables
-            if ( ! $tz_hour ) { $tz_hour = 0; }
-            if ( ! $tz_min ) { $tz_min = 0; }
+            if (!$tz_hour) { $tz_hour = 0; }
+            if (!$tz_min) { $tz_min = 0; }
 
-            $offset_secs = (($tz_hour*60)+$tz_min)*60;
+            $offset_secs = (($tz_hour * 60) + $tz_min) * 60;
 
             # is timezone ahead of GMT?  then subtract offset
             #
-            if ( $tz_mod == '+' ) {
+            if ($tz_mod == '+') {
                 $offset_secs = $offset_secs * -1;
             }
 

manager/media/rss/rss_fetch.inc

Spacing +79 added lines, -79 removed lines

@@ -24,19 +24,19 @@ 
 }
 
 if (!defined('MAGPIE_DIR')) {
-    define('MAGPIE_DIR', dirname(__FILE__) . DIR_SEP);
+    define('MAGPIE_DIR', dirname(__FILE__).DIR_SEP);
 }
 
 if (!defined('MAGPIE_CACHE_DIR')) {
-    define('MAGPIE_CACHE_DIR', MODX_BASE_PATH . 'assets/cache/rss');
+    define('MAGPIE_CACHE_DIR', MODX_BASE_PATH.'assets/cache/rss');
 }
 
-require_once( MAGPIE_DIR . 'rss_parse.inc' );
-require_once( MAGPIE_DIR . 'rss_cache.inc' );
+require_once(MAGPIE_DIR.'rss_parse.inc');
+require_once(MAGPIE_DIR.'rss_cache.inc');
 
 // for including 3rd party libraries
-define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib' . DIR_SEP);
-require_once( MAGPIE_EXTLIB . 'Snoopy.class.inc');
+define('MAGPIE_EXTLIB', MAGPIE_DIR.'extlib'.DIR_SEP);
+require_once(MAGPIE_EXTLIB.'Snoopy.class.inc');
 
 
 /*
@@ -89,21 +89,21 @@ 
 
 $MAGPIE_ERROR = "";
 
-function fetch_rss ($url) {
+function fetch_rss($url){
     // initialize constants
     init();
 
-    if ( !isset($url) ) {
+    if (!isset($url)) {
         error("fetch_rss called without a url");
         return false;
     }
 
     // if cache is disabled
-    if ( !MAGPIE_CACHE_ON ) {
+    if (!MAGPIE_CACHE_ON) {
         // fetch file, and parse it
-        $resp = _fetch_remote_file( $url );
-        if ( is_success( $resp->status ) ) {
-            return _response_to_rss( $resp );
+        $resp = _fetch_remote_file($url);
+        if (is_success($resp->status)) {
+            return _response_to_rss($resp);
         }
         else {
             error("Failed to fetch $url and cache is off");
@@ -118,34 +118,34 @@ 
         // 3. if cached obj fails freshness check, fetch remote
         // 4. if remote fails, return stale object, or error
 
-        $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+        $cache = new RSSCache(MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE);
 
         if (MAGPIE_DEBUG and $cache->ERROR) {
             debug($cache->ERROR, E_USER_WARNING);
         }
 
 
-        $cache_status    = 0;       // response of check_cache
+        $cache_status    = 0; // response of check_cache
         $request_headers = array(); // HTTP headers to send with fetch
-        $rss             = 0;       // parsed RSS object
-        $errormsg        = 0;       // errors, if any
+        $rss             = 0; // parsed RSS object
+        $errormsg        = 0; // errors, if any
 
         // store parsed XML by desired output encoding
         // as character munging happens at parse time
-        $cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
+        $cache_key = $url.MAGPIE_OUTPUT_ENCODING;
 
         if (!$cache->ERROR) {
             // return cache HIT, MISS, or STALE
-            $cache_status = $cache->check_cache( $cache_key);
+            $cache_status = $cache->check_cache($cache_key);
         }
 
         // if object cached, and cache is fresh, return cached obj
-        if ( $cache_status == 'HIT' ) {
-            $rss = $cache->get( $cache_key );
-            if ( isset($rss) and $rss ) {
+        if ($cache_status == 'HIT') {
+            $rss = $cache->get($cache_key);
+            if (isset($rss) and $rss) {
                 // should be cache age
                 $rss->from_cache = 1;
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
                 }
                 return $rss;
@@ -155,50 +155,50 @@ 
         // else attempt a conditional get
 
         // setup headers
-        if ( $cache_status == 'STALE' ) {
-            $rss = $cache->get( $cache_key );
-            if ( $rss and $rss->etag and $rss->last_modified ) {
+        if ($cache_status == 'STALE') {
+            $rss = $cache->get($cache_key);
+            if ($rss and $rss->etag and $rss->last_modified) {
                 $request_headers['If-None-Match'] = $rss->etag;
                 $request_headers['If-Last-Modified'] = $rss->last_modified;
             }
         }
 
-        $resp = _fetch_remote_file( $url, $request_headers );
+        $resp = _fetch_remote_file($url, $request_headers);
 
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+          if ($resp->status == '304') {
                 // we have the most current copy
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");
                 }
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
             }
-            elseif ( is_success( $resp->status ) ) {
-                $rss = _response_to_rss( $resp );
-                if ( $rss ) {
+            elseif (is_success($resp->status)) {
+                $rss = _response_to_rss($resp);
+                if ($rss) {
                     if (MAGPIE_DEBUG > 1) {
                         debug("Fetch successful");
                     }
                     // add object to cache
-                    $cache->set( $cache_key, $rss );
+                    $cache->set($cache_key, $rss);
                     return $rss;
                 }
             }
             else {
                 $errormsg = "Failed to fetch $url ";
-                if ( $resp->status == '-100' ) {
-                    $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
+                if ($resp->status == '-100') {
+                    $errormsg .= "(Request timed out after ".MAGPIE_FETCH_TIME_OUT." seconds)";
                 }
-                elseif ( $resp->error ) {
+                elseif ($resp->error) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
                     $http_error = substr($resp->error, 0, -2);
                     $errormsg .= "(HTTP Error: $http_error)";
                 }
                 else {
-                    $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+                    $errormsg .= "(HTTP Response: ".$resp->response_code.')';
                 }
             }
         }
@@ -210,14 +210,14 @@ 
 
         // attempt to return cached object
         if ($rss) {
-            if ( MAGPIE_DEBUG ) {
+            if (MAGPIE_DEBUG) {
                 debug("Returning STALE object for $url");
             }
             return $rss;
         }
 
         // else we totally failed
-        error( $errormsg );
+        error($errormsg);
 
         return false;
 
@@ -229,21 +229,21 @@ 
     Purpose:    set MAGPIE_ERROR, and trigger error
 \*=======================================================================*/
 
-function error ($errormsg, $lvl=E_USER_WARNING) {
+function error($errormsg, $lvl = E_USER_WARNING){
         global $MAGPIE_ERROR;
 
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) {
+        if (isset($php_errormsg)) {
             $errormsg .= " ($php_errormsg)";
         }
-        if ( $errormsg ) {
+        if ($errormsg) {
             $errormsg = "MagpieRSS: $errormsg";
             $MAGPIE_ERROR = $errormsg;
-            trigger_error( $errormsg, $lvl);
+            trigger_error($errormsg, $lvl);
         }
 }
 
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+function debug($debugmsg, $lvl = E_USER_NOTICE){
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
 
@@ -251,10 +251,10 @@ 
     Function:   magpie_error
     Purpose:    accessor for the magpie error variable
 \*=======================================================================*/
-function magpie_error ($errormsg="") {
+function magpie_error($errormsg = ""){
     global $MAGPIE_ERROR;
 
-    if ( isset($errormsg) and $errormsg ) {
+    if (isset($errormsg) and $errormsg) {
         $MAGPIE_ERROR = $errormsg;
     }
 
@@ -268,13 +268,13 @@ 
                 headers to send along with the request (optional)
     Output:     an HTTP response object (see Snoopy.class.inc)
 \*=======================================================================*/
-function _fetch_remote_file ($url, $headers = "" ) {
+function _fetch_remote_file($url, $headers = ""){
     // Snoopy is an HTTP client in PHP
     $client = new Snoopy();
     $client->agent = MAGPIE_USER_AGENT;
     $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
     $client->use_gzip = MAGPIE_USE_GZIP;
-    if (is_array($headers) ) {
+    if (is_array($headers)) {
         $client->rawheaders = $headers;
     }
 
@@ -289,14 +289,14 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
-function _response_to_rss ($resp) {
-    $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
+function _response_to_rss($resp){
+    $rss = new MagpieRSS($resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING);
 
     // if RSS parsed successfully
-    if ( $rss and !$rss->ERROR) {
+    if ($rss and !$rss->ERROR) {
 
         // find Etag, and Last-Modified
-        foreach($resp->headers as $h) {
+        foreach ($resp->headers as $h) {
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
@@ -306,11 +306,11 @@ 
                 $val = "";
             }
 
-            if ( $field == 'ETag' ) {
+            if ($field == 'ETag') {
                 $rss->etag = $val;
             }
 
-            if ( $field == 'Last-Modified' ) {
+            if ($field == 'Last-Modified') {
                 $rss->last_modified = $val;
             }
         }
@@ -321,7 +321,7 @@ 
         $errormsg = "Failed to parse RSS file.";
 
         if ($rss) {
-            $errormsg .= " (" . $rss->ERROR . ")";
+            $errormsg .= " (".$rss->ERROR.")";
         }
         error($errormsg);
 
@@ -334,67 +334,67 @@ 
     Purpose:    setup constants with default values
                 check for user overrides
 \*=======================================================================*/
-function init () {
-    if ( defined('MAGPIE_INITALIZED') ) {
+function init(){
+    if (defined('MAGPIE_INITALIZED')) {
         return;
     }
     else {
         define('MAGPIE_INITALIZED', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_ON') ) {
+    if (!defined('MAGPIE_CACHE_ON')) {
         define('MAGPIE_CACHE_ON', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_DIR') ) {
+    if (!defined('MAGPIE_CACHE_DIR')) {
         define('MAGPIE_CACHE_DIR', './cache');
     }
 
-    if ( !defined('MAGPIE_CACHE_AGE') ) {
-        define('MAGPIE_CACHE_AGE', 60*60); // one hour
+    if (!defined('MAGPIE_CACHE_AGE')) {
+        define('MAGPIE_CACHE_AGE', 60 * 60); // one hour
     }
 
-    if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+    if (!defined('MAGPIE_CACHE_FRESH_ONLY')) {
         define('MAGPIE_CACHE_FRESH_ONLY', false);
     }
 
-    if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
+    if (!defined('MAGPIE_OUTPUT_ENCODING')) {
         global $modx_manager_charset;
-        if(empty($modx_manager_charset)) $modx_manager_charset = 'ISO-8859-1';
+        if (empty($modx_manager_charset)) $modx_manager_charset = 'ISO-8859-1';
         define('MAGPIE_OUTPUT_ENCODING', $modx_manager_charset);
     }
 
-    if ( !defined('MAGPIE_INPUT_ENCODING') ) {
+    if (!defined('MAGPIE_INPUT_ENCODING')) {
         define('MAGPIE_INPUT_ENCODING', null);
     }
 
-    if ( !defined('MAGPIE_DETECT_ENCODING') ) {
+    if (!defined('MAGPIE_DETECT_ENCODING')) {
         define('MAGPIE_DETECT_ENCODING', true);
     }
 
-    if ( !defined('MAGPIE_DEBUG') ) {
+    if (!defined('MAGPIE_DEBUG')) {
         define('MAGPIE_DEBUG', 0);
     }
 
-    if ( !defined('MAGPIE_USER_AGENT') ) {
-        $ua = 'MagpieRSS/'. MAGPIE_VERSION . ' (+http://magpierss.sf.net';
+    if (!defined('MAGPIE_USER_AGENT')) {
+        $ua = 'MagpieRSS/'.MAGPIE_VERSION.' (+http://magpierss.sf.net';
 
-        if ( MAGPIE_CACHE_ON ) {
-            $ua = $ua . ')';
+        if (MAGPIE_CACHE_ON) {
+            $ua = $ua.')';
         }
         else {
-            $ua = $ua . '; No cache)';
+            $ua = $ua.'; No cache)';
         }
 
         define('MAGPIE_USER_AGENT', $ua);
     }
 
-    if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
+    if (!defined('MAGPIE_FETCH_TIME_OUT')) {
         define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout
     }
 
     // use gzip encoding to fetch rss files if supported?
-    if ( !defined('MAGPIE_USE_GZIP') ) {
+    if (!defined('MAGPIE_USE_GZIP')) {
         define('MAGPIE_USE_GZIP', true);
     }
 }
@@ -417,7 +417,7 @@ 
     Function:   is_info
     Purpose:    return true if Informational status code
 \*=======================================================================*/
-function is_info ($sc) {
+function is_info($sc){
     return $sc >= 100 && $sc < 200;
 }
 
@@ -425,7 +425,7 @@ 
     Function:   is_success
     Purpose:    return true if Successful status code
 \*=======================================================================*/
-function is_success ($sc) {
+function is_success($sc){
     return $sc >= 200 && $sc < 300;
 }
 
@@ -433,7 +433,7 @@ 
     Function:   is_redirect
     Purpose:    return true if Redirection status code
 \*=======================================================================*/
-function is_redirect ($sc) {
+function is_redirect($sc){
     return $sc >= 300 && $sc < 400;
 }
 
@@ -441,7 +441,7 @@ 
     Function:   is_error
     Purpose:    return true if Error status code
 \*=======================================================================*/
-function is_error ($sc) {
+function is_error($sc){
     return $sc >= 400 && $sc < 600;
 }
 
@@ -449,7 +449,7 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a client error
 \*=======================================================================*/
-function is_client_error ($sc) {
+function is_client_error($sc){
     return $sc >= 400 && $sc < 500;
 }
 
@@ -457,6 +457,6 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a server error
 \*=======================================================================*/
-function is_server_error ($sc) {
+function is_server_error($sc){
     return $sc >= 500 && $sc < 600;
 }