evolution-cms / evolution

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,7 +457,7 @@ 
     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; 
 }
 ?>

manager/media/rss/extlib/Snoopy.class.inc

Spacing +43 added lines, -43 removed lines

@@ -149,7 +149,7 @@ 
                         // using proxy, send entire URI
                         $this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
                     } else {
-                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
                         // no proxy, send only the path
                         $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
                     }
@@ -160,7 +160,7 @@ 
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
                             // only follow redirect if it's on this site, or offsiteok is true
-                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^https?://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -188,7 +188,7 @@ 
                 break;
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -239,7 +239,7 @@ 
                         // using proxy, send entire URI
                         $this->_httprequest($URI, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                     } else {
-                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
                         // no proxy, send only the path
                         $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                     }
@@ -249,11 +249,11 @@ 
                     if ($this->_redirectaddr) {
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
-                            if (!preg_match("|^" . $URI_PARTS["scheme"] . "://|", $this->_redirectaddr))
-                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"] . "://" . $URI_PARTS["host"]);
+                            if (!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
                             // only follow redirect if it's on this site, or offsiteok is true
-                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^https?://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -285,7 +285,7 @@ 
                 break;
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -585,9 +585,9 @@ 
         $match = preg_replace("|/$|", "", $match);
         $match_part = parse_url($match);
         $match_root =
-            $match_part["scheme"] . "://" . $match_part["host"];
+            $match_part["scheme"]."://".$match_part["host"];
 
-        $search = array("|^http://" . preg_quote($this->host) . "|i",
+        $search = array("|^http://".preg_quote($this->host)."|i",
             "|^(\/)|i",
             "|^(?!http://)(?!mailto:)|i",
             "|/\./|",
@@ -595,8 +595,8 @@ 
         );
 
         $replace = array("",
-            $match_root . "/",
-            $match . "/",
+            $match_root."/",
+            $match."/",
             "/",
             "/"
         );
@@ -625,17 +625,17 @@ 
         $URI_PARTS = parse_url($URI);
         if (empty($url))
             $url = "/";
-        $headers = $http_method . " " . $url . " " . $this->_httpversion . "\r\n";
+        $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
         if (!empty($this->host) && !isset($this->rawheaders['Host'])) {
-            $headers .= "Host: " . $this->host;
+            $headers .= "Host: ".$this->host;
             if (!empty($this->port) && $this->port != '80')
-                $headers .= ":" . $this->port;
+                $headers .= ":".$this->port;
             $headers .= "\r\n";
         }
         if (!empty($this->agent))
-            $headers .= "User-Agent: " . $this->agent . "\r\n";
+            $headers .= "User-Agent: ".$this->agent."\r\n";
         if (!empty($this->accept))
-            $headers .= "Accept: " . $this->accept . "\r\n";
+            $headers .= "Accept: ".$this->accept."\r\n";
         if ($this->use_gzip) {
             // make sure PHP was built with --with-zlib
             // and we can handle gzipp'ed data
@@ -643,46 +643,46 @@ 
                 $headers .= "Accept-encoding: gzip\r\n";
             } else {
                 trigger_error(
-                    "use_gzip is on, but PHP was built without zlib support." .
+                    "use_gzip is on, but PHP was built without zlib support.".
                     "  Requesting file(s) without gzip encoding.",
                     E_USER_NOTICE);
             }
         }
         if (!empty($this->referer))
-            $headers .= "Referer: " . $this->referer . "\r\n";
+            $headers .= "Referer: ".$this->referer."\r\n";
         if (!empty($this->cookies)) {
             if (!is_array($this->cookies))
-                $this->cookies = (array)$this->cookies;
+                $this->cookies = (array) $this->cookies;
 
             reset($this->cookies);
             if (count($this->cookies) > 0) {
                 $cookie_headers .= 'Cookie: ';
                 foreach ($this->cookies as $cookieKey => $cookieVal) {
-                    $cookie_headers .= $cookieKey . "=" . urlencode($cookieVal) . "; ";
+                    $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
                 }
-                $headers .= substr($cookie_headers, 0, -2) . "\r\n";
+                $headers .= substr($cookie_headers, 0, -2)."\r\n";
             }
         }
         if (!empty($this->rawheaders)) {
             if (!is_array($this->rawheaders))
-                $this->rawheaders = (array)$this->rawheaders;
+                $this->rawheaders = (array) $this->rawheaders;
             while (list($headerKey, $headerVal) = each($this->rawheaders))
-                $headers .= $headerKey . ": " . $headerVal . "\r\n";
+                $headers .= $headerKey.": ".$headerVal."\r\n";
         }
         if (!empty($content_type)) {
             $headers .= "Content-type: $content_type";
             if ($content_type == "multipart/form-data")
-                $headers .= "; boundary=" . $this->_mime_boundary;
+                $headers .= "; boundary=".$this->_mime_boundary;
             $headers .= "\r\n";
         }
         if (!empty($body))
-            $headers .= "Content-length: " . strlen($body) . "\r\n";
+            $headers .= "Content-length: ".strlen($body)."\r\n";
         if (!empty($this->user) || !empty($this->pass))
-            $headers .= "Authorization: Basic " . base64_encode($this->user . ":" . $this->pass) . "\r\n";
+            $headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
 
         //add proxy auth headers
         if (!empty($this->proxy_user))
-            $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+            $headers .= 'Proxy-Authorization: '.'Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass)."\r\n";
 
 
         $headers .= "\r\n";
@@ -692,7 +692,7 @@ 
             socket_set_timeout($fp, $this->read_timeout);
         $this->timed_out = false;
 
-        fwrite($fp, $headers . $body, strlen($headers . $body));
+        fwrite($fp, $headers.$body, strlen($headers.$body));
 
         $this->_redirectaddr = false;
         unset($this->headers);
@@ -716,10 +716,10 @@ 
                 // look for :// in the Location header to see if hostname is included
                 if (!preg_match("|\:\/\/|", $matches[2])) {
                     // no host in the path, so prepend
-                    $this->_redirectaddr = $URI_PARTS["scheme"] . "://" . $this->host . ":" . $this->port;
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
                     // eliminate double slash
                     if (!preg_match("|^/|", $matches[2]))
-                        $this->_redirectaddr .= "/" . $matches[2];
+                        $this->_redirectaddr .= "/".$matches[2];
                     else
                         $this->_redirectaddr .= $matches[2];
                 } else
@@ -771,7 +771,7 @@ 
         if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match)) {
             $this->results[] = $results;
             for ($x = 0; $x < count($match[1]); $x++)
-                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"] . "://" . $this->host);
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
         } // have we already fetched framed content?
         elseif (is_array($this->results))
             $this->results[] = $results;
