evolution-cms / evolution

manager/media/browser/mcpuk/lib/helper_file.php

Doc Comments -2 removed lines

@@ -102,7 +102,6 @@ 
 
   /** Checks if the given file is really writable. The standard PHP function
     * is_writable() does not work properly on Windows servers.
-    * @param string $dir
     * @return bool */
 
     static function isWritable($filename) {
@@ -114,7 +113,6 @@ 
     }
 
   /** Get the extension from filename
-    * @param string $file
     * @param bool $toLower
     * @return string */
 

Indentation +48 added lines, -48 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc File helper class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc File helper class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class file {
 
@@ -100,10 +100,10 @@ 
         'zip'   => 'application/x-zip'
     );
 
-  /** Checks if the given file is really writable. The standard PHP function
-    * is_writable() does not work properly on Windows servers.
-    * @param string $dir
-    * @return bool */
+    /** Checks if the given file is really writable. The standard PHP function
+     * is_writable() does not work properly on Windows servers.
+     * @param string $dir
+     * @return bool */
 
     static function isWritable($filename) {
         $filename = path::normalize($filename);
@@ -113,26 +113,26 @@ 
         return true;
     }
 
-  /** Get the extension from filename
-    * @param string $file
-    * @param bool $toLower
-    * @return string */
+    /** Get the extension from filename
+     * @param string $file
+     * @param bool $toLower
+     * @return string */
 
     static function getExtension($filename, $toLower=true) {
         return preg_match('/^.*\.([^\.]*)$/s', $filename, $patt)
             ? ($toLower ? strtolower($patt[1]) : $patt[1]) : "";
     }
 
