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/actions/resources.static.php

Braces +6 added lines, -2 removed lines

@@ -28,7 +28,9 @@ 
 	'type7' => $_lang["lock_element_type_7"],
 	'type8' => $_lang["lock_element_type_8"]
 );
-foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach($unlockTranslations as $key => $value) {
+    $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+}
 
 // Prepare lang-strings for mgrResAction()
 $mraTranslations = array(
@@ -44,7 +46,9 @@ 
 	'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
 	'confirm_delete_module' => $_lang["confirm_delete_module"],
 );
-foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach($mraTranslations as $key => $value) {
+    $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+}
 ?>
 <script>var trans = <?php echo json_encode($unlockTranslations); ?>;</script>
 <script>var mraTrans = <?php echo json_encode($mraTranslations); ?>;</script>

Indentation +59 added lines, -59 removed lines

@@ -1,48 +1,48 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php')) {
-	include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php');
+    include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'actions/resources/functions.inc.php');
+    include_once(MODX_MANAGER_PATH . 'actions/resources/functions.inc.php');
 }
 if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php')) {
-	include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php');
+    include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'actions/resources/mgrResources.class.php');
+    include_once(MODX_MANAGER_PATH . 'actions/resources/mgrResources.class.php');
 }
 
 $resources = new mgrResources();
 
 // Prepare lang-strings for "Lock Elements"
 $unlockTranslations = array(
-	'msg' => $_lang["unlock_element_id_warning"],
-	'type1' => $_lang["lock_element_type_1"],
-	'type2' => $_lang["lock_element_type_2"],
-	'type3' => $_lang["lock_element_type_3"],
-	'type4' => $_lang["lock_element_type_4"],
-	'type5' => $_lang["lock_element_type_5"],
-	'type6' => $_lang["lock_element_type_6"],
-	'type7' => $_lang["lock_element_type_7"],
-	'type8' => $_lang["lock_element_type_8"]
+    'msg' => $_lang["unlock_element_id_warning"],
+    'type1' => $_lang["lock_element_type_1"],
+    'type2' => $_lang["lock_element_type_2"],
+    'type3' => $_lang["lock_element_type_3"],
+    'type4' => $_lang["lock_element_type_4"],
+    'type5' => $_lang["lock_element_type_5"],
+    'type6' => $_lang["lock_element_type_6"],
+    'type7' => $_lang["lock_element_type_7"],
+    'type8' => $_lang["lock_element_type_8"]
 );
 foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 
 // Prepare lang-strings for mgrResAction()
 $mraTranslations = array(
-	'create_new' => $_lang["create_new"],
-	'edit' => $_lang["edit"],
-	'duplicate' => $_lang["duplicate"],
-	'remove' => $_lang["remove"],
-	'confirm_duplicate_record' => $_lang["confirm_duplicate_record"],
-	'confirm_delete_template' => $_lang["confirm_delete_template"],
-	'confirm_delete_tmplvars' => $_lang["confirm_delete_tmplvars"],
-	'confirm_delete_htmlsnippet' => $_lang["confirm_delete_htmlsnippet"],
-	'confirm_delete_snippet' => $_lang["confirm_delete_htmlsnippet"],
-	'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
-	'confirm_delete_module' => $_lang["confirm_delete_module"],
+    'create_new' => $_lang["create_new"],
+    'edit' => $_lang["edit"],
+    'duplicate' => $_lang["duplicate"],
+    'remove' => $_lang["remove"],
+    'confirm_duplicate_record' => $_lang["confirm_duplicate_record"],
+    'confirm_delete_template' => $_lang["confirm_delete_template"],
+    'confirm_delete_tmplvars' => $_lang["confirm_delete_tmplvars"],
+    'confirm_delete_htmlsnippet' => $_lang["confirm_delete_htmlsnippet"],
+    'confirm_delete_snippet' => $_lang["confirm_delete_htmlsnippet"],
+    'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
+    'confirm_delete_module' => $_lang["confirm_delete_module"],
 );
 foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 ?>
@@ -65,46 +65,46 @@ 
 		</script>
 
 		<?php
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab1_templates.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab1_templates.inc.php');
+        }
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab2_templatevars.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab2_templatevars.inc.php');
+        }
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab3_chunks.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab3_chunks.inc.php');
+        }
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab4_snippets.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab4_snippets.inc.php');
+        }
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab5_plugins.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab5_plugins.inc.php');
+        }
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab6_categoryview.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab6_categoryview.inc.php');
+        }
 
 
-		if(is_numeric($_GET['tab'])) {
-			echo '<script type="text/javascript"> tpResources.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
-		}
-		?>
+        if(is_numeric($_GET['tab'])) {
+            echo '<script type="text/javascript"> tpResources.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
+        }
+        ?>
 	</div>
 </div>

Spacing +29 added lines, -29 removed lines

@@ -1,17 +1,17 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php')) {
-	include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php');
+if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/functions.inc.php')) {
+	include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/functions.inc.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'actions/resources/functions.inc.php');
+	include_once(MODX_MANAGER_PATH.'actions/resources/functions.inc.php');
 }
-if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php')) {
-	include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php');
+if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/mgrResources.class.php')) {
+	include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/mgrResources.class.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'actions/resources/mgrResources.class.php');
+	include_once(MODX_MANAGER_PATH.'actions/resources/mgrResources.class.php');
 }
 
 $resources = new mgrResources();
@@ -28,7 +28,7 @@ 
 	'type7' => $_lang["lock_element_type_7"],
 	'type8' => $_lang["lock_element_type_8"]
 );
-foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach ($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 
 // Prepare lang-strings for mgrResAction()
 $mraTranslations = array(
@@ -44,7 +44,7 @@ 
 	'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
 	'confirm_delete_module' => $_lang["confirm_delete_module"],
 );
-foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach ($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 ?>
 <script>var trans = <?php echo json_encode($unlockTranslations); ?>;</script>
 <script>var mraTrans = <?php echo json_encode($mraTranslations); ?>;</script>
@@ -65,45 +65,45 @@ 
 		</script>
 
 		<?php
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab1_templates.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab1_templates.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab1_templates.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab1_templates.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab2_templatevars.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab2_templatevars.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab2_templatevars.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab2_templatevars.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab3_chunks.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab3_chunks.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab3_chunks.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab3_chunks.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab4_snippets.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab4_snippets.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab4_snippets.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab4_snippets.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab5_plugins.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab5_plugins.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab5_plugins.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab5_plugins.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab6_categoryview.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab6_categoryview.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab6_categoryview.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab6_categoryview.inc.php');
 		}
 
 
-		if(is_numeric($_GET['tab'])) {
-			echo '<script type="text/javascript"> tpResources.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
+		if (is_numeric($_GET['tab'])) {
+			echo '<script type="text/javascript"> tpResources.setSelectedIndex( '.$_GET['tab'].' );</script>';
 		}
 		?>
 	</div>

manager/actions/mutate_settings/tab5_security_settings.inc.php

Indentation +3 added lines, -3 removed lines

@@ -177,9 +177,9 @@
     <td colspan="2"><div class="split"></div></td>

   </tr>

   <?php

-      // Check for GD before allowing captcha to be enabled

-      $gdAvailable = extension_loaded('gd');

-  ?>

+        // Check for GD before allowing captcha to be enabled

+        $gdAvailable = extension_loaded('gd');

+    ?>

 <?php

 $gdAvailable = extension_loaded('gd');

 if(!$gdAvailable) $use_captcha = 0;

Spacing +42 added lines, -42 removed lines

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

     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4

-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {

+    if (empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {

         $valid_hostnames = $_SERVER['HTTP_HOST'];

     } else {

         $valid_hostnames = $MODX_SITE_HOSTNAMES;

@@ -15,10 +15,10 @@ 
 <tr>

 <th><?php echo $_lang['allow_eval_title']; ?><br><small>[(allow_eval)]</small></th>

 <td>

-<?php echo wrap_label($_lang['allow_eval_with_scan']         , form_radio('allow_eval','with_scan'));?><br />

-<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'] , form_radio('allow_eval','with_scan_at_post'));?><br />

-<?php echo wrap_label($_lang['allow_eval_everytime_eval']    , form_radio('allow_eval','everytime_eval'));?><br />

-<?php echo wrap_label($_lang['allow_eval_dont_eval']         , form_radio('allow_eval','dont_eval'));?>

+<?php echo wrap_label($_lang['allow_eval_with_scan'], form_radio('allow_eval', 'with_scan')); ?><br />

+<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'], form_radio('allow_eval', 'with_scan_at_post')); ?><br />

+<?php echo wrap_label($_lang['allow_eval_everytime_eval'], form_radio('allow_eval', 'everytime_eval')); ?><br />

+<?php echo wrap_label($_lang['allow_eval_dont_eval'], form_radio('allow_eval', 'dont_eval')); ?>

     <div class="comment">

         <?php echo $_lang['allow_eval_msg'] ?>

     </div>

@@ -43,7 +43,7 @@ 
 <tr>

     <th><?php echo $_lang['check_files_onlogin_title'] ?><br><small>[(check_files_onlogin)]</small></th>

     <td>

-      <textarea name="check_files_onlogin"><?php echo $check_files_onlogin;?></textarea><br />

+      <textarea name="check_files_onlogin"><?php echo $check_files_onlogin; ?></textarea><br />

 

 </td>

 </tr>

@@ -53,8 +53,8 @@ 
     <tr>

       <td nowrap class="warning"><?php echo $_lang['validate_referer_title'] ?><br><small>[(validate_referer)]</small></td>

       <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('validate_referer', 1));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('validate_referer', 1)); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0)); ?>

       </td>

     </tr>

     <tr>

@@ -89,25 +89,25 @@ 
   <tr>

 <th><?php echo $_lang['a17_error_reporting_title']; ?><br><small>[(error_reporting)]</small></th>

 <td>

-<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting','0'));?><br />

-<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting','1'));?><br />

-<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting','2'));?><br />

-<?php echo wrap_label($_lang['a17_error_reporting_opt99'],form_radio('error_reporting','99'));?>

+<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting', '0')); ?><br />

+<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting', '1')); ?><br />

+<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting', '2')); ?><br />

+<?php echo wrap_label($_lang['a17_error_reporting_opt99'], form_radio('error_reporting', '99')); ?>

 </td>

 </tr>

 <tr>

     <td width="200">&nbsp;</td>

-    <td class="comment"> <?php echo $_lang['a17_error_reporting_msg'];?></td>

+    <td class="comment"> <?php echo $_lang['a17_error_reporting_msg']; ?></td>

 </tr>

 <tr><td colspan="2"><div class="split"></div></td></tr>

 <tr>

 <th><?php echo $_lang['mutate_settings.dynamic.php6']; ?><br><small>[(send_errormail)]</small></th>

 <td>

-<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'],form_radio('send_errormail','0'));?><br />

-<?php echo wrap_label('error',form_radio('send_errormail','3'));?><br />

-<?php echo wrap_label('error + warning',form_radio('send_errormail','2'));?><br />

-<?php echo wrap_label('error + warning + information',form_radio('send_errormail','1'));?><br />

-<?php echo parseText($_lang['mutate_settings.dynamic.php8'],array('emailsender'=>$modx->config['emailsender']));?></td>

+<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'], form_radio('send_errormail', '0')); ?><br />

+<?php echo wrap_label('error', form_radio('send_errormail', '3')); ?><br />

+<?php echo wrap_label('error + warning', form_radio('send_errormail', '2')); ?><br />

+<?php echo wrap_label('error + warning + information', form_radio('send_errormail', '1')); ?><br />

+<?php echo parseText($_lang['mutate_settings.dynamic.php8'], array('emailsender'=>$modx->config['emailsender'])); ?></td>

 </tr>

    <tr>

     <td colspan="2"><div class="split"></div></td>

@@ -115,8 +115,8 @@ 
 <tr>

 <th><?php echo $_lang['enable_bindings_title'] ?><br><small>[(enable_bindings)]</small></th>

 <td>

-<?php echo wrap_label($_lang['yes'],form_radio('enable_bindings','1'));?><br />

-<?php echo wrap_label($_lang['no'], form_radio('enable_bindings','0'));?>

+<?php echo wrap_label($_lang['yes'], form_radio('enable_bindings', '1')); ?><br />

+<?php echo wrap_label($_lang['no'], form_radio('enable_bindings', '0')); ?>

 

 </td>

 </tr>

@@ -157,20 +157,20 @@ 
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>

 <td>

 <?php

-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

-$phm['e']['BLOWFISH_Y'] = $modx->getManagerApi()->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;

-$phm['e']['BLOWFISH_A'] = $modx->getManagerApi()->checkHashAlgorithm('BLOWFISH_A') ? 0:1;

-$phm['e']['SHA512']     = $modx->getManagerApi()->checkHashAlgorithm('SHA512') ? 0:1;

-$phm['e']['SHA256']     = $modx->getManagerApi()->checkHashAlgorithm('SHA256') ? 0:1;

-$phm['e']['MD5']        = $modx->getManagerApi()->checkHashAlgorithm('MD5') ? 0:1;

-$phm['e']['UNCRYPT']    = $modx->getManagerApi()->checkHashAlgorithm('UNCRYPT') ? 0:1;

+if (empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

+$phm['e']['BLOWFISH_Y'] = $modx->getManagerApi()->checkHashAlgorithm('BLOWFISH_Y') ? 0 : 1;

+$phm['e']['BLOWFISH_A'] = $modx->getManagerApi()->checkHashAlgorithm('BLOWFISH_A') ? 0 : 1;

+$phm['e']['SHA512']     = $modx->getManagerApi()->checkHashAlgorithm('SHA512') ? 0 : 1;

+$phm['e']['SHA256']     = $modx->getManagerApi()->checkHashAlgorithm('SHA256') ? 0 : 1;

+$phm['e']['MD5']        = $modx->getManagerApi()->checkHashAlgorithm('MD5') ? 0 : 1;

+$phm['e']['UNCRYPT']    = $modx->getManagerApi()->checkHashAlgorithm('UNCRYPT') ? 0 : 1;

 ?>

-<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt &amp; stretch)',form_radio('pwd_hash_algo','BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y']));?><br />

-<?php echo wrap_label('CRYPT_BLOWFISH_A (salt &amp; stretch)',form_radio('pwd_hash_algo','BLOWFISH_A', '', $phm['e']['BLOWFISH_A']));?><br />

-<?php echo wrap_label('CRYPT_SHA512 (salt &amp; stretch)'    ,form_radio('pwd_hash_algo','SHA512'    , '', $phm['e']['SHA512']));?><br />

-<?php echo wrap_label('CRYPT_SHA256 (salt &amp; stretch)'    ,form_radio('pwd_hash_algo','SHA256'    , '', $phm['e']['SHA256']));?><br />

-<?php echo wrap_label('CRYPT_MD5 (salt &amp; stretch)'       ,form_radio('pwd_hash_algo','MD5'       , '', $phm['e']['MD5']));?><br />

-<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)'  ,form_radio('pwd_hash_algo','UNCRYPT'  , '', $phm['e']['UNCRYPT']));?>