@@ -858,14 +858,14 @@ 
                     $context_opts['ssl']['capath'] = $this->capath;
             }
                     
-            $host = 'ssl://' . $host;
+            $host = 'ssl://'.$host;
         }
 
         $context = stream_context_create($context_opts);
 
         if (version_compare(PHP_VERSION, '5.0.0', '>')) {
-            if($this->scheme == 'http')
-                $host = "tcp://" . $host;
+            if ($this->scheme == 'http')
+                $host = "tcp://".$host;
             $fp = stream_socket_client(
                 "$host:$port",
                 $errno,
@@ -897,7 +897,7 @@ 
                 case -5:
                     $this->error = "connection refused or timed out (-5)";
                 default:
-                    $this->error = "connection failed (" . $errno . ")";
+                    $this->error = "connection failed (".$errno.")";
             }
             return false;
         }
@@ -938,26 +938,26 @@ 
                 while (list($key, $val) = each($formvars)) {
                     if (is_array($val) || is_object($val)) {
                         while (list($cur_key, $cur_val) = each($val)) {
-                            $postdata .= urlencode($key) . "[]=" . urlencode($cur_val) . "&";
+                            $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
                         }
                     } else
-                        $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                        $postdata .= urlencode($key)."=".urlencode($val)."&";
                 }
                 break;
 
             case "multipart/form-data":
-                $this->_mime_boundary = "Snoopy" . md5(uniqid(microtime()));
+                $this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 
                 reset($formvars);
                 while (list($key, $val) = each($formvars)) {
                     if (is_array($val) || is_object($val)) {
                         while (list($cur_key, $cur_val) = each($val)) {
-                            $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                            $postdata .= "--".$this->_mime_boundary."\r\n";
                             $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
                             $postdata .= "$cur_val\r\n";
                         }
                     } else {
-                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
                         $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
                         $postdata .= "$val\r\n";
                     }
@@ -974,12 +974,12 @@ 
                         fclose($fp);
                         $base_name = basename($file_name);
 
-                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
                         $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
                         $postdata .= "$file_content\r\n";
                     }
                 }
-                $postdata .= "--" . $this->_mime_boundary . "--\r\n";
+                $postdata .= "--".$this->_mime_boundary."--\r\n";
                 break;
         }
 

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/index.php

Spacing +268 added lines, -268 removed lines

@@ -54,26 +54,26 @@ 
 }
 
 // get start time
-$mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tstart = $mtime;
+$mtime = microtime(); $mtime = explode(" ", $mtime); $mtime = $mtime[1] + $mtime[0]; $tstart = $mtime;
 $mstart = memory_get_usage();