-  /** Get MIME type of the given filename. If Fileinfo PHP extension is
-    * available the MIME type will be fetched by the file's content. The
-    * second parameter is optional and defines the magic file path. If you
-    * skip it, the default one will be loaded.
-    * If Fileinfo PHP extension is not available the MIME type will be fetched
-    * by filename extension regarding $MIME property. If the file extension
-    * does not exist there, returned type will be application/octet-stream
-    * @param string $filename
-    * @param string $magic
-    * @return string */
+    /** Get MIME type of the given filename. If Fileinfo PHP extension is
+     * available the MIME type will be fetched by the file's content. The
+     * second parameter is optional and defines the magic file path. If you
+     * skip it, the default one will be loaded.
+     * If Fileinfo PHP extension is not available the MIME type will be fetched
+     * by filename extension regarding $MIME property. If the file extension
+     * does not exist there, returned type will be application/octet-stream
+     * @param string $filename
+     * @param string $magic
+     * @return string */
 
     static function getMimeType($filename, $magic=null) {
         if (class_exists("finfo")) {
@@ -149,26 +149,26 @@ 
         return isset(self::$MIME[$ext]) ? self::$MIME[$ext] : "application/octet-stream";
     }
 
-  /** Get inexistant filename based on the given filename. If you skip $dir
-    * parameter the directory will be fetched from $filename and returned
-    * value will be full filename path. The third parameter is optional and
-    * defines the template, the filename will be renamed to. Default template
-    * is {name}({sufix}){ext}. Examples:
-    *
-    *   file::getInexistantFilename("/my/directory/myfile.txt");
-    *   If myfile.txt does not exist - returns the same path to the file
-    *   otherwise returns "/my/directory/myfile(1).txt"
-    *
-    *   file::getInexistantFilename("myfile.txt", "/my/directory");
-    *   returns "myfile.txt" or "myfile(1).txt" or "myfile(2).txt" etc...
-    *
-    *   file::getInexistantFilename("myfile.txt", "/dir", "{name}[{sufix}]{ext}");
-    *   returns "myfile.txt" or "myfile[1].txt" or "myfile[2].txt" etc...
-    *
-    * @param string $filename
-    * @param string $dir
-    * @param string $tpl
-    * @return string */
+    /** Get inexistant filename based on the given filename. If you skip $dir
+     * parameter the directory will be fetched from $filename and returned
+     * value will be full filename path. The third parameter is optional and
+     * defines the template, the filename will be renamed to. Default template
+     * is {name}({sufix}){ext}. Examples:
+     *
+     *   file::getInexistantFilename("/my/directory/myfile.txt");
+     *   If myfile.txt does not exist - returns the same path to the file
+     *   otherwise returns "/my/directory/myfile(1).txt"
+     *
+     *   file::getInexistantFilename("myfile.txt", "/my/directory");
+     *   returns "myfile.txt" or "myfile(1).txt" or "myfile(2).txt" etc...
+     *
+     *   file::getInexistantFilename("myfile.txt", "/dir", "{name}[{sufix}]{ext}");
+     *   returns "myfile.txt" or "myfile[1].txt" or "myfile[2].txt" etc...
+     *
+     * @param string $filename
+     * @param string $dir
+     * @param string $tpl
+     * @return string */
 
     static function getInexistantFilename($filename, $dir=null, $tpl=null) {
         if ($tpl === null)  $tpl = "{name}({sufix}){ext}";

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class file {
+class file{
 
     static $MIME = array(
         'ai'    => 'application/postscript',
@@ -105,7 +105,7 @@ 
     * @param string $dir
     * @return bool */
 
-    static function isWritable($filename) {
+    static function isWritable($filename){
         $filename = path::normalize($filename);
         if (!is_file($filename) || (false === ($fp = @fopen($filename, 'a+'))))
             return false;
@@ -118,7 +118,7 @@ 
     * @param bool $toLower
     * @return string */
 
-    static function getExtension($filename, $toLower=true) {
+    static function getExtension($filename, $toLower = true){
         return preg_match('/^.*\.([^\.]*)$/s', $filename, $patt)
             ? ($toLower ? strtolower($patt[1]) : $patt[1]) : "";
     }
@@ -134,7 +134,7 @@ 
     * @param string $magic
     * @return string */
 
-    static function getMimeType($filename, $magic=null) {
+    static function getMimeType($filename, $magic = null){
         if (class_exists("finfo")) {
             $finfo = ($magic === null)
                 ? new finfo(FILEINFO_MIME)
@@ -170,7 +170,7 @@ 
     * @param string $tpl
     * @return string */
 
-    static function getInexistantFilename($filename, $dir=null, $tpl=null) {
+    static function getInexistantFilename($filename, $dir = null, $tpl = null){
         if ($tpl === null)  $tpl = "{name}({sufix}){ext}";
         $fullPath = ($dir === null);
         if ($fullPath)
@@ -188,12 +188,12 @@ 
         $tpl = str_replace('{ext}', (strlen($ext) ? ".$ext" : ""), $tpl);
         $i = 1; $file = "$dir/$filename";
         while (file_exists($file))
-            $file = "$dir/" . str_replace('{sufix}', $i++, $tpl);
+            $file = "$dir/".str_replace('{sufix}', $i++, $tpl);
 
         return $fullPath
             ? $file
             : (strlen($fdir)
-                ? "$fdir/" . basename($file)
+                ? "$fdir/".basename($file)
                 : basename($file));
     }
 

Braces +22 added lines, -13 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class file {
+class file
+{
 
     static $MIME = array(
         'ai'    => 'application/postscript',
@@ -105,10 +106,12 @@ 
     * @param string $dir
     * @return bool */
 
-    static function isWritable($filename) {
+    static function isWritable($filename)
+    {
         $filename = path::normalize($filename);
-        if (!is_file($filename) || (false === ($fp = @fopen($filename, 'a+'))))
-            return false;
+        if (!is_file($filename) || (false === ($fp = @fopen($filename, 'a+')))) {
+                    return false;
+        }
         fclose($fp);
         return true;
     }
@@ -118,7 +121,8 @@ 
     * @param bool $toLower
     * @return string */
 
-    static function getExtension($filename, $toLower=true) {
+    static function getExtension($filename, $toLower=true)
+    {
         return preg_match('/^.*\.([^\.]*)$/s', $filename, $patt)
             ? ($toLower ? strtolower($patt[1]) : $patt[1]) : "";
     }
@@ -134,7 +138,8 @@ 
     * @param string $magic
     * @return string */
 
-    static function getMimeType($filename, $magic=null) {
+    static function getMimeType($filename, $magic=null)
+    {
         if (class_exists("finfo")) {
             $finfo = ($magic === null)
                 ? new finfo(FILEINFO_MIME)
@@ -170,12 +175,15 @@ 
     * @param string $tpl
     * @return string */
 
-    static function getInexistantFilename($filename, $dir=null, $tpl=null) {
-        if ($tpl === null)  $tpl = "{name}({sufix}){ext}";
+    static function getInexistantFilename($filename, $dir=null, $tpl=null)
+    {
+        if ($tpl === null) {
+            $tpl = "{name}({sufix}){ext}";
+        }
         $fullPath = ($dir === null);
-        if ($fullPath)
-            $dir = path::normalize(dirname($filename));
-        else {
+        if ($fullPath) {
+                    $dir = path::normalize(dirname($filename));
+        } else {
             $fdir = dirname($filename);
             $dir = strlen($fdir)
                 ? path::normalize("$dir/$fdir")
@@ -187,8 +195,9 @@ 
         $tpl = str_replace('{name}', $name, $tpl);
         $tpl = str_replace('{ext}', (strlen($ext) ? ".$ext" : ""), $tpl);
         $i = 1; $file = "$dir/$filename";
-        while (file_exists($file))
-            $file = "$dir/" . str_replace('{sufix}', $i++, $tpl);
+        while (file_exists($file)) {
+                    $file = "$dir/" . str_replace('{sufix}', $i++, $tpl);
+        }
 
         return $fullPath
             ? $file

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

Doc Comments +7 added lines

@@ -616,6 +616,9 @@ 
         Output:
     \*======================================================================*/
 
+    /**
+     * @param string $http_method
+     */
     function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
     {
         $cookie_headers = '';
@@ -923,6 +926,10 @@ 
         Output:		post body
     \*======================================================================*/
 
+    /**
+     * @param string $formvars
+     * @param string $formfiles
+     */
     function _prepare_post_body($formvars, $formfiles)
     {
         settype($formvars, "array");

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

Braces +192 added lines, -127 removed lines

@@ -121,14 +121,18 @@ 
     {
 
         $URI_PARTS = parse_url($URI);
-        if (!empty($URI_PARTS["user"]))
-            $this->user = $URI_PARTS["user"];
-        if (!empty($URI_PARTS["pass"]))
-            $this->pass = $URI_PARTS["pass"];
-        if (empty($URI_PARTS["query"]))
-            $URI_PARTS["query"] = '';
-        if (empty($URI_PARTS["path"]))
-            $URI_PARTS["path"] = '';
+        if (!empty($URI_PARTS["user"])) {
+                    $this->user = $URI_PARTS["user"];
+        }
+        if (!empty($URI_PARTS["pass"])) {
+                    $this->pass = $URI_PARTS["pass"];
+        }
+        if (empty($URI_PARTS["query"])) {
+                    $URI_PARTS["query"] = '';
+        }
+        if (empty($URI_PARTS["path"])) {
+                    $URI_PARTS["path"] = '';
+        }
 
         $fp = null;
 
@@ -142,8 +146,9 @@ 
             case "http":
                 $this->scheme = strtolower($URI_PARTS["scheme"]);
                 $this->host = $URI_PARTS["host"];
-                if (!empty($URI_PARTS["port"]))
-                    $this->port = $URI_PARTS["port"];
+                if (!empty($URI_PARTS["port"])) {
+                                    $this->port = $URI_PARTS["port"];
+                }
                 if ($this->_connect($fp)) {
                     if ($this->_isproxy) {
                         // using proxy, send entire URI
@@ -177,8 +182,9 @@ 
                             if ($this->_framedepth < $this->maxframes) {
                                 $this->fetch($frameurl);
                                 $this->_framedepth++;
-                            } else
-                                break;
+                            } else {
+                                                            break;
+                            }
                         }
                     }
                 } else {
@@ -213,14 +219,18 @@ 
         $postdata = $this->_prepare_post_body($formvars, $formfiles);
 
         $URI_PARTS = parse_url($URI);
-        if (!empty($URI_PARTS["user"]))
-            $this->user = $URI_PARTS["user"];
-        if (!empty($URI_PARTS["pass"]))
-            $this->pass = $URI_PARTS["pass"];
-        if (empty($URI_PARTS["query"]))
-            $URI_PARTS["query"] = '';
-        if (empty($URI_PARTS["path"]))
-            $URI_PARTS["path"] = '';
+        if (!empty($URI_PARTS["user"])) {
+                    $this->user = $URI_PARTS["user"];
+        }
+        if (!empty($URI_PARTS["pass"])) {
+                    $this->pass = $URI_PARTS["pass"];
+        }
+        if (empty($URI_PARTS["query"])) {
+                    $URI_PARTS["query"] = '';
+        }
+        if (empty($URI_PARTS["path"])) {
+                    $URI_PARTS["path"] = '';
+        }
 
         switch (strtolower($URI_PARTS["scheme"])) {
             case "https":
@@ -232,8 +242,9 @@ 
             case "http":
                 $this->scheme = strtolower($URI_PARTS["scheme"]);
                 $this->host = $URI_PARTS["host"];
-                if (!empty($URI_PARTS["port"]))
-                    $this->port = $URI_PARTS["port"];
+                if (!empty($URI_PARTS["port"])) {
+                                    $this->port = $URI_PARTS["port"];
+                }
                 if ($this->_connect($fp)) {
                     if ($this->_isproxy) {
                         // using proxy, send entire URI
@@ -249,18 +260,22 @@ 
                     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) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
-                                if (strpos($this->_redirectaddr, "?") > 0)
-                                    $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
-                                else
-                                    $this->submit($this->_redirectaddr, $formvars, $formfiles);
+                                if (strpos($this->_redirectaddr, "?") > 0) {
+                                                                    $this->fetch($this->_redirectaddr);
+                                }
+                                // the redirect has changed the request method from post to get
+                                else {
+                                                                    $this->submit($this->_redirectaddr, $formvars, $formfiles);
+                                }
                             }
                         }
                     }
@@ -273,8 +288,9 @@ 
                             if ($this->_framedepth < $this->maxframes) {
                                 $this->fetch($frameurl);
                                 $this->_framedepth++;
-                            } else
-                                break;
+                            } else {
+                                                            break;
+                            }
                         }
                     }
 
@@ -302,19 +318,24 @@ 
     function fetchlinks($URI)
     {
         if ($this->fetch($URI) !== false) {
-            if ($this->lastredirectaddr)
-                $URI = $this->lastredirectaddr;
+            if ($this->lastredirectaddr) {
+                            $URI = $this->lastredirectaddr;
+            }
             if (is_array($this->results)) {
-                for ($x = 0; $x < count($this->results); $x++)
-                    $this->results[$x] = $this->_striplinks($this->results[$x]);
-            } else
-                $this->results = $this->_striplinks($this->results);
+                for ($x = 0; $x < count($this->results); $x++) {
+                                    $this->results[$x] = $this->_striplinks($this->results[$x]);
+                }
+            } else {
+                            $this->results = $this->_striplinks($this->results);
+            }
 
-            if ($this->expandlinks)
-                $this->results = $this->_expandlinks($this->results, $URI);
+            if ($this->expandlinks) {
+                            $this->results = $this->_expandlinks($this->results, $URI);
+            }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -330,14 +351,17 @@ 
         if ($this->fetch($URI) !== false) {
 
             if (is_array($this->results)) {
-                for ($x = 0; $x < count($this->results); $x++)
-                    $this->results[$x] = $this->_stripform($this->results[$x]);
-            } else
-                $this->results = $this->_stripform($this->results);
+                for ($x = 0; $x < count($this->results); $x++) {
+                                    $this->results[$x] = $this->_stripform($this->results[$x]);
+                }
+            } else {
+                            $this->results = $this->_stripform($this->results);
+            }
 
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
@@ -352,13 +376,16 @@ 
     {
         if ($this->fetch($URI) !== false) {
             if (is_array($this->results)) {
-                for ($x = 0; $x < count($this->results); $x++)
-                    $this->results[$x] = $this->_striptext($this->results[$x]);
-            } else
-                $this->results = $this->_striptext($this->results);
+                for ($x = 0; $x < count($this->results); $x++) {
+                                    $this->results[$x] = $this->_striptext($this->results[$x]);
+                }
+            } else {
+                            $this->results = $this->_striptext($this->results);
+            }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -371,22 +398,26 @@ 
     function submitlinks($URI, $formvars = "", $formfiles = "")
     {
         if ($this->submit($URI, $formvars, $formfiles) !== false) {
-            if ($this->lastredirectaddr)
-                $URI = $this->lastredirectaddr;
+            if ($this->lastredirectaddr) {
+                            $URI = $this->lastredirectaddr;
+            }
             if (is_array($this->results)) {
                 for ($x = 0; $x < count($this->results); $x++) {
                     $this->results[$x] = $this->_striplinks($this->results[$x]);
-                    if ($this->expandlinks)
-                        $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    if ($this->expandlinks) {
+                                            $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    }
                 }
             } else {
                 $this->results = $this->_striplinks($this->results);
-                if ($this->expandlinks)
-                    $this->results = $this->_expandlinks($this->results, $URI);
+                if ($this->expandlinks) {
+                                    $this->results = $this->_expandlinks($this->results, $URI);
+                }
             }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -399,22 +430,26 @@ 
     function submittext($URI, $formvars = "", $formfiles = "")
     {
         if ($this->submit($URI, $formvars, $formfiles) !== false) {
-            if ($this->lastredirectaddr)
-                $URI = $this->lastredirectaddr;
+            if ($this->lastredirectaddr) {
+                            $URI = $this->lastredirectaddr;
+            }
             if (is_array($this->results)) {
                 for ($x = 0; $x < count($this->results); $x++) {
                     $this->results[$x] = $this->_striptext($this->results[$x]);
-                    if ($this->expandlinks)
-                        $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    if ($this->expandlinks) {
+                                            $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    }
                 }
             } else {
                 $this->results = $this->_striptext($this->results);
-                if ($this->expandlinks)
-                    $this->results = $this->_expandlinks($this->results, $URI);
+                if ($this->expandlinks) {
+                                    $this->results = $this->_expandlinks($this->results, $URI);
+                }
             }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
@@ -468,13 +503,15 @@ 
         // catenate the non-empty matches from the conditional subpattern
 
         while (list($key, $val) = each($links[2])) {
-            if (!empty($val))
-                $match[] = $val;
+            if (!empty($val)) {
+                            $match[] = $val;
+            }
         }
 
         while (list($key, $val) = each($links[3])) {
-            if (!empty($val))
-                $match[] = $val;
+            if (!empty($val)) {
+                            $match[] = $val;
+            }
         }
 
         // return the links
@@ -619,23 +656,28 @@ 
     function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
     {
         $cookie_headers = '';
-        if ($this->passcookies && $this->_redirectaddr)
-            $this->setcookies();
+        if ($this->passcookies && $this->_redirectaddr) {
+                    $this->setcookies();
+        }
 
         $URI_PARTS = parse_url($URI);
-        if (empty($url))
-            $url = "/";
+        if (empty($url)) {
+                    $url = "/";
+        }
         $headers = $http_method . " " . $url . " " . $this->_httpversion . "\r\n";
         if (!empty($this->host) && !isset($this->rawheaders['Host'])) {
             $headers .= "Host: " . $this->host;
-            if (!empty($this->port) && $this->port != '80')
-                $headers .= ":" . $this->port;
+            if (!empty($this->port) && $this->port != '80') {
+                            $headers .= ":" . $this->port;
+            }
             $headers .= "\r\n";
         }
-        if (!empty($this->agent))
-            $headers .= "User-Agent: " . $this->agent . "\r\n";
-        if (!empty($this->accept))
-            $headers .= "Accept: " . $this->accept . "\r\n";
+        if (!empty($this->agent)) {
+                    $headers .= "User-Agent: " . $this->agent . "\r\n";
+        }
+        if (!empty($this->accept)) {
+                    $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
@@ -648,11 +690,13 @@ 
                     E_USER_NOTICE);
             }
         }
-        if (!empty($this->referer))
-            $headers .= "Referer: " . $this->referer . "\r\n";
+        if (!empty($this->referer)) {
+                    $headers .= "Referer: " . $this->referer . "\r\n";
+        }
         if (!empty($this->cookies)) {
-            if (!is_array($this->cookies))
-                $this->cookies = (array)$this->cookies;
+            if (!is_array($this->cookies)) {
+                            $this->cookies = (array)$this->cookies;
+            }
 
             reset($this->cookies);
             if (count($this->cookies) > 0) {
@@ -664,32 +708,39 @@ 
             }
         }
         if (!empty($this->rawheaders)) {
-            if (!is_array($this->rawheaders))
-                $this->rawheaders = (array)$this->rawheaders;
-            while (list($headerKey, $headerVal) = each($this->rawheaders))
-                $headers .= $headerKey . ": " . $headerVal . "\r\n";
+            if (!is_array($this->rawheaders)) {
+                            $this->rawheaders = (array)$this->rawheaders;
+            }
+            while (list($headerKey, $headerVal) = each($this->rawheaders)) {
+                            $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;
+            if ($content_type == "multipart/form-data") {
+                            $headers .= "; boundary=" . $this->_mime_boundary;
+            }
             $headers .= "\r\n";
         }
-        if (!empty($body))
-            $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";
+        if (!empty($body)) {
+                    $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";
+        }
 
         //add proxy auth headers
-        if (!empty($this->proxy_user))
-            $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+        if (!empty($this->proxy_user)) {
+                    $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+        }
 
 
         $headers .= "\r\n";
 
         // set the read timeout if needed
-        if ($this->read_timeout > 0)
-            socket_set_timeout($fp, $this->read_timeout);
+        if ($this->read_timeout > 0) {
+                    socket_set_timeout($fp, $this->read_timeout);
+        }
         $this->timed_out = false;
 
         fwrite($fp, $headers . $body, strlen($headers . $body));
@@ -706,8 +757,9 @@ 
                 return false;
             }
 
-            if ($currentHeader == "\r\n")
-                break;
+            if ($currentHeader == "\r\n") {
+                            break;
+            }
 
             // if a header begins with Location: or URI:, set the redirect
             if (preg_match("/^(Location:|URI:)/i", $currentHeader)) {
@@ -718,12 +770,14 @@ 
                     // no host in the path, so prepend
                     $this->_redirectaddr = $URI_PARTS["scheme"] . "://" . $this->host . ":" . $this->port;
                     // eliminate double slash
-                    if (!preg_match("|^/|", $matches[2]))
-                        $this->_redirectaddr .= "/" . $matches[2];
-                    else
-                        $this->_redirectaddr .= $matches[2];
-                } else
-                    $this->_redirectaddr = $matches[2];
+                    if (!preg_match("|^/|", $matches[2])) {
+                                            $this->_redirectaddr .= "/" . $matches[2];
+                    } else {
+                                            $this->_redirectaddr .= $matches[2];
+                    }
+                } else {
+                                    $this->_redirectaddr = $matches[2];
+                }
             }
 
             if (preg_match("|^HTTP/|", $currentHeader)) {
@@ -770,14 +824,17 @@ 
         // have we hit our frame depth and is there frame src to fetch?
         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);
+            for ($x = 0; $x < count($match[1]); $x++) {
+                            $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;
+        elseif (is_array($this->results)) {
+                    $this->results[] = $results;
+        }
         // no framed content
-        else
-            $this->results = $results;
+        else {
+                    $this->results = $results;
+        }
 
         return $this;
     }
@@ -790,8 +847,9 @@ 
     function setcookies()
     {
         for ($x = 0; $x < count($this->headers); $x++) {
-            if (preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x], $match))
-                $this->cookies[$match[1]] = urldecode($match[2]);
+            if (preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x], $match)) {
+                            $this->cookies[$match[1]] = urldecode($match[2]);
+            }
         }
         return $this;
     }
@@ -852,10 +910,12 @@ 
                     'disable_compression' => true,
                 );
 
-                if (isset($this->cafile))
-                    $context_opts['ssl']['cafile'] = $this->cafile;
-                if (isset($this->capath))
-                    $context_opts['ssl']['capath'] = $this->capath;
+                if (isset($this->cafile)) {
+                                    $context_opts['ssl']['cafile'] = $this->cafile;
+                }
+                if (isset($this->capath)) {
+                                    $context_opts['ssl']['capath'] = $this->capath;
+                }
             }
                     
             $host = 'ssl://' . $host;
@@ -864,8 +924,9 @@ 
         $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,
@@ -929,8 +990,9 @@ 
         settype($formfiles, "array");
         $postdata = '';
 
-        if (count($formvars) == 0 && count($formfiles) == 0)
-            return;
+        if (count($formvars) == 0 && count($formfiles) == 0) {
+                    return;
+        }
 
         switch ($this->_submit_type) {
             case "application/x-www-form-urlencoded":
@@ -940,8 +1002,9 @@ 
                         while (list($cur_key, $cur_val) = each($val)) {
                             $postdata .= urlencode($key) . "[]=" . urlencode($cur_val) . "&";
                         }
-                    } else
-                        $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                    } else {
+                                            $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                    }
                 }
                 break;
 
@@ -967,7 +1030,9 @@ 
                 while (list($field_name, $file_names) = each($formfiles)) {
                     settype($file_names, "array");
                     while (list(, $file_name) = each($file_names)) {
-                        if (!is_readable($file_name)) continue;
+                        if (!is_readable($file_name)) {
+                            continue;
+                        }
 
                         $fp = fopen($file_name, "r");
                         $file_content = fread($fp, filesize($file_name));

manager/media/rss/rss_fetch.inc

Doc Comments +6 added lines

@@ -243,6 +243,9 @@ 
         }
 }
 
+/**
+ * @param integer $lvl
+ */
 function debug ($debugmsg, $lvl=E_USER_NOTICE) {
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
@@ -289,6 +292,9 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
+/**
+ * @param Snoopy $resp
+ */
 function _response_to_rss ($resp) {
     $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
     

Indentation +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
         $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) {
                     debug("Got 304 for $url");

Spacing +79 added lines, -79 removed lines

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

Braces +38 added lines, -32 removed lines

@@ -89,7 +89,8 @@ 
 
 $MAGPIE_ERROR = "";
 
-function fetch_rss ($url) {
+function fetch_rss ($url)
+{
     // initialize constants
     init();
 
@@ -104,8 +105,7 @@ 
         $resp = _fetch_remote_file( $url );
         if ( is_success( $resp->status ) ) {
             return _response_to_rss( $resp );
-        }
-        else {
+        } else {
             error("Failed to fetch $url and cache is off");
             return false;
         }
@@ -174,8 +174,7 @@ 
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
-            }
-            elseif ( is_success( $resp->status ) ) {
+            } elseif ( is_success( $resp->status ) ) {
                 $rss = _response_to_rss( $resp );
                 if ( $rss ) {
                     if (MAGPIE_DEBUG > 1) {
@@ -185,24 +184,20 @@ 
                     $cache->set( $cache_key, $rss );
                     return $rss;
                 }
-            }
-            else {
+            } else {
                 $errormsg = "Failed to fetch $url ";
                 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 {
+                } else {
                     $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
                 }
             }
-        }
-        else {
+        } else {
             $errormsg = "Unable to retrieve RSS file for unknown reasons.";
         }
 
@@ -229,7 +224,8 @@ 
     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
@@ -243,7 +239,8 @@ 
         }
 }
 
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+function debug ($debugmsg, $lvl=E_USER_NOTICE)
+{
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
 
@@ -251,7 +248,8 @@ 
     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 ) {
@@ -268,7 +266,8 @@ 
                 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;
@@ -289,7 +288,8 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
-function _response_to_rss ($resp) {
+function _response_to_rss ($resp)
+{
     $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
 
     // if RSS parsed successfully
@@ -300,8 +300,7 @@ 
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
-            }
-            else {
+            } else {
                 $field = $h;
                 $val = "";
             }
@@ -334,11 +333,11 @@ 
     Purpose:    setup constants with default values
                 check for user overrides
 \*=======================================================================*/
-function init () {
+function init ()
+{
     if ( defined('MAGPIE_INITALIZED') ) {
         return;
-    }
-    else {
+    } else {
         define('MAGPIE_INITALIZED', true);
     }
 
@@ -360,7 +359,9 @@ 
 
     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);
     }
 
@@ -381,8 +382,7 @@ 
 
         if ( MAGPIE_CACHE_ON ) {
             $ua = $ua . ')';
-        }
-        else {
+        } else {
             $ua = $ua . '; No cache)';
         }
 
@@ -417,7 +417,8 @@ 
     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 +426,8 @@ 
     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 +435,8 @@ 
     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 +444,8 @@ 
     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 +453,8 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a client error
 \*=======================================================================*/
-function is_client_error ($sc) {
+function is_client_error ($sc)
+{
     return $sc >= 400 && $sc < 500;
 }
 
@@ -457,6 +462,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/processors/cache_sync.class.processor.php

Doc Comments +13 added lines, -1 removed lines

@@ -18,11 +18,17 @@ 
         $this->request_time = $_SERVER['REQUEST_TIME'] + $modx->config['server_offset_time'];
     }
 
+    /**
+     * @param string $path
+     */
     function setCachepath($path)
     {
         $this->cachePath = $path;
     }
 
+    /**
+     * @param boolean $bool
+     */
     function setReport($bool)
     {
         $this->showReport = $bool;
@@ -45,6 +51,9 @@ 
         return str_replace($q1, $q2, $s);
     }
 
+    /**
+     * @return string
+     */
     function getParents($id, $path = '')
     { // modx:returns child's parent
         global $modx;
@@ -148,6 +157,9 @@ 
         }
     }
 
+    /**
+     * @return string
+     */
     public function getCacheRefreshTime()
     {
         global $modx;
@@ -190,7 +202,7 @@ 
     /**
      * build siteCache file
      * @param  DocumentParser $modx
-     * @return boolean success
+     * @return null|boolean success
      */
     public function buildCache($modx)
     {

Spacing +29 added lines, -29 removed lines

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

Braces +4 added lines, -2 removed lines

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

install/setup.info.php

Indentation +64 added lines, -64 removed lines

@@ -170,70 +170,70 @@
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-		if (intval($params['shareparams']) || !empty($params['dependencies'])) {
-			$dependencies = explode(',', $params['dependencies']);
-			foreach ($dependencies as $dependency) {
-				$dependency = explode(':', $dependency);
-				switch (trim($dependency[0])) {
-					case 'template':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'templates',
-							'column' => 'templatename',
-							'type' => 50,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'tv':
-					case 'tmplvar':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'tmplvars',
-							'column' => 'name',
-							'type' => 60,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'chunk':
-					case 'htmlsnippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'htmlsnippets',
-							'column' => 'name',
-							'type' => 10,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'snippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'snippets',
-							'column' => 'name',
-							'type' => 40,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'plugin':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'plugins',
-							'column' => 'name',
-							'type' => 30,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'resource':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'content',
-							'column' => 'pagetitle',
-							'type' => 20,
-							'name' => trim($dependency[1])
-						);
-						break;
-				}
-			}
-		}
+        if (intval($params['shareparams']) || !empty($params['dependencies'])) {
+            $dependencies = explode(',', $params['dependencies']);
+            foreach ($dependencies as $dependency) {
+                $dependency = explode(':', $dependency);
+                switch (trim($dependency[0])) {
+                    case 'template':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'templates',
+                            'column' => 'templatename',
+                            'type' => 50,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'tv':
+                    case 'tmplvar':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'tmplvars',
+                            'column' => 'name',
+                            'type' => 60,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'chunk':
+                    case 'htmlsnippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'htmlsnippets',
+                            'column' => 'name',
+                            'type' => 10,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'snippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'snippets',
+                            'column' => 'name',
+                            'type' => 40,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'plugin':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'plugins',
+                            'column' => 'name',
+                            'type' => 30,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'resource':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'content',
+                            'column' => 'pagetitle',
+                            'type' => 20,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                }
+            }
+        }
     }
     $d->close();
 }

Spacing +64 added lines, -65 removed lines

@@ -1,33 +1,32 @@ 
 <?php
 //:: EVO Installer Setup file
 //:::::::::::::::::::::::::::::::::::::::::
-if (is_file($base_path . 'assets/cache/siteManager.php')) {
-    include_once($base_path . 'assets/cache/siteManager.php');
+if (is_file($base_path.'assets/cache/siteManager.php')) {
+    include_once($base_path.'assets/cache/siteManager.php');
 }
-if(!defined('MGR_DIR')) define('MGR_DIR', 'manager');
+if (!defined('MGR_DIR')) define('MGR_DIR', 'manager');
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
-$chunkPath    = $base_path .'install/assets/chunks';
-$snippetPath  = $base_path .'install/assets/snippets';
-$pluginPath   = $base_path .'install/assets/plugins';
-$modulePath   = $base_path .'install/assets/modules';
-$templatePath = $base_path .'install/assets/templates';
-$tvPath = $base_path .'install/assets/tvs';
+$chunkPath    = $base_path.'install/assets/chunks';
+$snippetPath  = $base_path.'install/assets/snippets';
+$pluginPath   = $base_path.'install/assets/plugins';
+$modulePath   = $base_path.'install/assets/modules';
+$templatePath = $base_path.'install/assets/templates';
+$tvPath = $base_path.'install/assets/tvs';
 
 // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category
 $mt = &$moduleTemplates;
-if(is_dir($templatePath) && is_readable($templatePath)) {
+if (is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
     while (false !== ($tplfile = $d->read()))
     {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if (substr($tplfile, -4) != '.tpl') continue;
         $params = parse_docblock($templatePath, $tplfile);
-        if(is_array($params) && (count($params)>0))
+        if (is_array($params) && (count($params) > 0))
         {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
-            $mt[] = array
-            (
+            $mt[] = array(
                 $params['name'],
                 $description,
                 // Don't think this is gonna be used ... but adding it just in case 'type'
@@ -45,12 +44,12 @@ 
 
 // setup Template Variable template files
 $mtv = &$moduleTVs;
-if(is_dir($tvPath) && is_readable($tvPath)) {
+if (is_dir($tvPath) && is_readable($tvPath)) {
     $d = dir($tvPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if (substr($tplfile, -4) != '.tpl') continue;
         $params = parse_docblock($tvPath, $tplfile);
-        if(is_array($params) && (count($params)>0)) {
+        if (is_array($params) && (count($params) > 0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mtv[] = array(
                 $params['name'],
@@ -62,9 +61,9 @@ 
                 $params['output_widget'],
                 $params['output_widget_params'],
                 "$templatePath/{$params['filename']}", /* not currently used */
-                $params['template_assignments']!="*"?$params['template_assignments']:implode(",",array_map(create_function('$v','return $v[0];'),$mt)), /* comma-separated list of template names */
+                $params['template_assignments'] != "*" ? $params['template_assignments'] : implode(",", array_map(create_function('$v', 'return $v[0];'), $mt)), /* comma-separated list of template names */
                 $params['modx_category'],
-                $params['lock_tv'],  /* value should be 1 or 0 */
+                $params['lock_tv'], /* value should be 1 or 0 */
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
@@ -74,14 +73,14 @@ 
 
 // setup chunks template files - array : name, description, type - 0:file or 1:content, file or content
 $mc = &$moduleChunks;
-if(is_dir($chunkPath) && is_readable($chunkPath)) {
+if (is_dir($chunkPath) && is_readable($chunkPath)) {
     $d = dir($chunkPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($chunkPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $mc[] = array(
                 $params['name'],
                 $params['description'],
@@ -97,14 +96,14 @@ 
 
 // setup snippets template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $ms = &$moduleSnippets;
-if(is_dir($snippetPath) && is_readable($snippetPath)) {
+if (is_dir($snippetPath) && is_readable($snippetPath)) {
     $d = dir($snippetPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($snippetPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $ms[] = array(
                 $params['name'],
@@ -121,14 +120,14 @@ 
 
 // setup plugins template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $mp = &$modulePlugins;
-if(is_dir($pluginPath) && is_readable($pluginPath)) {
+if (is_dir($pluginPath) && is_readable($pluginPath)) {
     $d = dir($pluginPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($pluginPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mp[] = array(
                 $params['name'],
@@ -150,14 +149,14 @@ 
 // setup modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid,enable_sharedparams
 $mm = &$moduleModules;
 $mdp = &$moduleDependencies;
-if(is_dir($modulePath) && is_readable($modulePath)) {
+if (is_dir($modulePath) && is_readable($modulePath)) {
     $d = dir($modulePath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($modulePath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mm[] = array(
                 $params['name'],
@@ -241,109 +240,109 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser){
     $ids = array();
     $mysqlVerOk = -1;
 
-    if(function_exists("mysqli_get_server_info")) {
-        $mysqlVerOk = (version_compare(mysqli_get_server_info($sqlParser->conn),"4.0.2")>=0);
+    if (function_exists("mysqli_get_server_info")) {
+        $mysqlVerOk = (version_compare(mysqli_get_server_info($sqlParser->conn), "4.0.2") >= 0);
     }
 
     // secure web documents - privateweb
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group
              WHERE wga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $ds = mysqli_query($sqlParser->conn, $sql);
+    if (!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
     }
     else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
+        while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"];
+        if (count($ids) > 0) {
+            mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ", $ids).")");
             unset($ids);
         }
     }
 
     // secure manager documents privatemgr
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group
              WHERE mga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $ds = mysqli_query($sqlParser->conn, $sql);
+    if (!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
     }
     else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
+        while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"];
+        if (count($ids) > 0) {
+            mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ", $ids).")");
             unset($ids);
         }
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename){
     $params = array();
-    $fullpath = $element_dir . '/' . $filename;
-    if(is_readable($fullpath)) {
+    $fullpath = $element_dir.'/'.$filename;
+    if (is_readable($fullpath)) {
         $tpl = @fopen($fullpath, "r");
-        if($tpl) {
+        if ($tpl) {
             $params['filename'] = $filename;
             $docblock_start_found = false;
             $name_found = false;
             $description_found = false;
             $docblock_end_found = false;
 
-            while(!feof($tpl)) {
+            while (!feof($tpl)) {
                 $line = fgets($tpl);
-                if(!$docblock_start_found) {
+                if (!$docblock_start_found) {
                     // find docblock start
-                    if(strpos($line, '/**') !== false) {
+                    if (strpos($line, '/**') !== false) {
                         $docblock_start_found = true;
                     }
                     continue;
-                } elseif(!$name_found) {
+                } elseif (!$name_found) {
                     // find name
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['name'] = trim($ma[1]);
                         $name_found = !empty($params['name']);
                     }
                     continue;
-                } elseif(!$description_found) {
+                } elseif (!$description_found) {
                     // find description
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['description'] = trim($ma[1]);
                         $description_found = !empty($params['description']);
                     }
                     continue;
                 } else {
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
                         $param = trim($ma[1]);
                         $val = trim($ma[2]);
-                        if(!empty($param) && !empty($val)) {
-                            if($param == 'internal') {
+                        if (!empty($param) && !empty($val)) {
+                            if ($param == 'internal') {
                                 $ma = null;
-                                if(preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
+                                if (preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
                                     $param = trim($ma[1]);
                                     $val = trim($ma[2]);
                                 }
                                 //if($val !== '0' && (empty($param) || empty($val))) {
-                                if(empty($param)) {
+                                if (empty($param)) {
                                     continue;
                                 }
                             }
                             $params[$param] = $val;
                         }
-                    } elseif(preg_match("/^\s*\*\/\s*$/", $line)) {
+                    } elseif (preg_match("/^\s*\*\/\s*$/", $line)) {
                         $docblock_end_found = true;
                         break;
                     }

Braces +23 added lines, -15 removed lines

@@ -4,7 +4,9 @@ 
 if (is_file($base_path . 'assets/cache/siteManager.php')) {
     include_once($base_path . 'assets/cache/siteManager.php');
 }
-if(!defined('MGR_DIR')) define('MGR_DIR', 'manager');
+if(!defined('MGR_DIR')) {
+    define('MGR_DIR', 'manager');
+}
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
@@ -19,12 +21,12 @@ 
 $mt = &$moduleTemplates;
 if(is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
-    while (false !== ($tplfile = $d->read()))
-    {
-        if(substr($tplfile, -4) != '.tpl') continue;
+    while (false !== ($tplfile = $d->read())) {
+        if(substr($tplfile, -4) != '.tpl') {
+            continue;
+        }
         $params = parse_docblock($templatePath, $tplfile);
-        if(is_array($params) && (count($params)>0))
-        {
+        if(is_array($params) && (count($params)>0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mt[] = array
             (
@@ -48,7 +50,9 @@ 
 if(is_dir($tvPath) && is_readable($tvPath)) {
     $d = dir($tvPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if(substr($tplfile, -4) != '.tpl') {
+            continue;
+        }
         $params = parse_docblock($tvPath, $tplfile);
         if(is_array($params) && (count($params)>0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
@@ -241,7 +245,8 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser)
+{
     $ids = array();
     $mysqlVerOk = -1;
 
@@ -259,9 +264,10 @@ 
     $ds = mysqli_query($sqlParser->conn,$sql);
     if(!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
-    }
-    else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
+    } else {
+        while($r = mysqli_fetch_assoc($ds)) {
+            $ids[]=$r["id"];
+        }
         if(count($ids)>0) {
             mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
             unset($ids);
@@ -278,9 +284,10 @@ 
     $ds = mysqli_query($sqlParser->conn,$sql);
     if(!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
-    }
-    else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
+    } else {
+        while($r = mysqli_fetch_assoc($ds)) {
+            $ids[]=$r["id"];
+        }
         if(count($ids)>0) {
             mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
             unset($ids);
@@ -288,7 +295,8 @@ 
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename)
+{
     $params = array();
     $fullpath = $element_dir . '/' . $filename;
     if(is_readable($fullpath)) {

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

@@ -36,7 +36,7 @@
                 $params['modx_category'],
                 $params['lock_template'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false,
-                isset($params['save_sql_id_as']) ? $params['save_sql_id_as'] : NULL // Nessecary to fix template-ID for demo-site
+                isset($params['save_sql_id_as']) ? $params['save_sql_id_as'] : null // Nessecary to fix template-ID for demo-site
             );
         }
     }

install/actions/action_install.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 <form name="install" id="install_form" action="index.php?action=options" method="post">
 <?php
 if ($errors == 0) {
-	// check if install folder is removeable
+    // check if install folder is removeable
     if (is_writable("../install")) { ?>
 <span id="removeinstall" style="float:left;cursor:pointer;color:#505050;line-height:18px;" onclick="var chk=document.install.rminstaller; if(chk) chk.checked=!chk.checked;"><input type="checkbox" name="rminstaller" onclick="event.cancelBubble=true;" <?php echo (empty ($errors) ? 'checked="checked"' : '') ?> style="cursor:default;" /><?php echo $_lang['remove_install_folder_auto'] ?></span>
 <?php 

Spacing +2 added lines, -2 removed lines

@@ -43,10 +43,10 @@
 	var chk = document.install.rminstaller;
 	if(chk && chk.checked) {
 		// remove install folder and files
-		window.location.href = "../<?php echo MGR_DIR;?>/processors/remove_installer.processor.php?rminstall=1";
+		window.location.href = "../<?php echo MGR_DIR; ?>/processors/remove_installer.processor.php?rminstall=1";
 	}
 	else {
-		window.location.href = "../<?php echo MGR_DIR;?>/";
+		window.location.href = "../<?php echo MGR_DIR; ?>/";
 	}
 }
 /* ]]> */

install/connection.databasetest.php

Indentation +2 added lines, -2 removed lines

@@ -8,10 +8,10 @@
 $self = 'install/connection.databasetest.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once("lang.php");
 

Spacing +4 added lines, -4 removed lines

@@ -6,12 +6,12 @@ 
 $installMode = $_POST['installMode'];
 
 $self = 'install/connection.databasetest.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once("lang.php");
 
@@ -31,7 +31,7 @@ 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (!mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
         }
         else {

Braces +6 added lines, -11 removed lines

@@ -18,8 +18,7 @@ 
 $output = $_lang["status_checking_database"];
 if (!$conn = mysqli_connect($host, $uid, $pwd)) {
     $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed'].'</span>';
-}
-else {
+} else {
     $database_name = mysqli_real_escape_string($conn, $_POST['database_name']);
     $database_name = str_replace("`", "", $database_name);
     $tableprefix = mysqli_real_escape_string($conn, $_POST['tableprefix']);
@@ -31,20 +30,16 @@ 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (! mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
-        }
-        else {
+        } else {
             $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed_database_created'].'</span>';
         }
-    }
-    elseif (($installMode == 0) && (mysqli_query($conn, "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) {
+    } elseif (($installMode == 0) && (mysqli_query($conn, "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) {
         $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_table_prefix_already_in_use'].'</span>';
-    }
-    elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
+    } elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
         $output .= '<span id="database_fail" style="color:#FF0000;">'.sprintf($_lang['status_failed_database_collation_does_not_match'], $row[1]).'</span>';
-    }
-    else {
+    } else {
         $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed'].'</span>';
     }
 }

install/connection.servertest.php

Indentation +3 added lines, -3 removed lines

@@ -7,10 +7,10 @@ 
 $self = 'install/connection.servertest.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once("lang.php");
 
@@ -31,7 +31,7 @@ 
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {
-    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
+                if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
         }
         if ($strictMode) $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
     }

Spacing +5 added lines, -5 removed lines

@@ -5,12 +5,12 @@ 
 $pwd = $_POST['pwd'];
 
 $self = 'install/connection.servertest.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once("lang.php");
 
@@ -22,12 +22,12 @@ 
     $output .= '<span id="server_pass" style="color:#80c000;"> '.$_lang['status_passed_server'].'</span>';
 
     // Mysql version check
-    if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
         $output .= '<br /><span style="color:#FF0000;"> '.$_lang['mysql_5051'].'</span>';
     }
     // Mode check
     $mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode");
-    if (@mysqli_num_rows($mysqlmode) > 0){
+    if (@mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {

Braces +8 added lines, -5 removed lines

@@ -17,8 +17,7 @@ 
 $output = $_lang["status_connecting"];
 if (!$conn = @mysqli_connect($host, $uid, $pwd)) {
     $output .= '<span id="server_fail" style="color:#FF0000;"> '.$_lang['status_failed'].'</span>';
-}
-else {
+} else {
     $output .= '<span id="server_pass" style="color:#80c000;"> '.$_lang['status_passed_server'].'</span>';
 
     // Mysql version check
@@ -27,13 +26,17 @@ 
     }
     // Mode check
     $mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode");
-    if (@mysqli_num_rows($mysqlmode) > 0){
+    if (@mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {
-    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
+    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
+    		        $strictMode = true;
+    		    }
+        }
+        if ($strictMode) {
+            $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
         }
-        if ($strictMode) $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
     }
 }
 echo $output;

install/connection.collation.php

Indentation +8 added lines, -8 removed lines

@@ -7,10 +7,10 @@ 
 $self = 'install/connection.collation.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once('lang.php');
 
@@ -59,12 +59,12 @@ 
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
     foreach($order as $v) {
-    	foreach($array as $name=>$sel) {
-        	if(strpos($name,$v)!==false) {
-        		$rs[$name] = $array[$name];
-        		unset($array[$name]);
-        	}
-    	}
+        foreach($array as $name=>$sel) {
+            if(strpos($name,$v)!==false) {
+                $rs[$name] = $array[$name];
+                unset($array[$name]);
+            }
+        }
     }
     $rs['unrecommend']='';
     return $rs + $array;

Spacing +18 added lines, -18 removed lines

@@ -5,17 +5,17 @@ 
 $pwd = $_POST['pwd'];
 
 $self = 'install/connection.collation.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once('lang.php');
 
 $conn = mysqli_connect($host, $uid, $pwd);
-if(!$conn) exit('can not connect');
+if (!$conn) exit('can not connect');
 
 // get collation
 $rs = mysqli_query($conn, "SHOW COLLATION");
@@ -29,20 +29,20 @@ 
     $database_collation = htmlentities($_POST['database_collation']);
     $recommend_collation = $_lang['recommend_collation'];
     
-    if    (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
-    elseif(isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
-    elseif(isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
-    elseif(isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
+    if (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
+    elseif (isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
+    elseif (isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
+    elseif (isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
     
-    $_ = sortItem($_,$_lang['recommend_collations_order']);
+    $_ = sortItem($_, $_lang['recommend_collations_order']);
     
-    foreach($_ as $collation=>$selected) {
+    foreach ($_ as $collation=>$selected) {
         $collation = htmlentities($collation);
         // if(substr($collation,0,4)!=='utf8') continue;
-        if(strpos($collation,'sjis')===0) continue;
-        if($collation=='recommend')
+        if (strpos($collation, 'sjis') === 0) continue;
+        if ($collation == 'recommend')
             $output .= '<optgroup label="recommend">';
-        elseif($collation=='unrecommend')
+        elseif ($collation == 'unrecommend')
             $output .= '</optgroup><optgroup label="unrecommend">';
         else
             $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
@@ -55,17 +55,17 @@ 
 
 
 
-function sortItem($array=array(),$order='utf8mb4,utf8') {
+function sortItem($array = array(), $order = 'utf8mb4,utf8'){
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
-    foreach($order as $v) {
-    	foreach($array as $name=>$sel) {
-        	if(strpos($name,$v)!==false) {
+    foreach ($order as $v) {
+    	foreach ($array as $name=>$sel) {
+        	if (strpos($name, $v) !== false) {
         		$rs[$name] = $array[$name];
         		unset($array[$name]);
         	}
     	}
     }
-    $rs['unrecommend']='';
+    $rs['unrecommend'] = '';
     return $rs + $array;
 }

Braces +24 added lines, -13 removed lines

@@ -15,7 +15,9 @@ 
 require_once('lang.php');
 
 $conn = mysqli_connect($host, $uid, $pwd);
-if(!$conn) exit('can not connect');
+if(!$conn) {
+    exit('can not connect');
+}
 
 // get collation
 $rs = mysqli_query($conn, "SHOW COLLATION");
@@ -29,23 +31,31 @@ 
     $database_collation = htmlentities($_POST['database_collation']);
     $recommend_collation = $_lang['recommend_collation'];
     
-    if    (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
-    elseif(isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
-    elseif(isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
-    elseif(isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
+    if    (isset($_[$recommend_collation])) {
+        $_[$recommend_collation] = ' selected';
+    } elseif(isset($_['utf8mb4_general_ci'])) {
+        $_['utf8mb4_general_ci'] = ' selected';
+    } elseif(isset($_['utf8_general_ci'])) {
+        $_['utf8_general_ci']    = ' selected';
+    } elseif(isset($_[$database_collation])) {
+        $_[$database_collation]  = ' selected';
+    }
     
     $_ = sortItem($_,$_lang['recommend_collations_order']);
     
     foreach($_ as $collation=>$selected) {
         $collation = htmlentities($collation);
         // if(substr($collation,0,4)!=='utf8') continue;
-        if(strpos($collation,'sjis')===0) continue;
-        if($collation=='recommend')
-            $output .= '<optgroup label="recommend">';
-        elseif($collation=='unrecommend')
-            $output .= '</optgroup><optgroup label="unrecommend">';
-        else
-            $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
+        if(strpos($collation,'sjis')===0) {
+            continue;
+        }
+        if($collation=='recommend') {
+                    $output .= '<optgroup label="recommend">';
+        } elseif($collation=='unrecommend') {
+                    $output .= '</optgroup><optgroup label="unrecommend">';
+        } else {
+                    $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
+        }
     }
     $output .= '</optgroup></select>';
 }
@@ -55,7 +65,8 @@ 
 
 
 
-function sortItem($array=array(),$order='utf8mb4,utf8') {
+function sortItem($array=array(),$order='utf8mb4,utf8')
+{
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
     foreach($order as $v) {