+<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt &amp; stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y'])); ?><br />

+<?php echo wrap_label('CRYPT_BLOWFISH_A (salt &amp; stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_A', '', $phm['e']['BLOWFISH_A'])); ?><br />

+<?php echo wrap_label('CRYPT_SHA512 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'SHA512', '', $phm['e']['SHA512'])); ?><br />

+<?php echo wrap_label('CRYPT_SHA256 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'SHA256', '', $phm['e']['SHA256'])); ?><br />

+<?php echo wrap_label('CRYPT_MD5 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'MD5', '', $phm['e']['MD5'])); ?><br />

+<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)', form_radio('pwd_hash_algo', 'UNCRYPT', '', $phm['e']['UNCRYPT'])); ?>

 </td>

 </tr>

 <tr>

@@ -186,13 +186,13 @@ 
   ?>

 <?php

 $gdAvailable = extension_loaded('gd');

-if(!$gdAvailable) $use_captcha = 0;

+if (!$gdAvailable) $use_captcha = 0;

 ?>

   <tr>

     <td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td>

-    <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha==1) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : ''; ?> />

+    <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha == 1) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha==0) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : '';?> />

+      <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha == 0) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> />

       <?php echo $_lang['no']?></label> </td>

   </tr>

   <tr>

@@ -202,23 +202,23 @@ 
   <tr>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>

+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['captcha_words_title'] ?><br><small>[(captcha_words)]</small>

       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_captcha_words" id="reload_captcha_words_select" onchange="confirmLangChange(this, 'captcha_words_default', 'captcha_words_input');">