-$self      = str_replace('\\','/',__FILE__);
-$self_dir  = str_replace('/index.php','',$self);
-$mgr_dir   = substr($self_dir,strrpos($self_dir,'/')+1);
-$base_path = str_replace($mgr_dir . '/index.php','',$self);
-$site_mgr_path = $base_path . 'assets/cache/siteManager.php';
-if(is_file($site_mgr_path)) include_once($site_mgr_path);
-$site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
-if(is_file($site_hostnames_path)) include_once($site_hostnames_path);
-if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
+$self      = str_replace('\\', '/', __FILE__);
+$self_dir  = str_replace('/index.php', '', $self);
+$mgr_dir   = substr($self_dir, strrpos($self_dir, '/') + 1);
+$base_path = str_replace($mgr_dir.'/index.php', '', $self);
+$site_mgr_path = $base_path.'assets/cache/siteManager.php';
+if (is_file($site_mgr_path)) include_once($site_mgr_path);
+$site_hostnames_path = $base_path.'assets/cache/siteHostnames.php';
+if (is_file($site_hostnames_path)) include_once($site_hostnames_path);
+if (!defined('MGR_DIR') || MGR_DIR !== $mgr_dir) {
 	$src = "<?php\n";
 	$src .= "define('MGR_DIR', '{$mgr_dir}');\n";
-	$rs = file_put_contents($site_mgr_path,$src);
-	if(!$rs) {
+	$rs = file_put_contents($site_mgr_path, $src);
+	if (!$rs) {
 		echo 'siteManager.php write error';
 		exit;
 	}
 	sleep(1);
-	header('Location:' . $_SERVER['REQUEST_URI']);
+	header('Location:'.$_SERVER['REQUEST_URI']);
 	exit;
 }
 
@@ -88,7 +88,7 @@ 
 
 // send anti caching headers
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 header("Cache-Control: no-store, no-cache, must-revalidate");
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");
@@ -100,29 +100,29 @@ 
 include_once "includes/lang/english.inc.php";
 
 // check PHP version. EVO is compatible with php 5 (5.0.0+)
-$php_ver_comp =  version_compare(phpversion(), "5.0.0");
+$php_ver_comp = version_compare(phpversion(), "5.0.0");
 		// -1 if left is less, 0 if equal, +1 if left is higher
-if($php_ver_comp < 0) {
+if ($php_ver_comp < 0) {
 	echo sprintf($_lang['php_version_check'], phpversion());
 	exit;
 }
 
 // check if iconv is installed
-if(!function_exists('iconv')) {
+if (!function_exists('iconv')) {
 	echo $_lang['iconv_not_available'];
 	exit;
 }
 
 // set some runtime options
-$incPath = str_replace("\\","/",dirname(__FILE__)."/includes/"); // Mod by Raymond
-set_include_path(get_include_path() . PATH_SEPARATOR . $incPath);
+$incPath = str_replace("\\", "/", dirname(__FILE__)."/includes/"); // Mod by Raymond
+set_include_path(get_include_path().PATH_SEPARATOR.$incPath);
 
 if (!defined("ENT_COMPAT")) define("ENT_COMPAT", 2);
 if (!defined("ENT_NOQUOTES")) define("ENT_NOQUOTES", 0);
 if (!defined("ENT_QUOTES")) define("ENT_QUOTES", 3);
 
 // set the document_root :|
-if(!isset($_SERVER["DOCUMENT_ROOT"]) || empty($_SERVER["DOCUMENT_ROOT"])) {
+if (!isset($_SERVER["DOCUMENT_ROOT"]) || empty($_SERVER["DOCUMENT_ROOT"])) {
 	$_SERVER["DOCUMENT_ROOT"] = str_replace($_SERVER["PATH_INFO"], "", preg_replace("/\\\\/", "/", $_SERVER["PATH_TRANSLATED"]))."/";
 }
 
@@ -161,30 +161,30 @@ 
 // Now that session is given get user settings and merge into $modx->config
 $usersettings = $modx->getUserSettings();
 
-$settings =& $modx->config;
+$settings = & $modx->config;
 extract($modx->config, EXTR_OVERWRITE);
 
 // now include_once different language file as english
-if(!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
+if (!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
 	$manager_language = "english"; // if not set, get the english language file.
 }
 
 // $length_eng_lang = count($_lang); // Not used for now, required for difference-check with other languages than english (i.e. inside installer) 
 
-if($manager_language!="english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
+if ($manager_language != "english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
 	include_once "lang/".$manager_language.".inc.php";
 }
 
 // allow custom language overrides not altered by future EVO-updates
-if(file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
+if (file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
 	include_once "lang/override/".$manager_language.".inc.php";
 }
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
-foreach($_lang as $k=>$v)
+foreach ($_lang as $k=>$v)
 {
-	if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
+	if (strpos($v, '[+') !== false) $_lang[$k] = str_replace($s, $r, $v);
 }
 
 // send the charset header
@@ -198,19 +198,19 @@ 
 include_once "accesscontrol.inc.php";
 
 // double check the session
-if(!isset($_SESSION['mgrValidated'])){
+if (!isset($_SESSION['mgrValidated'])) {
 	echo "Not Logged In!";
 	exit;
 }
 
 // include_once the style variables file
-if(isset($manager_theme) && !isset($_style)) {
+if (isset($manager_theme) && !isset($_style)) {
 	$_style = array();
 	include_once "media/style/".$manager_theme."/style.php";
 }
 
 // check if user is allowed to access manager interface
-if(isset($allow_manager_access) && $allow_manager_access==0) {
+if (isset($allow_manager_access) && $allow_manager_access == 0) {
 	include_once "manager.lockout.inc.php";
 }
 
@@ -219,21 +219,21 @@ 
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
 // first we check to see if this is a frameset request
-if(!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
+if (!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
 	// this looks to be a top-level frameset request, so let's serve up a frameset
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
+	if (is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
 		include_once "media/style/".$manager_theme."/frames/1.php";
-	}else{
+	} else {
 		include_once "frames/1.php";
 	}
 	exit;
 }
 
 // OK, let's retrieve the action directive from the request
-$option = array('min_range'=>1,'max_range'=>2000);
-if(isset($_GET['a']) && isset($_POST['a'])) $modx->webAlertAndQuit($_lang['error_double_action']);
-elseif(isset($_GET['a']))  $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
-elseif(isset($_POST['a'])) $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
+$option = array('min_range'=>1, 'max_range'=>2000);
+if (isset($_GET['a']) && isset($_POST['a'])) $modx->webAlertAndQuit($_lang['error_double_action']);
+elseif (isset($_GET['a']))  $action = filter_input(INPUT_GET, 'a', FILTER_VALIDATE_INT, $option);
+elseif (isset($_POST['a'])) $action = filter_input(INPUT_POST, 'a', FILTER_VALIDATE_INT, $option);
 else                       $action = null;
 
 if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) {
@@ -264,11 +264,11 @@ 
 $modx->invokeEvent("OnManagerPageInit", array("action" => $action));
 
 // return element filepath
-function includeFileProcessor ($filepath,$manager_theme) {
+function includeFileProcessor($filepath, $manager_theme){
 	$element = "";
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
+	if (is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
 		$element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
-	}else{
+	} else {
 		$element = $filepath;
 	}
 	return $element;
@@ -281,341 +281,341 @@ 
 /********************************************************************/
 	case 1 :
 		// get the requested frame
-		$frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']);
-		if($frame>9) {
-			$enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
+		$frame = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['f']);
+		if ($frame > 9) {
+			$enable_debug = false; // this is to stop the debug thingy being attached to the framesets
 		}
-		include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme));
+		include_once(includeFileProcessor("frames/".$frame.".php", $manager_theme));
 	break;
 /********************************************************************/
 /* show the homepage                                                */
 /********************************************************************/
 	case 2:
 		// get the home page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/welcome.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* document data                                                    */
 /********************************************************************/
 	case 3:
 		// get the page to show document's data
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/document_data.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* content management                                               */
 /********************************************************************/
 	case 85:
 		// get the mutate page for adding a folder
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 27:
 		// get the mutate page for changing content
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 4:
 		// get the mutate page for adding content
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 5:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_content.processor.php", $manager_theme));
 	break;
 	case 6:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_content.processor.php", $manager_theme));
 	break;
 	case 63:
 		// get the undelete processor
-		include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/undelete_content.processor.php", $manager_theme));
 	break;
 	case 51:
 		// get the move action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/move_document.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 52:
 		// get the move document processor
-		include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/move_document.processor.php", $manager_theme));
 	break;
 	case 61:
 		// get the processor for publishing content
-		include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/publish_content.processor.php", $manager_theme));
 	break;
 	case 62:
 		// get the processor for publishing content
-		include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/unpublish_content.processor.php", $manager_theme));
 	break;
 	case 56:
 		// get the sort menuindex action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 		break;
 /********************************************************************/
 /* show the wait page - gives the tree time to refresh (hopefully)  */
 /********************************************************************/
 	case 7:
 		// get the wait page (so the tree can reload)
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/wait.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/wait.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* let the user log out                                             */
 /********************************************************************/
 	case 8:
 		// get the logout processor
-		include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/logout.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* user management                                                  */
 /********************************************************************/
 	case 87:
 		// get the new web user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 88:
 		// get the edit web user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 89:
 		// get the save web user processor
-		include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_web_user.processor.php", $manager_theme));
 	break;
 	case 90:
 		// get the delete web user page
-		include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_web_user.processor.php", $manager_theme));
 	break;
 	case 11:
 		// get the new user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 12:
 		// get the edit user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 32:
 		// get the save user processor
-		include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_user.processor.php", $manager_theme));
 	break;
 	case 28:
 		// get the change password page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_password.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 34:
 		// get the save new password page
-		include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_password.processor.php", $manager_theme));
 	break;
 	case 33:
 		// get the delete user page
-		include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_user.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* role management                                                  */
 /********************************************************************/
 	case 38:
 		// get the new role page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_role.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 35:
 		// get the edit role page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_role.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 36:
 		// get the save role page
-		include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_role.processor.php", $manager_theme));
 	break;
 	case 37:
 		// get the delete role page
-		include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_role.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* category management                                               */
 /********************************************************************/
 	case 120:
 		// get the edit category page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 121:
 		// for ajax-requests
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
+		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php", $manager_theme));
 	break;
 /********************************************************************/
 /* template management                                              */
 /********************************************************************/
 	case 16:
 		// get the edit template action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 19:
 		// get the new template action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 20:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_template.processor.php", $manager_theme));
 	break;
 	case 21:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_template.processor.php", $manager_theme));
 	break;
 	case 96:
 		// get the duplicate template processor
-		include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_template.processor.php", $manager_theme));
 	break;
 	case 117:
 		// change the tv rank for selected template
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 		break;
 /********************************************************************/
 /* snippet management                                               */
 /********************************************************************/
 	case 22:
 		// get the edit snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 23:
 		// get the new snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 24:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_snippet.processor.php", $manager_theme));
 	break;
 	case 25:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_snippet.processor.php", $manager_theme));
 	break;
 	case 98:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_snippet.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* htmlsnippet management                                               */
 /********************************************************************/
 	case 78:
 		// get the edit snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 77:
 		// get the new snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 79:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php", $manager_theme));
 	break;
 	case 80:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php", $manager_theme));
 	break;
 	case 97:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* show the credits page                                            */
 /********************************************************************/
 	case 18:
 		// get the credits page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/credits.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/credits.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* empty cache & synchronisation                                    */
 /********************************************************************/
 	case 26:
 		// get the cache emptying processor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/refresh_site.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Module management                                                */
 /********************************************************************/
 	case 106:
 		// get module management
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/modules.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/modules.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 107:
 		// get the new module action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_module.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 108:
 		// get the edit module action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_module.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 109:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_module.processor.php", $manager_theme));
 	break;
 	case 110:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_module.processor.php", $manager_theme));
 	break;
 	case 111:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_module.processor.php", $manager_theme));
 	break;
 	case 112:
 		// execute/run the module
 		//include_once "header.inc.php";
-		include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/execute_module.processor.php", $manager_theme));
 		//include_once "footer.inc.php";
 		break;
 	case 113:
 		// get the module resources (dependencies) action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* plugin management                                                */
@@ -623,46 +623,46 @@ 
 	case 100:
 		// change the plugin priority
 		//include_once "header.inc.php"; - in action file
-		include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 101:
 		// get the new plugin action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 102:
 		// get the edit plugin action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 103:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_plugin.processor.php", $manager_theme));
 	break;
 	case 104:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_plugin.processor.php", $manager_theme));
 	break;
 	case 105:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_plugin.processor.php", $manager_theme));
 	break;
 	case 119:
 		// get the purge processor
-		include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/purge_plugin.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* view phpinfo                                                     */
 /********************************************************************/
 	case 200:
 		// show phpInfo
-		if($modx->hasPermission('logs')) {
-			include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-			include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme));
-			include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		if ($modx->hasPermission('logs')) {
+			include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+			include_once(includeFileProcessor("actions/phpinfo.static.php", $manager_theme));
+			include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 		}
 	break;
 /********************************************************************/
@@ -670,320 +670,320 @@ 
 /********************************************************************/
 	case 29:
 		// get the error page
-		include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme));
+		include_once(includeFileProcessor("actions/error_dialog.static.php", $manager_theme));
 	break;
 /********************************************************************/
 /* file manager                                                     */
 /********************************************************************/
 	case 31:
 		// get the page to manage files
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/files.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* access permissions                                               */
 /********************************************************************/
 	case 40:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/access_permissions.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 91:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* access groups processor                                          */
 /********************************************************************/
 	case 41:
-		include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/access_groups.processor.php", $manager_theme));
 	break;
 	case 92:
-		include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/web_access_groups.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* settings editor                                                  */
 /********************************************************************/
 	case 17:
 		// get the settings editor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_settings.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 118:
 		// call settings ajax include
 		ob_clean();
-		include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme));
+		include_once(includeFileProcessor("includes/mutate_settings.ajax.php", $manager_theme));
 	break;
 /********************************************************************/
 /* save settings                                                    */
 /********************************************************************/
 	case 30:
 		// get the save settings processor
-		include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_settings.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* system information                                               */
 /********************************************************************/
 	case 53:
 		// get the settings editor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/sysinfo.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* optimise table                                               */
 /********************************************************************/
 	case 54:
 		// get the table optimizer/truncate processor
-		include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/optimize_table.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* view logging                                                     */
 /********************************************************************/
 	case 13:
 		// view logging
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/logging.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/logging.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* empty logs                                                       */
 /********************************************************************/
 	case 55:
 		// get the settings editor
-		include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/empty_table.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* calls test page                                                      */
 /********************************************************************/
 	case 999:
 		// get the test page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("test_page.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("test_page.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Empty recycle bin                                                */
 /********************************************************************/
 	case 64:
 		// get the Recycle bin emptier
-		include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/remove_content.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Messages                                                     */
 /********************************************************************/
 	case 10:
 		// get the messages page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/messages.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/messages.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Delete a message                                                 */
 /********************************************************************/
 	case 65:
 		// get the message deleter
-		include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_message.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Send a message                                                   */
 /********************************************************************/
 	case 66:
 		// get the message deleter
-		include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/send_message.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Remove locks                                                 */
 /********************************************************************/
 	case 67:
 		// get the lock remover
-		include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/remove_locks.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Site schedule                                                    */
 /********************************************************************/
 	case 70:
 		// get the schedule page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/site_schedule.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Search                                                           */
 /********************************************************************/
 	case 71:
 		// get the search page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/search.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/search.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* About                                                            */
 /********************************************************************/
 	case 59:
 		// get the about page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/about.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/about.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Add weblink                                                          */
 /********************************************************************/
 	case 72:
 		// get the weblink page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* User management                                                  */
 /********************************************************************/
 	case 75:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/user_management.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 99:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/web_user_management.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 86:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/role_management.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* template/ snippet management                                                 */
 /********************************************************************/
 	case 76:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/resources.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/resources.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Export to file                                                   */
 /********************************************************************/
 	case 83:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/export_site.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Resource Selector                                                    */
 /********************************************************************/
 	case 84:
-		include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme));
+		include_once(includeFileProcessor("actions/resource_selector.static.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Backup Manager                                                   */
 /********************************************************************/
 	case 93:
 		# header and footer will be handled interally
-		include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme));
+		include_once(includeFileProcessor("actions/bkmanager.static.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Duplicate Document                                                   */
 /********************************************************************/
 	case 94:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_content.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Import Document from file                                        */
 /********************************************************************/
 	case 95:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/import_site.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Help                                                             */
 /********************************************************************/
 	case 9:
 		// get the help page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/help.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/help.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Template Variables - Based on Apodigm's Docvars                  */
 /********************************************************************/
 	case 300:
 		// get the new document variable action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 301:
 		// get the edit document variable action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 302:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_tmplvars.processor.php", $manager_theme));
 	break;
 	case 303:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_tmplvars.processor.php", $manager_theme));
 	break;
 	case 304:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php", $manager_theme));
 	break;
 	case 305:
 		// get the tv-rank action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Event viewer: show event message log                             */
 /********************************************************************/
 	case 114:
 		// get event logs
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/eventlog.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 115:
 		// get event log details viewer
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/eventlog_details.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 116:
 		// get the event log delete processor
-		include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_eventlog.processor.php", $manager_theme));
 	break;
 
 	case 501:
 		//delete category
-		include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_category.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* default action: show not implemented message                     */
 /********************************************************************/
 	default :
 		// say that what was requested doesn't do anything yet
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
 		echo "
 			<div class='sectionHeader'>".$_lang['functionnotimpl']."</div>
 			<div class='sectionBody'>
 				<p>".$_lang['functionnotimpl_message']."</p>
 			</div>
 		";
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 }
 
 /********************************************************************/
 // log action, unless it's a frame request
-if($action!=1 && $action!=7 && $action!=2) {
+if ($action != 1 && $action != 7 && $action != 2) {
 	include_once "log.class.inc.php";
 	$log = new logHandler;
 	$log->initAndWriteLog();

manager/includes/accesscontrol.inc.php

Spacing +51 added lines, -51 removed lines

@@ -1,14 +1,14 @@ 
 <?php
-if(IN_MANAGER_MODE != "true") {
+if (IN_MANAGER_MODE != "true") {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 	header('HTTP/1.0 404 Not Found');
 	exit;
 }
 
-if(isset($_SESSION['mgrValidated']) && $_SESSION['usertype'] != 'manager') {
+if (isset($_SESSION['mgrValidated']) && $_SESSION['usertype'] != 'manager') {
 	//		if (isset($_COOKIE[session_name()])) {
 	//			setcookie(session_name(), '', 0, MODX_BASE_URL);
 	//		}
@@ -18,16 +18,16 @@ 
 }
 
 // andrazk 20070416 - if installer is running, destroy active sessions
-if(file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
-	include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
-	if(isset($installStartTime)) {
-		if((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
+if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) {
+	include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
+	if (isset($installStartTime)) {
+		if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
 			unset($installStartTime);
-			@ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
-			unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+			@ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755);
+			unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
 		} else {
-			if($_SERVER['REQUEST_METHOD'] != 'POST') {
-				if(isset($_COOKIE[session_name()])) {
+			if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+				if (isset($_COOKIE[session_name()])) {
 					session_unset();
 					@session_destroy();
 					//					setcookie(session_name(), '', 0, MODX_BASE_URL);
@@ -39,37 +39,37 @@ 
 }
 
 // andrazk 20070416 - if session started before install and was not destroyed yet
-if(isset($lastInstallTime)) {
-	if(isset($_SESSION['mgrValidated'])) {
-		if(isset($_SESSION['modx.session.created.time'])) {
-			if($_SESSION['modx.session.created.time'] < $lastInstallTime) {
-				if($_SERVER['REQUEST_METHOD'] != 'POST') {
-					if(isset($_COOKIE[session_name()])) {
+if (isset($lastInstallTime)) {
+	if (isset($_SESSION['mgrValidated'])) {
+		if (isset($_SESSION['modx.session.created.time'])) {
+			if ($_SESSION['modx.session.created.time'] < $lastInstallTime) {
+				if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+					if (isset($_COOKIE[session_name()])) {
 						session_unset();
 						@session_destroy();
 						//						setcookie(session_name(), '', 0, MODX_BASE_URL);
 					}
 					header('HTTP/1.0 307 Redirect');
-					header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
+					header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2');
 				}
 			}
 		}
 	}
 }
 
-if(!isset($_SESSION['mgrValidated'])) {
-	if(isset($manager_language)) {
+if (!isset($_SESSION['mgrValidated'])) {
+	if (isset($manager_language)) {
 		// establish fallback to English default
 		include_once "lang/english.inc.php";
 		// include localized overrides
-		include_once "lang/" . $manager_language . ".inc.php";
+		include_once "lang/".$manager_language.".inc.php";
 	} else {
 		include_once "lang/english.inc.php";
 	}
 
 	$modx->setPlaceholder('modx_charset', $modx_manager_charset);
 	$modx->setPlaceholder('theme', $manager_theme);
-    $modx->setPlaceholder('favicon', (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'));
+    $modx->setPlaceholder('favicon', (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico'));
 
 	// invoke OnManagerLoginFormPrerender event
 	$evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
@@ -80,29 +80,29 @@ 
 	$modx->setPlaceholder('manager_path', MGR_DIR);
 	$modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
 	$modx->setPlaceholder('login_message', $_lang["login_message"]);
-	$modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
+	$modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
 	$modx->setPlaceholder('year', date('Y'));
 	$modx->setPlaceholder('manager_theme_style', (isset($_COOKIE['MODX_themeColor']) ? $_COOKIE['MODX_themeColor'] : ''));
 
 	// andrazk 20070416 - notify user of install/update
-	if(isset($_GET['installGoingOn'])) {
+	if (isset($_GET['installGoingOn'])) {
 		$installGoingOn = $_GET['installGoingOn'];
 	}
-	if(isset($installGoingOn)) {
-		switch($installGoingOn) {
+	if (isset($installGoingOn)) {
+		switch ($installGoingOn) {
 			case 1 :
-				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
+				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>");
 				break;
 			case 2 :
-				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
+				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>");
 				break;
 		}
 	}
 
-	if($modx->config['use_captcha'] == 1) {
+	if ($modx->config['use_captcha'] == 1) {
 		$modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
-		$modx->setPlaceholder('captcha_image', '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'includes/veriword.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
-		$modx->setPlaceholder('captcha_input', '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
+		$modx->setPlaceholder('captcha_image', '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'includes/veriword.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>');
+		$modx->setPlaceholder('captcha_input', '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
 	}
 
 	// login info
@@ -119,7 +119,7 @@ 
 
 	// invoke OnManagerLoginFormRender event
 	$evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
-	$html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
+	$html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : '';
 	$modx->setPlaceholder('OnManagerLoginFormRender', $html);
 
 	// load template
@@ -128,38 +128,38 @@ 
 	$target = $modx->mergeSettingsContent($target);
 
 	$login_tpl = null;
-	if(substr($target, 0, 1) === '@') {
-		if(substr($target, 0, 6) === '@CHUNK') {
+	if (substr($target, 0, 1) === '@') {
+		if (substr($target, 0, 6) === '@CHUNK') {
 			$target = trim(substr($target, 7));
 			$login_tpl = $modx->getChunk($target);
-		} elseif(substr($target, 0, 5) === '@FILE') {
+		} elseif (substr($target, 0, 5) === '@FILE') {
 			$target = trim(substr($target, 6));
 			$login_tpl = file_get_contents($target);
 		}
 	} else {
-		$theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
-		if(is_file($theme_path . 'style.php')) {
-			include($theme_path . 'style.php');
+		$theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/';
+		if (is_file($theme_path.'style.php')) {
+			include($theme_path.'style.php');
 		}
 		$chunk = $modx->getChunk($target);
-		if($chunk !== false && !empty($chunk)) {
+		if ($chunk !== false && !empty($chunk)) {
 			$login_tpl = $chunk;
-		} elseif(is_file(MODX_BASE_PATH . $target)) {
-			$target = MODX_BASE_PATH . $target;
+		} elseif (is_file(MODX_BASE_PATH.$target)) {
+			$target = MODX_BASE_PATH.$target;
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($target)) {
+		} elseif (is_file($target)) {
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'login.tpl')) {
-			$target = $theme_path . 'login.tpl';
+		} elseif (is_file($theme_path.'login.tpl')) {
+			$target = $theme_path.'login.tpl';
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'templates/actions/login.tpl')) {
-			$target = $theme_path . 'templates/actions/login.tpl';
+		} elseif (is_file($theme_path.'templates/actions/login.tpl')) {
+			$target = $theme_path.'templates/actions/login.tpl';
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
-			$target = $theme_path . 'html/login.html';
+		} elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible
+			$target = $theme_path.'html/login.html';
 			$login_tpl = file_get_contents($target);
 		} else {
-			$target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
+			$target = MODX_MANAGER_PATH.'media/style/common/login.tpl';
 			$login_tpl = file_get_contents($target);
 		}
 	}
@@ -182,8 +182,8 @@ 
 	$lasthittime = time();
 	$action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
 
-	if($action !== 1) {
-		if(!intval($itemid)) {
+	if ($action !== 1) {
+		if (!intval($itemid)) {
 			$itemid = null;
 		}
 		$sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)", $modx->getFullTableName('active_users') // Table

manager/includes/tmplvars.format.inc.php

Spacing +78 added lines, -78 removed lines

@@ -5,7 +5,7 @@ 
  */
 
 // Added by Raymond 20-Jan-2005
-function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
+function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = ''){
 
 	global $modx;
 
@@ -14,29 +14,29 @@ 
 	$value = ProcessTVCommand($value, $name, $docid);
 
 	$params = array();
-	if($paramstring) {
+	if ($paramstring) {
 		$cp = explode("&", $paramstring);
-		foreach($cp as $p => $v) {
+		foreach ($cp as $p => $v) {
 			$v = trim($v); // trim
 			$ar = explode("=", $v);
-			if(is_array($ar) && count($ar) == 2) {
+			if (is_array($ar) && count($ar) == 2) {
 				$params[$ar[0]] = decodeParamValue($ar[1]);
 			}
 		}
 	}
 
 	$id = "tv$name";
-	switch($format) {
+	switch ($format) {
 		case 'image':
 			$images = parseInput($value, '||', 'array');
 			$o = '';
-			foreach($images as $image) {
-				if(!is_array($image)) {
+			foreach ($images as $image) {
+				if (!is_array($image)) {
 					$image = explode('==', $image);
 				}
 				$src = $image[0];
 
-				if($src) {
+				if ($src) {
 					// We have a valid source
 					$attributes = '';
 					$attr = array(
@@ -46,14 +46,14 @@ 
 						'alt' => $modx->htmlspecialchars($params['alttext']),
 						'style' => $params['style']
 					);
-					if(isset($params['align']) && $params['align'] != 'none') {
+					if (isset($params['align']) && $params['align'] != 'none') {
 						$attr['align'] = $params['align'];
 					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib'];
+					foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+					$attributes .= ' '.$params['attrib'];
 
 					// Output the image with attributes
-					$o .= '<img' . rtrim($attributes) . ' />';
+					$o .= '<img'.rtrim($attributes).' />';
 				}
 			}
 			break;
@@ -61,7 +61,7 @@ 
 		case "delim":    // display as delimitted list
 			$value = parseInput($value, "||");
 			$p = $params['format'] ? $params['format'] : " ";
-			if($p == "\\n") {
+			if ($p == "\\n") {
 				$p = "\n";
 			}
 			$o = str_replace("||", $p, $value);
@@ -70,13 +70,13 @@ 
 		case "string":
 			$value = parseInput($value);
 			$format = strtolower($params['format']);
-			if($format == 'upper case') {
+			if ($format == 'upper case') {
 				$o = strtoupper($value);
-			} else if($format == 'lower case') {
+			} else if ($format == 'lower case') {
 				$o = strtolower($value);
-			} else if($format == 'sentence case') {
+			} else if ($format == 'sentence case') {
 				$o = ucfirst($value);
-			} else if($format == 'capitalize') {
+			} else if ($format == 'capitalize') {
 				$o = ucwords($value);
 			} else {
 				$o = $value;
@@ -84,8 +84,8 @@ 
 			break;
 
 		case "date":
-			if($value != '' || $params['default'] == 'Yes') {
-				if(empty($value)) {
+			if ($value != '' || $params['default'] == 'Yes') {
+				if (empty($value)) {
 					$value = 'now';
 				}
 				$timestamp = getUnixtimeFromDateString($value);
@@ -99,13 +99,13 @@ 
 		case "hyperlink":
 			$value = parseInput($value, "||", "array");
 			$o = '';
-			for($i = 0; $i < count($value); $i++) {
+			for ($i = 0; $i < count($value); $i++) {
 				list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
-				if(!$url) {
+				if (!$url) {
 					$url = $name;
 				}
-				if($url) {
-					if($o) {
+				if ($url) {
+					if ($o) {
 						$o .= '<br />';
 					}
 					$attributes = '';
@@ -117,11 +117,11 @@ 
 						'style' => $params['style'],
 						'target' => $params['target'],
 					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib']; // add extra
+					foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+					$attributes .= ' '.$params['attrib']; // add extra
 
 					// Output the link
-					$o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
+					$o .= '<a'.rtrim($attributes).'>'.($params['text'] ? $modx->htmlspecialchars($params['text']) : $name).'</a>';
 				}
 			}
 			break;
@@ -132,9 +132,9 @@ 
 			$tagname = ($params['tagname']) ? $params['tagname'] : 'div';
 			$o = '';
 			// Loop through a list of tags
-			for($i = 0; $i < count($value); $i++) {
+			for ($i = 0; $i < count($value); $i++) {
 				$tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
-				if(!$tagvalue) {
+				if (!$tagvalue) {
 					continue;
 				}
 
@@ -145,11 +145,11 @@ 
 					'class' => $params['class'],
 					'style' => $params['style'],
 				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-				$attributes .= ' ' . $params['attrib']; // add extra
+				foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+				$attributes .= ' '.$params['attrib']; // add extra
 
 				// Output the HTML Tag
-				$o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+				$o .= '<'.$tagname.rtrim($attributes).'>'.$tagvalue.'</'.$tagname.'>';
 			}
 			break;
 
@@ -158,12 +158,12 @@ 
 			$w = $params['w'] ? $params['w'] : '100%';
 			$h = $params['h'] ? $params['h'] : '400px';
 			$richtexteditor = $params['edt'] ? $params['edt'] : "";
-			$o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
+			$o = '<div class="MODX_RichTextWidget"><textarea id="'.$id.'" name="'.$id.'" style="width:'.$w.'; height:'.$h.';">';
 			$o .= $modx->htmlspecialchars($value);
 			$o .= '</textarea></div>';
 			$replace_richtext = array($id);
 			// setup editors
-			if(!empty($replace_richtext) && !empty($richtexteditor)) {
+			if (!empty($replace_richtext) && !empty($richtexteditor)) {
 				// invoke OnRichTextEditorInit event
 				$evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
 					'editor' => $richtexteditor,
@@ -172,7 +172,7 @@ 
 					'width' => $w,
 					'height' => $h
 				));
-				if(is_array($evtOut)) {
+				if (is_array($evtOut)) {
 					$o .= implode("", $evtOut);
 				}
 			}
@@ -185,8 +185,8 @@ 
 
 		case "viewport":
 			$value = parseInput($value);
-			$id = '_' . time();
-			if(!$params['vpid']) {
+			$id = '_'.time();
+			if (!$params['vpid']) {
 				$params['vpid'] = $id;
 			}
 			$sTag = "<iframe";
@@ -194,42 +194,42 @@ 
 			$autoMode = "0";
 			$w = $params['width'];
 			$h = $params['height'];
-			if($params['stretch'] == 'Yes') {
+			if ($params['stretch'] == 'Yes') {
 				$w = "100%";
 				$h = "100%";
 			}
-			if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-				$autoMode = "3";  //both
-			} else if($params['awidth'] == 'Yes') {
+			if ($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
+				$autoMode = "3"; //both
+			} else if ($params['awidth'] == 'Yes') {
 				$autoMode = "1"; //width only
-			} else if($params['aheight'] == 'Yes') {
-				$autoMode = "2";    //height only
+			} else if ($params['aheight'] == 'Yes') {
+				$autoMode = "2"; //height only
 			}
 
-			$modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
+			$modx->regClientStartupScript(MODX_MANAGER_URL."media/script/bin/viewport.js", array(
 				'name' => 'viewport',
 				'version' => '0',
 				'plaintext' => false
 			));
-			$o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
-			if($params['class']) {
-				$o .= " class='" . $params['class'] . "' ";
+			$o = $sTag." id='".$params['vpid']."' name='".$params['vpid']."' ";
+			if ($params['class']) {
+				$o .= " class='".$params['class']."' ";
 			}
-			if($params['style']) {
-				$o .= " style='" . $params['style'] . "' ";
+			if ($params['style']) {
+				$o .= " style='".$params['style']."' ";
 			}
-			if($params['attrib']) {
-				$o .= $params['attrib'] . " ";
+			if ($params['attrib']) {
+				$o .= $params['attrib']." ";
 			}
-			$o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
-			$o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
-			$o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
+			$o .= "scrolling='".($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto"))."' ";
+			$o .= "src='".$value."' frameborder='".$params['borsize']."' ";
+			$o .= "onload=\"window.setTimeout('ResizeViewPort(\\'".$params['vpid']."\\',".$autoMode.")',100);\" width='".$w."' height='".$h."' ";
 			$o .= ">";
 			$o .= $eTag;
 			break;
 
 		case "datagrid":
-			include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+			include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 			$grd = new DataGrid('', $value);
 
 			$grd->noRecordMsg = $params['egmsg'];
@@ -264,7 +264,7 @@ 
 
 		case 'htmlentities':
 			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+			if ($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
 				// remove delimiter from checkbox and listbox-multiple TVs
 				$value = str_replace('||', '', $value);
 			}
@@ -275,33 +275,33 @@ 
 			$widget_output = '';
 			$o = '';
 			/* If we are loading a file */
-			if(substr($params['output'], 0, 5) == "@FILE") {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
+			if (substr($params['output'], 0, 5) == "@FILE") {
+				$file_name = MODX_BASE_PATH.trim(substr($params['output'], 6));
+				if (!file_exists($file_name)) {
+					$widget_output = $file_name.' does not exist';
 				} else {
 					$widget_output = file_get_contents($file_name);
 				}
-			} elseif(substr($params['output'], 0, 8) == '@INCLUDE') {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
+			} elseif (substr($params['output'], 0, 8) == '@INCLUDE') {
+				$file_name = MODX_BASE_PATH.trim(substr($params['output'], 9));
+				if (!file_exists($file_name)) {
+					$widget_output = $file_name.' does not exist';
 				} else {
 					/* The included file needs to set $widget_output. Can be string, array, object */
 					include $file_name;
 				}
-			} elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
+			} elseif (substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
 				$chunk_name = trim(substr($params['output'], 7));
 				$widget_output = $modx->getChunk($chunk_name);
-			} elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
+			} elseif (substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
 				$eval_str = trim(substr($params['output'], 6));
 				$widget_output = eval($eval_str);
-			} elseif($value !== '') {
+			} elseif ($value !== '') {
 				$widget_output = $params['output'];
 			} else {
 				$widget_output = '';
 			}
-			if(is_string($widget_output)) {
+			if (is_string($widget_output)) {
 				$_ = $modx->config['enable_filter'];
 				$modx->config['enable_filter'] = 1;
 				$widget_output = $modx->parseText($widget_output, array('value' => $value));
@@ -314,7 +314,7 @@ 
 
 		default:
 			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+			if ($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
 				// add separator
 				$value = explode('||', $value);
 				$value = implode($sep, $value);
@@ -325,23 +325,23 @@ 
 	return $o;
 }
 
-function decodeParamValue($s) {
+function decodeParamValue($s){
 	$s = str_replace("%3D", '=', $s); // =
 	$s = str_replace("%26", '&', $s); // &
 	return $s;
 }
 
 // returns an array if a delimiter is present. returns array is a recordset is present
-function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
+function parseInput($src, $delim = "||", $type = "string", $columns = true){ // type can be: string, array
 	global $modx;
-	if($modx->db->isResult($src)) {
+	if ($modx->db->isResult($src)) {
 		// must be a recordset
 		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		while ($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
 		return ($type == "array") ? $rows : implode($delim, $rows);
 	} else {
 		// must be a text
-		if($type == "array") {
+		if ($type == "array") {
 			return explode($delim, $src);
 		} else {
 			return $src;
@@ -349,21 +349,21 @@ 
 	}
 }
 
-function getUnixtimeFromDateString($value) {
+function getUnixtimeFromDateString($value){
 	$timestamp = false;
 	// Check for MySQL or legacy style date
 	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
 	$date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
 	$matches = array();
-	if(strpos($value, '-') !== false) {
-		if(preg_match($date_match_1, $value, $matches)) {
+	if (strpos($value, '-') !== false) {
+		if (preg_match($date_match_1, $value, $matches)) {
 			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
-		} elseif(preg_match($date_match_2, $value, $matches)) {
+		} elseif (preg_match($date_match_2, $value, $matches)) {
 			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
 		}
 	}
 	// If those didn't work, use strtotime to figure out the date
-	if($timestamp === false || $timestamp === -1) {
+	if ($timestamp === false || $timestamp === -1) {
 		$timestamp = strtotime($value);
 	}
 	return $timestamp;

manager/includes/rss.inc.php

Spacing +16 added lines, -16 removed lines

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

manager/includes/default_config.php

Spacing +1 added lines, -1 removed lines

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

 

-$c  = &$settings;

+$c = &$settings;

 

 $c['site_name']                = 'My MODX Site';

 $c['site_start']               = 1;

manager/includes/secure_web_documents.inc.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 
 /**
  *	Secure Web Documents
@@ -10,20 +10,20 @@ 
  *
  */
 
-function secureWebDocument($docid='') {
+function secureWebDocument($docid = ''){
 	global $modx;
 		
-	$modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privateweb = 1"));
+	$modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid > 0 ? "id='$docid'" : "privateweb = 1"));
 	$rs = $modx->db->select(
 		'DISTINCT sc.id',
 		$modx->getFullTableName("site_content")." sc
 			LEFT JOIN ".$modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
 			LEFT JOIN ".$modx->getFullTableName("webgroup_access")." wga ON wga.documentgroup = dg.document_group",
-		($docid>0 ? " sc.id='{$docid}' AND ":"")."wga.id>0"
+		($docid > 0 ? " sc.id='{$docid}' AND " : "")."wga.id>0"
 		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");	
+	$ids = $modx->db->getColumn("id", $rs);
+	if (count($ids) > 0) {
+		$modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ", $ids).")");	
 	}
 }
 ?>
\ No newline at end of file