-<?php echo get_lang_options('captcha_words_default');?>

+<?php echo get_lang_options('captcha_words_default'); ?>

       </select>

     </td>

     <td><input type="text" id="captcha_words_input" name="captcha_words" style="width:250px" value="<?php echo $captcha_words; ?>" />

-        <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']);?>" />

+        <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']); ?>" />

     </td>

   </tr>

-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>

+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['captcha_words_message'] ?></td>

   </tr>

-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>

+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

   <tr>

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

             // invoke OnMiscSettingsRender event

             $evtOut = $modx->invokeEvent('OnSecuritySettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

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

         ?>

     </td>

   </tr>

Braces +11 added lines, -5 removed lines

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

     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4

-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {

+    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
         $valid_hostnames = $_SERVER['HTTP_HOST'];

-    } else {

+    } else {
         $valid_hostnames = $MODX_SITE_HOSTNAMES;

     }

 ?>

@@ -157,7 +157,9 @@ 
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>

 <td>

 <?php

-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

+if(empty($pwd_hash_algo)) {
+    $phm['sel']['UNCRYPT'] = 1;
+}
 $phm['e']['BLOWFISH_Y'] = $modx->getManagerApi()->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;

 $phm['e']['BLOWFISH_A'] = $modx->getManagerApi()->checkHashAlgorithm('BLOWFISH_A') ? 0:1;

 $phm['e']['SHA512']     = $modx->getManagerApi()->checkHashAlgorithm('SHA512') ? 0:1;

@@ -186,7 +188,9 @@ 
   ?>

 <?php

 $gdAvailable = extension_loaded('gd');

-if(!$gdAvailable) $use_captcha = 0;

+if(!$gdAvailable) {
+    $use_captcha = 0;
+}
 ?>

   <tr>

     <td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td>

@@ -226,7 +230,9 @@ 
         <?php

             // invoke OnMiscSettingsRender event

             $evtOut = $modx->invokeEvent('OnSecuritySettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if(is_array($evtOut)) {
+                echo implode("",$evtOut);
+            }
         ?>

     </td>

   </tr>

manager/actions/mutate_settings/tab3_user_settings.inc.php

Braces +3 added lines, -1 removed lines

@@ -127,7 +127,9 @@
         <?php

             // invoke OnUserSettingsRender event

             $evtOut = $modx->invokeEvent('OnUserSettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if(is_array($evtOut)) {
+                echo implode("",$evtOut);
+            }
         ?>

     </td>

   </tr>

Spacing +23 added lines, -23 removed lines

@@ -6,8 +6,8 @@ 
   <tr>

     <td nowrap class="warning"><?php echo $_lang['udperms_title'] ?><br><small>[(use_udperms)]</small></td>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('use_udperms', 1, 'id="udPermsOn"'));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('use_udperms', 0, 'id="udPermsOff"'));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('use_udperms', 1, 'id="udPermsOn"')); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('use_udperms', 0, 'id="udPermsOff"')); ?>

     </td>

   </tr>

   <tr>

@@ -17,16 +17,16 @@ 
   <tr>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="udPerms" <?php echo showHide($use_udperms==1);?>>

+  <tr class="udPerms" <?php echo showHide($use_udperms == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['udperms_allowroot_title'] ?><br><small>[(udperms_allowroot)]</small></td>

     <td>

-      <label><input type="radio" name="udperms_allowroot" value="1" <?php echo $udperms_allowroot=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="udperms_allowroot" value="1" <?php echo $udperms_allowroot == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" name="udperms_allowroot" value="0" <?php echo $udperms_allowroot=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="udperms_allowroot" value="0" <?php echo $udperms_allowroot == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['no']?></label>

     </td>

   </tr>

-  <tr class="udPerms" <?php echo showHide($use_udperms==1);?>>

+  <tr class="udPerms" <?php echo showHide($use_udperms == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['udperms_allowroot_message'] ?></td>

   </tr>

@@ -37,9 +37,9 @@ 
   <tr>

     <td nowrap class="warning"><?php echo $_lang['email_sender_method'] ?><br><small>[(email_sender_method)]</small></td>

     <td>

-      <label><input type="radio" name="email_sender_method" value="1" <?php echo $email_sender_method=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="email_sender_method" value="1" <?php echo $email_sender_method == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['auto']?></label><br />

-      <label><input type="radio" name="email_sender_method" value="0" <?php echo $email_sender_method=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="email_sender_method" value="0" <?php echo $email_sender_method == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['use_emailsender']?></label>

     </td>

   </tr>

@@ -55,10 +55,10 @@ 
   <tr>

     <td nowrap class="warning"><?php echo $_lang['email_method_title'] ?><br><small>[(email_method)]</small></td>

     <td>

-        <?php echo wrap_label($_lang['email_method_mail'],form_radio('email_method','mail','id="useMail"'));?><br />

-        <?php echo wrap_label($_lang['email_method_smtp'],form_radio('email_method','smtp','id="useSmtp"'));?>

-        <div class="smtpRow" <?php echo showHide($email_method=='smtp');?>>

-            <?php include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/snippet_smtp.inc.php'); ?>

+        <?php echo wrap_label($_lang['email_method_mail'], form_radio('email_method', 'mail', 'id="useMail"')); ?><br />

+        <?php echo wrap_label($_lang['email_method_smtp'], form_radio('email_method', 'smtp', 'id="useSmtp"')); ?>

+        <div class="smtpRow" <?php echo showHide($email_method == 'smtp'); ?>>

+            <?php include_once(MODX_MANAGER_PATH.'actions/mutate_settings/snippet_smtp.inc.php'); ?>

         </div>

     </td>

   </tr>

@@ -70,11 +70,11 @@ 
       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_emailsubject" id="reload_emailsubject_select" onchange="confirmLangChange(this, 'emailsubject_default', 'emailsubject_field');">

-<?php echo get_lang_options('emailsubject_default');?>

+<?php echo get_lang_options('emailsubject_default'); ?>

       </select>

     </td>

     <td ><input id="emailsubject_field" name="emailsubject" onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" value="<?php echo $emailsubject; ?>" />

-        <input type="hidden" name="emailsubject_default" id="emailsubject_default_hidden" value="<?php echo addslashes($_lang['emailsubject_default']);?>" />

+        <input type="hidden" name="emailsubject_default" id="emailsubject_default_hidden" value="<?php echo addslashes($_lang['emailsubject_default']); ?>" />

     </td>

   </tr>

   <tr>

@@ -89,11 +89,11 @@ 
       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_signupemail_message" id="reload_signupemail_message_select" onchange="confirmLangChange(this, 'system_email_signup', 'signupemail_message_textarea');">

-<?php echo get_lang_options('system_email_signup');?>

+<?php echo get_lang_options('system_email_signup'); ?>

       </select>

     </td>

     <td> <textarea id="signupemail_message_textarea" name="signupemail_message" style="width:100%; height: 120px;"><?php echo $signupemail_message; ?></textarea>

-        <input type="hidden" name="system_email_signup_default" id="system_email_signup_hidden" value="<?php echo addslashes($_lang['system_email_signup']);?>" />

+        <input type="hidden" name="system_email_signup_default" id="system_email_signup_hidden" value="<?php echo addslashes($_lang['system_email_signup']); ?>" />

     </td>

   </tr>

   <tr>

@@ -108,11 +108,11 @@ 
       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_websignupemail_message" id="reload_websignupemail_message_select" onchange="confirmLangChange(this, 'system_email_websignup', 'websignupemail_message_textarea');">

-<?php echo get_lang_options('system_email_websignup');?>

+<?php echo get_lang_options('system_email_websignup'); ?>

       </select>

     </td>

     <td> <textarea id="websignupemail_message_textarea" name="websignupemail_message" style="width:100%; height: 120px;"><?php echo $websignupemail_message; ?></textarea>

-        <input type="hidden" name="system_email_websignup_default" id="system_email_websignup_hidden" value="<?php echo addslashes($_lang['system_email_websignup']);?>" />

+        <input type="hidden" name="system_email_websignup_default" id="system_email_websignup_hidden" value="<?php echo addslashes($_lang['system_email_websignup']); ?>" />

     </td>

   </tr>

   <tr>

@@ -127,11 +127,11 @@ 
       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_system_email_webreminder_message" id="reload_system_email_webreminder_select" onchange="confirmLangChange(this, 'system_email_webreminder', 'system_email_webreminder_textarea');">

-<?php echo get_lang_options('system_email_webreminder');?>

+<?php echo get_lang_options('system_email_webreminder'); ?>

       </select>

     </td>

     <td> <textarea id="system_email_webreminder_textarea" name="webpwdreminder_message" style="width:100%; height: 120px;"><?php echo $webpwdreminder_message; ?></textarea>

-        <input type="hidden" name="system_email_webreminder_default" id="system_email_webreminder_hidden" value="<?php echo addslashes($_lang['system_email_webreminder']);?>" />

+        <input type="hidden" name="system_email_webreminder_default" id="system_email_webreminder_hidden" value="<?php echo addslashes($_lang['system_email_webreminder']); ?>" />

     </td>

   </tr>

   <tr>

@@ -144,8 +144,8 @@ 
   <tr>

     <td nowrap class="warning" valign="top"><?php echo $_lang['allow_multiple_emails_title'] ?><br><small>[(allow_multiple_emails)]</small></td>

     <td>

-      <?php echo wrap_label($_lang['yes'],form_radio('allow_multiple_emails','1'));?><br />

-      <?php echo wrap_label($_lang['no'], form_radio('allow_multiple_emails','0'));?>

+      <?php echo wrap_label($_lang['yes'], form_radio('allow_multiple_emails', '1')); ?><br />

+      <?php echo wrap_label($_lang['no'], form_radio('allow_multiple_emails', '0')); ?>

     </td>

   </tr>

   <tr>

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

             // invoke OnUserSettingsRender event

             $evtOut = $modx->invokeEvent('OnUserSettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

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

         ?>

     </td>

   </tr>

manager/actions/mutate_settings/tab7_filebrowser_settings.inc.php

Spacing +58 added lines, -58 removed lines

@@ -6,8 +6,8 @@ 
   <tr>

     <td nowrap class="warning"><?php echo $_lang['rb_title']?><br><small>[(use_browser)]</small></td>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('use_browser', 1, 'id="rbRowOn"'));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('use_browser', 0, 'id="rbRowOff"'));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('use_browser', 1, 'id="rbRowOn"')); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('use_browser', 0, 'id="rbRowOff"')); ?>

     </td>

   </tr>

   <tr>

@@ -18,7 +18,7 @@ 
     <td colspan="2"><div class="split"></div></td>

   </tr>

   

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['which_browser_default_title']?><br><small>[(which_browser)]</small></td>

     <td>

         <select name="which_browser" size="1" class="inputBox" onchange="documentDirty=true;">

@@ -27,206 +27,206 @@ 
                 $dir = str_replace('\\', '/', $dir);

                 $browser_name = substr($dir, strrpos($dir, '/') + 1);

                 $selected = $browser_name == $which_browser ? ' selected="selected"' : '';

-                echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";

+                echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n";

             }

             ?>

         </select>

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['which_browser_default_msg']?></td>

   </tr>

   <tr>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['rb_webuser_title']?><br><small>[(rb_webuser)]</small></td>

     <td>

-      <label><input type="radio" name="rb_webuser" value="1" <?php echo $rb_webuser=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="rb_webuser" value="1" <?php echo $rb_webuser == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" name="rb_webuser" value="0" <?php echo $rb_webuser=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="rb_webuser" value="0" <?php echo $rb_webuser == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['no']?></label>

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['rb_webuser_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['rb_base_dir_title']?><br><small>[(rb_base_dir)]</small></td>

     <td>

         <?php echo $_lang['default']; ?> <span id="default_rb_base_dir">[(base_path)]assets/</span><br />

         <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="rb_base_dir" id="rb_base_dir" value="<?php echo $rb_base_dir; ?>" /> <input type="button" onclick="reset_path('rb_base_dir');" value="<?php echo $_lang['reset']; ?>" name="reset_rb_base_dir">

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['rb_base_dir_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['rb_base_url_title']?><br><small>[(rb_base_url)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="rb_base_url" value="<?php echo $rb_base_url; ?>" />

       </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['rb_base_url_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

       <td nowrap class="warning"><?php echo $_lang['clean_uploaded_filename']?><br><small>[(clean_uploaded_filename)]</small></td>

       <td>

-        <label><input type="radio" name="clean_uploaded_filename" value="1" <?php echo $clean_uploaded_filename=='1' ? 'checked="checked"' : "" ; ?> />

+        <label><input type="radio" name="clean_uploaded_filename" value="1" <?php echo $clean_uploaded_filename == '1' ? 'checked="checked"' : ""; ?> />

         <?php echo $_lang['yes']?></label><br />

-        <label><input type="radio" name="clean_uploaded_filename" value="0" <?php echo $clean_uploaded_filename=='0' ? 'checked="checked"' : "" ; ?> />

+        <label><input type="radio" name="clean_uploaded_filename" value="0" <?php echo $clean_uploaded_filename == '0' ? 'checked="checked"' : ""; ?> />

         <?php echo $_lang['no']?></label>

       </td>

   </tr>

-    <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+    <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

       <td width="200">&nbsp;</td>

-      <td class="comment"><?php echo $_lang['clean_uploaded_filename_message'];?></td>

+      <td class="comment"><?php echo $_lang['clean_uploaded_filename_message']; ?></td>

     </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

   <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['settings_strip_image_paths_title']?><br><small>[(strip_image_paths)]</small></td>

     <td>

-      <label><input type="radio" name="strip_image_paths" value="1" <?php echo $strip_image_paths=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="strip_image_paths" value="1" <?php echo $strip_image_paths == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" name="strip_image_paths" value="0" <?php echo $strip_image_paths=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="strip_image_paths" value="0" <?php echo $strip_image_paths == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['no']?></label>

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['settings_strip_image_paths_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['maxImageWidth']?><br><small>[(maxImageWidth)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="maxImageWidth" value="<?php echo $maxImageWidth; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['maxImageWidth_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['maxImageHeight']?><br><small>[(maxImageHeight)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="maxImageHeight" value="<?php echo $maxImageHeight; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['maxImageHeight_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['thumbWidth']?><br><small>[(thumbWidth)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="thumbWidth" value="<?php echo $thumbWidth; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['thumbWidth_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['thumbHeight']?><br><small>[(thumbHeight)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="thumbHeight" value="<?php echo $thumbHeight; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['thumbHeight_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['thumbsDir']?><br><small>[(thumbsDir)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="thumbsDir" value="<?php echo $thumbsDir; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['thumbsDir_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['jpegQuality']?><br><small>[(jpegQuality)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="jpegQuality" value="<?php echo $jpegQuality; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['jpegQuality_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

        <td nowrap class="warning"><?php echo $_lang['denyZipDownload'] ?><br><small>[(denyZipDownload)]</small></td>

         <td>

-          <label><input type="radio" name="denyZipDownload" value="0" <?php echo $denyZipDownload=='0' ? 'checked="checked"' : ""; ?> />

+          <label><input type="radio" name="denyZipDownload" value="0" <?php echo $denyZipDownload == '0' ? 'checked="checked"' : ""; ?> />

           <?php echo $_lang['no']?></label><br />

-          <label><input type="radio" name="denyZipDownload" value="1" <?php echo $denyZipDownload=='1' ? 'checked="checked"' : ""; ?> />

+          <label><input type="radio" name="denyZipDownload" value="1" <?php echo $denyZipDownload == '1' ? 'checked="checked"' : ""; ?> />

           <?php echo $_lang['yes']?></label>

         </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

         <td nowrap class="warning"><?php echo $_lang['denyExtensionRename'] ?><br><small>[(denyExtensionRename)]</small></td>

         <td>

-           <label><input type="radio" name="denyExtensionRename" value="0" <?php echo $denyExtensionRename=='0' ? 'checked="checked"' : ""; ?> />

+           <label><input type="radio" name="denyExtensionRename" value="0" <?php echo $denyExtensionRename == '0' ? 'checked="checked"' : ""; ?> />

            <?php echo $_lang['no']?></label><br />

-           <label><input type="radio" name="denyExtensionRename" value="1" <?php echo $denyExtensionRename=='1' ? 'checked="checked"' : ""; ?> />

+           <label><input type="radio" name="denyExtensionRename" value="1" <?php echo $denyExtensionRename == '1' ? 'checked="checked"' : ""; ?> />

            <?php echo $_lang['yes']?></label>

         </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

        <td nowrap class="warning"><?php echo $_lang['showHiddenFiles'] ?><br><small>[(showHiddenFiles)]</small></td>

        <td>

-         <label><input type="radio" name="showHiddenFiles" value="0" <?php echo $showHiddenFiles=='0' ? 'checked="checked"' : ""; ?> />

+         <label><input type="radio" name="showHiddenFiles" value="0" <?php echo $showHiddenFiles == '0' ? 'checked="checked"' : ""; ?> />

          <?php echo $_lang['no']?></label><br />

-         <label><input type="radio" name="showHiddenFiles" value="1" <?php echo $showHiddenFiles=='1' ? 'checked="checked"' : ""; ?> />

+         <label><input type="radio" name="showHiddenFiles" value="1" <?php echo $showHiddenFiles == '1' ? 'checked="checked"' : ""; ?> />

          <?php echo $_lang['yes']?></label>

         </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

   

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

             // invoke OnMiscSettingsRender event

             $evtOut = $modx->invokeEvent('OnMiscSettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

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

         ?>

     </td>

   </tr>

Braces +4 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
     <td>

         <select name="which_browser" size="1" class="inputBox" onchange="documentDirty=true;">

             <?php

-            foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {

+            foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
                 $dir = str_replace('\\', '/', $dir);

                 $browser_name = substr($dir, strrpos($dir, '/') + 1);

                 $selected = $browser_name == $which_browser ? ' selected="selected"' : '';

@@ -235,7 +235,9 @@ 
         <?php

             // invoke OnMiscSettingsRender event

             $evtOut = $modx->invokeEvent('OnMiscSettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if(is_array($evtOut)) {
+                echo implode("",$evtOut);
+            }
         ?>

     </td>

   </tr>

manager/actions/mutate_settings/tab4_manager_settings.inc.php

Braces +10 added lines, -10 removed lines

@@ -49,9 +49,9 @@ 
                 <select name="manager_theme" size="1" class="inputBox" onChange="documentDirty=true; document.forms['settings'].theme_refresher.value = Date.parse(new Date());">

                     <?php

                     $dir = dir("media/style/");

-                    while ($file = $dir->read()) {

-                        if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {

-                            if ($file === 'common') {

+                    while ($file = $dir->read()) {
+                        if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
+                            if ($file === 'common') {
                                 continue;

                             }

                             $themename = $file;

@@ -209,7 +209,7 @@ 
                     $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>' . "\n";

                     $option = explode(',', $_lang['settings_group_tv_options']);

                     $output = array();

-                    foreach ($option as $k => $v) {

+                    foreach ($option as $k => $v) {
                         $selected = ($k == $group_tvs) ? 'selected' : '';

                         $s = array('[+value+]', '[+selected+]', '[+title+]');

                         $r = array($k, $selected, $v);

@@ -282,7 +282,7 @@ 
                     $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>' . "\n";

                     $option = array('pagetitle', 'longtitle', 'menutitle', 'alias', 'createdon', 'editedon', 'publishedon');

                     $output = array();

-                    foreach ($option as $v) {

+                    foreach ($option as $v) {
                         $selected = ($v == $resource_tree_node_name) ? 'selected' : '';

                         $s = array('[+value+]', '[+selected+]');

                         $r = array($v, $selected);

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

                     $datetime_format_list = array('dd-mm-YYYY', 'mm/dd/YYYY', 'YYYY/mm/dd');

                     $str = '';

-                    foreach ($datetime_format_list as $value) {

+                    foreach ($datetime_format_list as $value) {
                         $selectedtext = ($datetime_format == $value) ? ' selected' : '';

                         $str .= '<option value="' . $value . '"' . $selectedtext . '>';

                         $str .= $value . '</option>' . PHP_EOL;

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

         // invoke OnRichTextEditorRegister event

         $evtOut = $modx->invokeEvent('OnRichTextEditorRegister');

-        if (!is_array($evtOut)) {

+        if (!is_array($evtOut)) {
             $evtOut = array();

             $use_editor = 0;

         }

@@ -477,8 +477,8 @@ 
                     <?php

                     // invoke OnRichTextEditorRegister event

                     echo "<option value='none'" . ($which_editor == 'none' ? " selected='selected'" : "") . ">" . $_lang['none'] . "</option>\n";

-                    if (is_array($evtOut)) {

-                        foreach ($evtOut as $editor) {

+                    if (is_array($evtOut)) {
+                        foreach ($evtOut as $editor) {
                             echo "<option value='$editor'" . ($which_editor == $editor ? " selected='selected'" : "") . ">$editor</option>\n";

                         }

                     }

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

                 // invoke OnInterfaceSettingsRender event

                 $evtOut = $modx->invokeEvent('OnInterfaceSettingsRender');

-                if (is_array($evtOut)) {

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

                 }

                 ?>

Spacing +14 added lines, -14 removed lines

@@ -56,7 +56,7 @@ 
                             }

                             $themename = $file;

                             $selectedtext = $themename == $manager_theme ? "selected='selected'" : "";

-                            echo "<option value='$themename' $selectedtext>" . ucwords(str_replace("_", " ", $themename)) . "</option>";

+                            echo "<option value='$themename' $selectedtext>".ucwords(str_replace("_", " ", $themename))."</option>";

                         }

                     }

                     $dir->close();

@@ -130,9 +130,9 @@ 
       <tr>

         <th><?php echo $_lang['login_form_position_title'] ?><br><small>[(login_form_position)]</small></th>

         <td>

-            <?php echo wrap_label($_lang['login_form_position_left'],form_radio('login_form_position', 'left'));?><br />

-            <?php echo wrap_label($_lang['login_form_position_center'], form_radio('login_form_position', 'center'));?><br />

-            <?php echo wrap_label($_lang['login_form_position_right'], form_radio('login_form_position', 'right'));?>

+            <?php echo wrap_label($_lang['login_form_position_left'], form_radio('login_form_position', 'left')); ?><br />

+            <?php echo wrap_label($_lang['login_form_position_center'], form_radio('login_form_position', 'center')); ?><br />

+            <?php echo wrap_label($_lang['login_form_position_right'], form_radio('login_form_position', 'right')); ?>

         </td>

       </tr>

          <tr>

@@ -144,8 +144,8 @@ 
       <tr>

         <th><?php echo $_lang['manager_menu_position_title'] ?><br><small>[(manager_menu_position)]</small></th>

         <td>

-            <?php echo wrap_label($_lang['manager_menu_position_top'],form_radio('manager_menu_position', 'top'));?><br />

-            <?php echo wrap_label($_lang['manager_menu_position_left'], form_radio('manager_menu_position', 'left'));?><br />

+            <?php echo wrap_label($_lang['manager_menu_position_top'], form_radio('manager_menu_position', 'top')); ?><br />

+            <?php echo wrap_label($_lang['manager_menu_position_left'], form_radio('manager_menu_position', 'left')); ?><br />

         </td>

       </tr>

 

@@ -287,7 +287,7 @@ 
             <td>

                 <select name="group_tvs" size="1" class="form-control">

                     <?php

-                    $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>' . "\n";

+                    $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>'."\n";

                     $option = explode(',', $_lang['settings_group_tv_options']);

                     $output = array();

                     foreach ($option as $k => $v) {

@@ -360,7 +360,7 @@ 
             <td>

                 <select name="resource_tree_node_name" size="1" class="inputBox">

                     <?php

-                    $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>' . "\n";

+                    $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>'."\n";

                     $option = array('pagetitle', 'longtitle', 'menutitle', 'alias', 'createdon', 'editedon', 'publishedon');

                     $output = array();

                     foreach ($option as $v) {

@@ -446,8 +446,8 @@ 
                     $str = '';

                     foreach ($datetime_format_list as $value) {

                         $selectedtext = ($datetime_format == $value) ? ' selected' : '';

-                        $str .= '<option value="' . $value . '"' . $selectedtext . '>';

-                        $str .= $value . '</option>' . PHP_EOL;

+                        $str .= '<option value="'.$value.'"'.$selectedtext.'>';

+                        $str .= $value.'</option>'.PHP_EOL;

                     }

                     echo $str;

                     ?>

@@ -557,10 +557,10 @@ 
                 <select name="which_editor" onChange="documentDirty=true;">

                     <?php

                     // invoke OnRichTextEditorRegister event

-                    echo "<option value='none'" . ($which_editor == 'none' ? " selected='selected'" : "") . ">" . $_lang['none'] . "</option>\n";

+                    echo "<option value='none'".($which_editor == 'none' ? " selected='selected'" : "").">".$_lang['none']."</option>\n";

                     if (is_array($evtOut)) {

                         foreach ($evtOut as $editor) {

-                            echo "<option value='$editor'" . ($which_editor == $editor ? " selected='selected'" : "") . ">$editor</option>\n";

+                            echo "<option value='$editor'".($which_editor == $editor ? " selected='selected'" : "").">$editor</option>\n";

                         }

                     }

                     ?>

@@ -644,14 +644,14 @@ 
     lastImageCtrl = ctrl;

     var w = screen.width * 0.7;

     var h = screen.height * 0.7;

-    OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);

+    OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);

   }

 

   function BrowseFileServer(ctrl) {

     lastFileCtrl = ctrl;

     var w = screen.width * 0.7;

     var h = screen.height * 0.7;

-    OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=files", w, h);

+    OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=files", w, h);

   }

 

   function SetUrlChange(el) {

manager/actions/mutate_settings/snippet_smtp.inc.php

Spacing +4 added lines, -4 removed lines

@@ -2,8 +2,8 @@ 
   <tr>

     <td><?php echo $_lang['smtp_auth_title'] ?></td>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('smtp_auth','1' ));?><br />

-        <?php echo wrap_label($_lang['no'],form_radio('smtp_auth','0' ));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('smtp_auth', '1')); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('smtp_auth', '0')); ?>

     </td>

   </tr>

   <tr>

@@ -15,8 +15,8 @@ 
     <td >

      <select name="smtp_secure" size="1" class="inputBox">

   <option value="none" ><?php echo $_lang['no'] ?></option>

-   <option value="ssl" <?php if($smtp_secure == 'ssl') echo "selected='selected'"; ?> >SSL</option>

-  <option value="tls" <?php if($smtp_secure == 'tls') echo "selected='selected'"; ?> >TLS</option>

+   <option value="ssl" <?php if ($smtp_secure == 'ssl') echo "selected='selected'"; ?> >SSL</option>

+  <option value="tls" <?php if ($smtp_secure == 'tls') echo "selected='selected'"; ?> >TLS</option>

  </select>

  <br />

   </td>

Braces +8 added lines, -2 removed lines

@@ -15,8 +15,14 @@
     <td >

      <select name="smtp_secure" size="1" class="inputBox">

   <option value="none" ><?php echo $_lang['no'] ?></option>

-   <option value="ssl" <?php if($smtp_secure == 'ssl') echo "selected='selected'"; ?> >SSL</option>

-  <option value="tls" <?php if($smtp_secure == 'tls') echo "selected='selected'"; ?> >TLS</option>

+   <option value="ssl" <?php if($smtp_secure == 'ssl') {
+    echo "selected='selected'";
+}
+?> >SSL</option>

+  <option value="tls" <?php if($smtp_secure == 'tls') {
+    echo "selected='selected'";
+}
+?> >TLS</option>

  </select>

  <br />

   </td>