evolution-cms / evolution

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

Indentation +31 added lines, -31 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Path 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 Path 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 path {
 
-  /** Get the absolute URL path of the given one. Returns FALSE if the URL
-    * is not valid or the current directory cannot be resolved (getcwd())
-    * @param string $path
-    * @return string */
+    /** Get the absolute URL path of the given one. Returns FALSE if the URL
+     * is not valid or the current directory cannot be resolved (getcwd())
+     * @param string $path
+     * @return string */
 
     static function rel2abs_url($path) {
         if (substr($path, 0, 1) == "/") return $path;
@@ -39,10 +39,10 @@ 
         return $return;
     }
 
-  /** Resolve full filesystem path of given URL. Returns FALSE if the URL
-    * cannot be resolved
-    * @param string $url
-    * @return string */
+    /** Resolve full filesystem path of given URL. Returns FALSE if the URL
+     * cannot be resolved
+     * @param string $url
+     * @return string */
 
     static function url2fullPath($url) {
         $url = self::normalize($url);
@@ -84,13 +84,13 @@ 
         }
     }
 
-  /** Normalize the given path. On Windows servers backslash will be replaced
-    * with slash. Remobes unnecessary doble slashes and double dots. Removes
-    * last slash if it exists. Examples:
-    * path::normalize("C:\\any\\path\\") returns "C:/any/path"
-    * path::normalize("/your/path/..//home/") returns "/your/home"
-    * @param string $path
-    * @return string */
+    /** Normalize the given path. On Windows servers backslash will be replaced
+     * with slash. Remobes unnecessary doble slashes and double dots. Removes
+     * last slash if it exists. Examples:
+     * path::normalize("C:\\any\\path\\") returns "C:/any/path"
+     * path::normalize("/your/path/..//home/") returns "/your/home"
+     * @param string $path
+     * @return string */
 
     static function normalize($path) {
         if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN") {
@@ -114,9 +114,9 @@ 
         return $path;
     }
 
-  /** Encode URL Path
-    * @param string $path
-    * @return string */
+    /** Encode URL Path
+     * @param string $path
+     * @return string */
 
     static function urlPathEncode($path) {
         $path = self::normalize($path);
@@ -127,9 +127,9 @@ 
         return $encoded;
     }
 
-  /** Decode URL Path
-    * @param string $path
-    * @return string */
+    /** Decode URL Path
+     * @param string $path
+     * @return string */
 
     static function urlPathDecode($path) {
         $path = self::normalize($path);

Spacing +14 added lines, -14 removed lines

@@ -12,14 +12,14 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class path {
+class path{
 
   /** Get the absolute URL path of the given one. Returns FALSE if the URL
     * is not valid or the current directory cannot be resolved (getcwd())
     * @param string $path
     * @return string */
 
-    static function rel2abs_url($path) {
+    static function rel2abs_url($path){
         if (substr($path, 0, 1) == "/") return $path;
         $dir = @getcwd();
 
@@ -32,7 +32,7 @@ 
         if (substr($dir, 0, strlen($doc_root)) != $doc_root)
             return false;
 
-        $return = self::normalize(substr($dir, strlen($doc_root)) . "/$path");
+        $return = self::normalize(substr($dir, strlen($doc_root))."/$path");
         if (substr($return, 0, 1) !== "/")
             $return = "/$return";
 
@@ -44,7 +44,7 @@ 
     * @param string $url
     * @return string */
 
-    static function url2fullPath($url) {
+    static function url2fullPath($url){
         $url = self::normalize($url);
 
         $uri = isset($_SERVER['SCRIPT_NAME'])
@@ -56,18 +56,18 @@ 
 
         if (substr($url, 0, 1) !== "/") {
             if ($uri === false) return false;
-            $url = dirname($uri) . "/$url";
+            $url = dirname($uri)."/$url";
         }
 
         if (isset($_SERVER['DOCUMENT_ROOT'])) {
-            return self::normalize($_SERVER['DOCUMENT_ROOT'] . "/$url");
+            return self::normalize($_SERVER['DOCUMENT_ROOT']."/$url");
 
         } else {
             if ($uri === false) return false;
 
             if (isset($_SERVER['SCRIPT_FILENAME'])) {
                 $scr_filename = self::normalize($_SERVER['SCRIPT_FILENAME']);
-                return self::normalize(substr($scr_filename, 0, -strlen($uri)) . "/$url");
+                return self::normalize(substr($scr_filename, 0, -strlen($uri))."/$url");
             }
 
             $count = count(explode('/', $uri)) - 1;
@@ -80,7 +80,7 @@ 
                 return false;
             $rdir = getcwd();
             chdir($dir);
-            return ($rdir !== false) ? self::normalize($rdir . "/$url") : false;
+            return ($rdir !== false) ? self::normalize($rdir."/$url") : false;
         }
     }
 
@@ -92,11 +92,11 @@ 
     * @param string $path
     * @return string */
 
-    static function normalize($path) {
+    static function normalize($path){
         if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN") {
             $path = preg_replace('/([^\\\])\\\([^\\\])/', "$1/$2", $path);
             if (substr($path, -1) == "\\") $path = substr($path, 0, -1);
-            if (substr($path, 0, 1) == "\\") $path = "/" . substr($path, 1);
+            if (substr($path, 0, 1) == "\\") $path = "/".substr($path, 1);
         }
 
         $path = preg_replace('/\/+/s', "/", $path);
@@ -118,11 +118,11 @@ 
     * @param string $path
     * @return string */
 
-    static function urlPathEncode($path) {
+    static function urlPathEncode($path){
         $path = self::normalize($path);
         $encoded = "";
         foreach (explode("/", $path) as $dir)
-            $encoded .= rawurlencode($dir) . "/";
+            $encoded .= rawurlencode($dir)."/";
         $encoded = substr($encoded, 0, -1);
         return $encoded;
     }
@@ -131,11 +131,11 @@ 
     * @param string $path
     * @return string */
 
-    static function urlPathDecode($path) {
+    static function urlPathDecode($path){
         $path = self::normalize($path);
         $decoded = "";
         foreach (explode("/", $path) as $dir)
-            $decoded .= rawurldecode($dir) . "/";
+            $decoded .= rawurldecode($dir)."/";
         $decoded = substr($decoded, 0, -1);
         return $decoded;
     }

Braces +54 added lines, -29 removed lines

@@ -12,29 +12,36 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class path {
+class path
+{
 
   /** Get the absolute URL path of the given one. Returns FALSE if the URL
     * is not valid or the current directory cannot be resolved (getcwd())
     * @param string $path
     * @return string */
 
-    static function rel2abs_url($path) {
-        if (substr($path, 0, 1) == "/") return $path;
+    static function rel2abs_url($path)
+    {
+        if (substr($path, 0, 1) == "/") {
+            return $path;
+        }
         $dir = @getcwd();
 
-        if (!isset($_SERVER['DOCUMENT_ROOT']) || ($dir === false))
-            return false;
+        if (!isset($_SERVER['DOCUMENT_ROOT']) || ($dir === false)) {
+                    return false;
+        }
 
         $dir = self::normalize($dir);
         $doc_root = self::normalize($_SERVER['DOCUMENT_ROOT']);
 
-        if (substr($dir, 0, strlen($doc_root)) != $doc_root)
-            return false;
+        if (substr($dir, 0, strlen($doc_root)) != $doc_root) {
+                    return false;
+        }
 
         $return = self::normalize(substr($dir, strlen($doc_root)) . "/$path");
-        if (substr($return, 0, 1) !== "/")
-            $return = "/$return";
+        if (substr($return, 0, 1) !== "/") {
+                    $return = "/$return";
+        }
 
         return $return;
     }
@@ -44,7 +51,8 @@ 
     * @param string $url
     * @return string */
 
-    static function url2fullPath($url) {
+    static function url2fullPath($url)
+    {
         $url = self::normalize($url);
 
         $uri = isset($_SERVER['SCRIPT_NAME'])
@@ -55,7 +63,9 @@ 
         $uri = self::normalize($uri);
 
         if (substr($url, 0, 1) !== "/") {
-            if ($uri === false) return false;
+            if ($uri === false) {
+                return false;
+            }
             $url = dirname($uri) . "/$url";
         }
 
@@ -63,7 +73,9 @@ 
             return self::normalize($_SERVER['DOCUMENT_ROOT'] . "/$url");
 
         } else {
-            if ($uri === false) return false;
+            if ($uri === false) {
+                return false;
+            }
 
             if (isset($_SERVER['SCRIPT_FILENAME'])) {
                 $scr_filename = self::normalize($_SERVER['SCRIPT_FILENAME']);
@@ -71,13 +83,15 @@ 
             }
 
             $count = count(explode('/', $uri)) - 1;
-            for ($i = 0, $chdir = ""; $i < $count; $i++)
-                $chdir .= "../";
+            for ($i = 0, $chdir = ""; $i < $count; $i++) {
+                            $chdir .= "../";
+            }
             $chdir = self::normalize($chdir);
 
             $dir = getcwd();
-            if (($dir === false) || !@chdir($chdir))
-                return false;
+            if (($dir === false) || !@chdir($chdir)) {
+                            return false;
+            }
             $rdir = getcwd();
             chdir($dir);
             return ($rdir !== false) ? self::normalize($rdir . "/$url") : false;
@@ -92,22 +106,29 @@ 
     * @param string $path
     * @return string */
 
-    static function normalize($path) {
+    static function normalize($path)
+    {
         if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN") {
             $path = preg_replace('/([^\\\])\\\([^\\\])/', "$1/$2", $path);
-            if (substr($path, -1) == "\\") $path = substr($path, 0, -1);
-            if (substr($path, 0, 1) == "\\") $path = "/" . substr($path, 1);
+            if (substr($path, -1) == "\\") {
+                $path = substr($path, 0, -1);
+            }
+            if (substr($path, 0, 1) == "\\") {
+                $path = "/" . substr($path, 1);
+            }
         }
 
         $path = preg_replace('/\/+/s', "/", $path);
 
         $path = "/$path";
-        if (substr($path, -1) != "/")
-            $path .= "/";
+        if (substr($path, -1) != "/") {
+                    $path .= "/";
+        }
 
         $expr = '/\/([^\/]{1}|[^\.\/]{2}|[^\/]{3,})\/\.\.\//s';
-        while (preg_match($expr, $path))
-            $path = preg_replace($expr, "/", $path);
+        while (preg_match($expr, $path)) {
+                    $path = preg_replace($expr, "/", $path);
+        }
 
         $path = substr($path, 0, -1);
         $path = substr($path, 1);
@@ -118,11 +139,13 @@ 
     * @param string $path
     * @return string */
 
-    static function urlPathEncode($path) {
+    static function urlPathEncode($path)
+    {
         $path = self::normalize($path);
         $encoded = "";
-        foreach (explode("/", $path) as $dir)
-            $encoded .= rawurlencode($dir) . "/";
+        foreach (explode("/", $path) as $dir) {
+                    $encoded .= rawurlencode($dir) . "/";
+        }
         $encoded = substr($encoded, 0, -1);
         return $encoded;
     }
@@ -131,11 +154,13 @@ 
     * @param string $path
     * @return string */
 
-    static function urlPathDecode($path) {
+    static function urlPathDecode($path)
+    {
         $path = self::normalize($path);
         $decoded = "";
-        foreach (explode("/", $path) as $dir)
-            $decoded .= rawurldecode($dir) . "/";
+        foreach (explode("/", $path) as $dir) {
+                    $decoded .= rawurldecode($dir) . "/";
+        }
         $decoded = substr($decoded, 0, -1);
         return $decoded;
     }

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

Indentation +30 added lines, -30 removed lines

@@ -1,29 +1,29 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc HTTP cache 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 HTTP cache 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 httpCache {
     const DEFAULT_TYPE = "text/html";
     const DEFAULT_EXPIRE = 604800; // in seconds
 
-  /** Cache a file. The $type parameter might define the MIME type of the file
-    * or path to magic file to autodetect the MIME type. If you skip $type
-    * parameter the method will try with the default magic file. Autodetection
-    * of MIME type requires Fileinfo PHP extension used in file::getMimeType()
-    * @param string $file
-    * @param string $type
-    * @param integer $expire
-    * @param array $headers */
+    /** Cache a file. The $type parameter might define the MIME type of the file
+     * or path to magic file to autodetect the MIME type. If you skip $type
+     * parameter the method will try with the default magic file. Autodetection
+     * of MIME type requires Fileinfo PHP extension used in file::getMimeType()
+     * @param string $file
+     * @param string $type
+     * @param integer $expire
+     * @param array $headers */
 
     static function file($file, $type=null, $expire=null, array $headers=null) {
         $mtime = @filemtime($file);
@@ -39,13 +39,13 @@ 
         self::content(@file_get_contents($file), $mtime, $type, $expire, $headers, false);
     }
 
-  /** Cache the given $content with $mtime modification time.
-    * @param binary $content
-    * @param integer $mtime
-    * @param string $type
-    * @param integer $expire
-    * @param array $headers
-    * @param bool $checkMTime */
+    /** Cache the given $content with $mtime modification time.
+     * @param binary $content
+     * @param integer $mtime
+     * @param string $type
+     * @param integer $expire
+     * @param array $headers
+     * @param bool $checkMTime */
 
     static function content($content, $mtime, $type=null, $expire=null, array $headers=null, $checkMTime=true) {
         if ($checkMTime) self::checkMTime($mtime);
@@ -62,11 +62,11 @@ 
         echo $content;
     }
 
-  /** Check if given modification time is newer than client-side one. If not,
-    * the method will tell the client to get the content from its own cache.
-    * Afterwards the script process will be terminated. This feature requires
-    * the PHP to be configured as Apache module.
-    * @param integer $mtime */
+    /** Check if given modification time is newer than client-side one. If not,
+     * the method will tell the client to get the content from its own cache.
+     * Afterwards the script process will be terminated. This feature requires
+     * the PHP to be configured as Apache module.
+     * @param integer $mtime */
 
     static function checkMTime($mtime, $sendHeaders=null) {
         header("Last-Modified: " . gmdate("D, d M Y H:i:s", $mtime) . " GMT");

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class httpCache {
+class httpCache{
     const DEFAULT_TYPE = "text/html";
     const DEFAULT_EXPIRE = 604800; // in seconds
 
@@ -25,7 +25,7 @@ 
     * @param integer $expire
     * @param array $headers */
 
-    static function file($file, $type=null, $expire=null, array $headers=null) {
+    static function file($file, $type = null, $expire = null, array $headers = null){
         $mtime = @filemtime($file);
         if ($mtime !== false) self::checkMTime($mtime);
 
@@ -47,12 +47,12 @@ 
     * @param array $headers
     * @param bool $checkMTime */
 
-    static function content($content, $mtime, $type=null, $expire=null, array $headers=null, $checkMTime=true) {
+    static function content($content, $mtime, $type = null, $expire = null, array $headers = null, $checkMTime = true){
         if ($checkMTime) self::checkMTime($mtime);
         if ($type === null) $type = self::DEFAULT_TYPE;
         if ($expire === null) $expire = self::DEFAULT_EXPIRE;
         $size = strlen($content);
-        $expires = gmdate("D, d M Y H:i:s", time() + $expire) . " GMT";
+        $expires = gmdate("D, d M Y H:i:s", time() + $expire)." GMT";
         header("Content-Type: $type");
         header("Expires: $expires");
         header("Cache-Control: max-age=$expire");
@@ -68,8 +68,8 @@ 
     * the PHP to be configured as Apache module.
     * @param integer $mtime */
 
-    static function checkMTime($mtime, $sendHeaders=null) {
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s", $mtime) . " GMT");
+    static function checkMTime($mtime, $sendHeaders = null){
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s", $mtime)." GMT");
 
         $headers = function_exists("getallheaders")
             ? getallheaders()

Braces +31 added lines, -14 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class httpCache {
+class httpCache
+{
     const DEFAULT_TYPE = "text/html";
     const DEFAULT_EXPIRE = 604800; // in seconds
 
@@ -25,15 +26,20 @@ 
     * @param integer $expire
     * @param array $headers */
 
-    static function file($file, $type=null, $expire=null, array $headers=null) {
+    static function file($file, $type=null, $expire=null, array $headers=null)
+    {
         $mtime = @filemtime($file);
-        if ($mtime !== false) self::checkMTime($mtime);
+        if ($mtime !== false) {
+            self::checkMTime($mtime);
+        }
 
         if ($type === null) {
             $magic = ((substr($type, 0, 1) == "/") || preg_match('/^[a-z]\:/i', $type))
                 ? $type : null;
             $type = file::getMimeType($file, $magic);
-            if (!$type) $type = null;
+            if (!$type) {
+                $type = null;
+            }
         }
 
         self::content(@file_get_contents($file), $mtime, $type, $expire, $headers, false);
@@ -47,10 +53,17 @@ 
     * @param array $headers
     * @param bool $checkMTime */
 
-    static function content($content, $mtime, $type=null, $expire=null, array $headers=null, $checkMTime=true) {
-        if ($checkMTime) self::checkMTime($mtime);
-        if ($type === null) $type = self::DEFAULT_TYPE;
-        if ($expire === null) $expire = self::DEFAULT_EXPIRE;
+    static function content($content, $mtime, $type=null, $expire=null, array $headers=null, $checkMTime=true)
+    {
+        if ($checkMTime) {
+            self::checkMTime($mtime);
+        }
+        if ($type === null) {
+            $type = self::DEFAULT_TYPE;
+        }
+        if ($expire === null) {
+            $expire = self::DEFAULT_EXPIRE;
+        }
         $size = strlen($content);
         $expires = gmdate("D, d M Y H:i:s", time() + $expire) . " GMT";
         header("Content-Type: $type");
@@ -58,7 +71,9 @@ 
         header("Cache-Control: max-age=$expire");
         header("Pragma: !invalid");
         header("Content-Length: $size");
-        if ($headers !== null) foreach ($headers as $header) header($header);
+        if ($headers !== null) {
+            foreach ($headers as $header) header($header);
+        }
         echo $content;
     }
 
@@ -68,7 +83,8 @@ 
     * the PHP to be configured as Apache module.
     * @param integer $mtime */
 
-    static function checkMTime($mtime, $sendHeaders=null) {
+    static function checkMTime($mtime, $sendHeaders=null)
+    {
         header("Last-Modified: " . gmdate("D, d M Y H:i:s", $mtime) . " GMT");
 
         $headers = function_exists("getallheaders")
@@ -82,11 +98,12 @@ 
             $client_mtime = @strtotime($client_mtime[0]);
             if ($client_mtime >= $mtime) {
                 header('HTTP/1.1 304 Not Modified');
-                if (is_array($sendHeaders) && count($sendHeaders))
-                    foreach ($sendHeaders as $header)
+                if (is_array($sendHeaders) && count($sendHeaders)) {
+                                    foreach ($sendHeaders as $header)
                         header($header);
-                elseif ($sendHeaders !== null)
-                    header($sendHeaders);
+                } elseif ($sendHeaders !== null) {
+                                    header($sendHeaders);
+                }
 
 
                 die;

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

Indentation +25 added lines, -25 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Text processing 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 Text processing 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 text {
 
-  /** Replace repeated white spaces to single space
-    * @param string $string
-    * @return string */
+    /** Replace repeated white spaces to single space
+     * @param string $string
+     * @return string */
 
     static function clearWhitespaces($string) {
         return trim(preg_replace('/\s+/s', " ", $string));
     }
 
-  /** Normalize the string for HTML attribute value
-    * @param string $string
-    * @return string */
+    /** Normalize the string for HTML attribute value
+     * @param string $string
+     * @return string */
 
     static function htmlValue($string) {
         return
@@ -35,9 +35,9 @@ 
         $string))));
     }
 
-  /** Normalize the string for JavaScript string value
-    * @param string $string
-    * @return string */
+    /** Normalize the string for JavaScript string value
+     * @param string $string
+     * @return string */
 
     static function jsValue($string) {
         return
@@ -48,9 +48,9 @@ 
         $string))));
     }
 
-  /** Normalize the string for XML tag content data
-    * @param string $string
-    * @param bool $cdata */
+    /** Normalize the string for XML tag content data
+     * @param string $string
+     * @param bool $cdata */
 
     static function xmlData($string, $cdata=false) {
         $string = str_replace("]]>", "]]]]><![CDATA[>", $string);
@@ -59,9 +59,9 @@ 
         return $string;
     }
 
-  /** Returns compressed content of given CSS code
-    * @param string $code
-    * @return string */
+    /** Returns compressed content of given CSS code
+     * @param string $code
+     * @return string */
 
     static function compressCSS($code) {
         $code = self::clearWhitespaces($code);

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class text {
+class text{
 
   /** Replace repeated white spaces to single space
     * @param string $string
     * @return string */
 
-    static function clearWhitespaces($string) {
+    static function clearWhitespaces($string){
         return trim(preg_replace('/\s+/s', " ", $string));
     }
 
@@ -26,7 +26,7 @@ 
     * @param string $string
     * @return string */
 
-    static function htmlValue($string) {
+    static function htmlValue($string){
         return
             str_replace('"', """,
             str_replace("'", ''',
@@ -39,7 +39,7 @@ 
     * @param string $string
     * @return string */
 
-    static function jsValue($string) {
+    static function jsValue($string){
         return
             preg_replace('/\r?\n/', "\\n",
             str_replace('"', "\\\"",
@@ -52,7 +52,7 @@ 
     * @param string $string
     * @param bool $cdata */
 
-    static function xmlData($string, $cdata=false) {
+    static function xmlData($string, $cdata = false){
         $string = str_replace("]]>", "]]]]><![CDATA[>", $string);
         if (!$cdata)
             $string = "<![CDATA[$string]]>";
@@ -63,7 +63,7 @@ 
     * @param string $code
     * @return string */
 
-    static function compressCSS($code) {
+    static function compressCSS($code){
         $code = self::clearWhitespaces($code);
         $code = preg_replace('/ ?\{ ?/', "{", $code);
         $code = preg_replace('/ ?\} ?/', "}", $code);

Braces +15 added lines, -8 removed lines

@@ -12,13 +12,15 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class text {
+class text
+{
 
   /** Replace repeated white spaces to single space
     * @param string $string
     * @return string */
 
-    static function clearWhitespaces($string) {
+    static function clearWhitespaces($string)
+    {
         return trim(preg_replace('/\s+/s', " ", $string));
     }
 
@@ -26,7 +28,8 @@ 
     * @param string $string
     * @return string */
 
-    static function htmlValue($string) {
+    static function htmlValue($string)
+    {
         return
             str_replace('"', """,
             str_replace("'", ''',
@@ -39,7 +42,8 @@ 
     * @param string $string
     * @return string */
 
-    static function jsValue($string) {
+    static function jsValue($string)
+    {
         return
             preg_replace('/\r?\n/', "\\n",
             str_replace('"', "\\\"",
@@ -52,10 +56,12 @@ 
     * @param string $string
     * @param bool $cdata */
 
-    static function xmlData($string, $cdata=false) {
+    static function xmlData($string, $cdata=false)
+    {
         $string = str_replace("]]>", "]]]]><![CDATA[>", $string);
-        if (!$cdata)
-            $string = "<![CDATA[$string]]>";
+        if (!$cdata) {
+                    $string = "<![CDATA[$string]]>";
+        }
         return $string;
     }
 
@@ -63,7 +69,8 @@ 
     * @param string $code
     * @return string */
 
-    static function compressCSS($code) {
+    static function compressCSS($code)
+    {
         $code = self::clearWhitespaces($code);
         $code = preg_replace('/ ?\{ ?/', "{", $code);
         $code = preg_replace('/ ?\} ?/', "}", $code);

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

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc GraphicsMagick image driver 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 GraphicsMagick image driver 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 image_gmagick extends image {
 

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gmagick extends image {
+class image_gmagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -69,7 +69,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -119,7 +119,7 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background = "#000000"){
         try {
             $this->image->rotateImage($background, $angle);
             $w = $this->image->getImageWidth();
@@ -132,7 +132,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -141,7 +141,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -150,7 +150,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left = false, $top = false){
         try {
             $wm = new Gmagick($file);
             $w = $wm->getImageWidth();
@@ -185,7 +185,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Gmagick();
             $img->newImage($width, $height, "none");
@@ -195,7 +195,7 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_object($image) && ($image instanceof image_gmagick)) {
             $width = $image->width;
@@ -232,11 +232,11 @@ 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available(){
         return class_exists("Gmagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file){
         try {
             new Gmagick($file);
         } catch (Exception $e) {
@@ -248,7 +248,7 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type = "jpeg", array $options = array()){
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -267,7 +267,7 @@ 
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -287,7 +287,7 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options = array()){
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setCompressionQuality($quality);

Braces +81 added lines, -40 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gmagick extends image {
+class image_gmagick extends image
+{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,9 +22,15 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resize($width, $height)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
         try {
             $this->image->scaleImage($width, $height);
         } catch (Exception $e) {
@@ -34,9 +41,15 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeFit($width, $height, $background=false)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         try {
             $this->image->scaleImage($width, $height, true);
@@ -69,43 +82,58 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeCrop($width, $height, $offset=false)
+    {
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
             $w = ($this->width * $h) / $this->height;
             $y = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($w + $offset) <= $width)
-                    $offset = $width - $w;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($w + $offset) <= $width) {
+                                    $offset = $width - $w;
+                }
                 $x = $offset;
-            } else
-                $x = ($width - $w) / 2;
+            } else {
+                            $x = ($width - $w) / 2;
+            }
 
         } else {
             $w = $width;
             $h = ($this->height * $w) / $this->width;
             $x = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($h + $offset) <= $height)
-                    $offset = $height - $h;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($h + $offset) <= $height) {
+                                    $offset = $height - $h;
+                }
                 $y = $offset;
-            } else
-                $y = ($height - $h) / 2;
+            } else {
+                            $y = ($height - $h) / 2;
+            }
         }
 
         $x = round($x);
         $y = round($y);
         $w = round($w);
         $h = round($h);
-        if (!$w) $w = 1;
-        if (!$h) $h = 1;
+        if (!$w) {
+            $w = 1;
+        }
+        if (!$h) {
+            $h = 1;
+        }
 
         try {
             $this->image->scaleImage($w, $h);
@@ -119,7 +147,8 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background="#000000")
+    {
         try {
             $this->image->rotateImage($background, $angle);
             $w = $this->image->getImageWidth();
@@ -132,7 +161,8 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal()
+    {
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -141,7 +171,8 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical()
+    {
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -150,7 +181,8 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left=false, $top=false)
+    {
         try {
             $wm = new Gmagick($file);
             $w = $wm->getImageWidth();
@@ -171,8 +203,9 @@ 
         if ((($x + $w) > $this->width) ||
             (($y + $h) > $this->height) ||
             ($x < 0) || ($y < 0)
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         try {
             $this->image->compositeImage($wm, 1, $x, $y);
@@ -185,7 +218,8 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height)
+    {
         try {
             $img = new Gmagick();
             $img->newImage($width, $height, "none");
@@ -195,7 +229,8 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height)
+    {
 
         if (is_object($image) && ($image instanceof image_gmagick)) {
             $width = $image->width;
@@ -225,18 +260,21 @@ 
             $height = $h;
             return $image;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available()
+    {
         return class_exists("Gmagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file)
+    {
         try {
             new Gmagick($file);
         } catch (Exception $e) {
@@ -248,7 +286,8 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type="jpeg", array $options=array())
+    {
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -256,8 +295,9 @@ 
             return false;
         }
         $method = "optimize_$type";
-        if (method_exists($this, $method) && !$this->$method($options))
-            return false;
+        if (method_exists($this, $method) && !$this->$method($options)) {
+                    return false;
+        }
 
         if (!isset($options['file'])) {
             if (!headers_sent()) {
@@ -287,7 +327,8 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options=array())
+    {
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setCompressionQuality($quality);

manager/media/browser/mcpuk/config.php

Spacing +12 added lines, -12 removed lines

@@ -26,12 +26,12 @@ 
 	
     'theme' => "evo",
 
-    'uploadURL' => rtrim($modx->config['rb_base_url'],'/'),
-    'uploadDir' => rtrim($modx->config['rb_base_dir'],'/'),
+    'uploadURL' => rtrim($modx->config['rb_base_url'], '/'),
+    'uploadDir' => rtrim($modx->config['rb_base_dir'], '/'),
     'siteURL' => $modx->config['site_url'],
-    'assetsURL' => rtrim($modx->config['rb_base_url'],'/'),
-    'dirPerms' => intval($modx->config['new_folder_permissions'],8),
-    'filePerms' => intval($modx->config['new_file_permissions'],8),
+    'assetsURL' => rtrim($modx->config['rb_base_url'], '/'),
+    'dirPerms' => intval($modx->config['new_folder_permissions'], 8),
+    'filePerms' => intval($modx->config['new_file_permissions'], 8),
     'maxfilesize' => $settings['upload_maxsize'],
     'denyUpdateCheck' => true,
 
@@ -58,14 +58,14 @@ 
     'types' => array(
 
         // CKEditor & FCKEditor types
-        'files'   =>  str_replace(',',' ',$modx->config['upload_files']),
-        'flash'   =>  str_replace(',',' ',$modx->config['upload_flash']),
-        'images'  =>  str_replace(',',' ',$modx->config['upload_images']),
+        'files'   =>  str_replace(',', ' ', $modx->config['upload_files']),
+        'flash'   =>  str_replace(',', ' ', $modx->config['upload_flash']),
+        'images'  =>  str_replace(',', ' ', $modx->config['upload_images']),
 
         // TinyMCE types
-        'file'    =>  str_replace(',',' ',$modx->config['upload_files']),
-        'media'   =>  str_replace(',',' ',$modx->config['upload_media']),
-        'image'   =>  str_replace(',',' ',$modx->config['upload_images']),
+        'file'    =>  str_replace(',', ' ', $modx->config['upload_files']),
+        'media'   =>  str_replace(',', ' ', $modx->config['upload_media']),
+        'image'   =>  str_replace(',', ' ', $modx->config['upload_images']),
     ),
     'dirnameChangeChars' => array(
         ' ' => "_",
@@ -89,7 +89,7 @@ 
 
     // THE FOLLOWING SETTINGS CANNOT BE OVERRIDED WITH SESSION CONFIGURATION
     '_check4htaccess' => false,
-    '_tinyMCEPath' => MODX_BASE_URL . "assets/plugins/tinymce/tiny_mce",
+    '_tinyMCEPath' => MODX_BASE_URL."assets/plugins/tinymce/tiny_mce",
 
     '_sessionVar' => &$_SESSION['KCFINDER'],
     //'_sessionLifetime' => 30,

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Base configuration file
-  *   @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 Base configuration file
+ *   @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
+ */
 
 // IMPORTANT!!! Do not remove uncommented settings in this file even if
 // you are using session configuration.
@@ -70,7 +70,7 @@ 
     'dirnameChangeChars' => array(
         ' ' => "_",
         ':' => "."
-     ),
+        ),
     'mime_magic' => "",
 
     'maxImageWidth' => $modx->config['maxImageWidth'],

manager/media/browser/mcpuk/browse.php

Indentation +13 added lines, -13 removed lines

@@ -1,23 +1,23 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Browser calling script
-  *   @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 Browser calling script
+ *   @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
+ */
 
 require "core/autoload.php"; // Init MODX
 
 function returnNoPermissionsMessage($role) {
-	global $_lang;
-	echo sprintf($_lang['files_management_no_permission'], $role);
-	exit;
+    global $_lang;
+    echo sprintf($_lang['files_management_no_permission'], $role);
+    exit;
 }
 
 if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');

Spacing +3 added lines, -3 removed lines

@@ -14,14 +14,14 @@
 
 require "core/autoload.php"; // Init MODX
 
-function returnNoPermissionsMessage($role) {
+function returnNoPermissionsMessage($role){
 	global $_lang;
 	echo sprintf($_lang['files_management_no_permission'], $role);
 	exit;
 }
 
-if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');
-if( $_GET['type'] == 'files'  && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_files'))  returnNoPermissionsMessage('assets_files');
+if ($_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');
+if ($_GET['type'] == 'files' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_files'))  returnNoPermissionsMessage('assets_files');
 
 $browser = new browser($modx);
 $browser->action();

Braces +8 added lines, -3 removed lines

@@ -14,14 +14,19 @@
 
 require "core/autoload.php"; // Init MODX
 
-function returnNoPermissionsMessage($role) {
+function returnNoPermissionsMessage($role)
+{
 	global $_lang;
 	echo sprintf($_lang['files_management_no_permission'], $role);
 	exit;
 }
 
-if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');
-if( $_GET['type'] == 'files'  && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_files'))  returnNoPermissionsMessage('assets_files');
+if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) {
+    returnNoPermissionsMessage('assets_images');
+}
+if( $_GET['type'] == 'files'  && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_files')) {
+    returnNoPermissionsMessage('assets_files');
+}
 
 $browser = new browser($modx);
 $browser->action();

manager/media/browser/mcpuk/upload.php

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Upload calling script
-  *   @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 Upload calling script
+ *   @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
+ */
 
 require "core/autoload.php";
 $uploader = new uploader($modx);

manager/media/style/default/welcome.php

Spacing +5 added lines, -5 removed lines

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

 $modx->config['enable_filter'] = 1;

 

-$modx->addSnippet('hasPermission','return $modx->hasPermission($key);');

+$modx->addSnippet('hasPermission', 'return $modx->hasPermission($key);');

 

-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags'))

+if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags'))

     $hasAnyPermission = 1;

 else $hasAnyPermission = 0;

-$modx->addSnippet('hasAnyPermission','global $hasAnyPermission; return $hasAnyPermission;');

-$modx->addSnippet('getLoginUserName','return $modx->getLoginUserName();');

+$modx->addSnippet('hasAnyPermission', 'global $hasAnyPermission; return $hasAnyPermission;');

+$modx->addSnippet('getLoginUserName', 'return $modx->getLoginUserName();');

 $code = 'global $_lang;return $_SESSION["nrtotalmessages"] ? sprintf($_lang["welcome_messages"], $_SESSION["nrtotalmessages"], \'<span style="color:red;">\' . $_SESSION["nrnewmessages"] . "</span>") : $_lang["messages_no_messages"];';

-$modx->addSnippet('getMessageCount',$code);

+$modx->addSnippet('getMessageCount', $code);

 

 // Large Icons

 $_style['icons_backup_large']       = 'fa fa-database fa-fw fa-2x';

Braces +5 added lines, -3 removed lines

@@ -3,9 +3,11 @@
 

 $modx->addSnippet('hasPermission','return $modx->hasPermission($key);');

 

-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags'))

-    $hasAnyPermission = 1;

-else $hasAnyPermission = 0;

+if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
+    $hasAnyPermission = 1;
+} else {
+    $hasAnyPermission = 0;
+}
 $modx->addSnippet('hasAnyPermission','global $hasAnyPermission; return $hasAnyPermission;');

 $modx->addSnippet('getLoginUserName','return $modx->getLoginUserName();');

 $code = 'global $_lang;return $_SESSION["nrtotalmessages"] ? sprintf($_lang["welcome_messages"], $_SESSION["nrtotalmessages"], \'<span style="color:red;">\' . $_SESSION["nrnewmessages"] . "</span>") : $_lang["messages_no_messages"];';

manager/media/style/default/ajax.php

Spacing +98 added lines, -98 removed lines

@@ -19,11 +19,11 @@ 
 $modx->loadExtension("ManagerAPI");

 

 $_lang = array();

-include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php';

+include_once MODX_MANAGER_PATH.'/includes/lang/english.inc.php';

 if ($modx->config['manager_language'] != 'english') {

-    include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php';

+    include_once MODX_MANAGER_PATH.'/includes/lang/'.$modx->config['manager_language'].'.inc.php';

 }

-include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php';

+include_once MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/style.php';

 

 $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : '';

 $frame = isset($_REQUEST['f']) ? $_REQUEST['f'] : '';

@@ -40,7 +40,7 @@ 
 

             switch ($frame) {

                 case 'nodes':

-                    include_once MODX_MANAGER_PATH . '/frames/nodes.php';

+                    include_once MODX_MANAGER_PATH.'/frames/nodes.php';

 

                     break;

             }

@@ -58,21 +58,21 @@ 
                 $sql = '';

                 $a = '';

                 $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '%*_') : '';

-                $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->db->escape($filter) . '%"' : '';

-                $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

+                $sqlLike = $filter ? 'WHERE t1.name LIKE "'.$modx->db->escape($filter).'%"' : '';

+                $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;

 

                 switch ($elements) {

                     case 'element_templates':

                         $a = 16;

-                        $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->db->escape($filter) . '%"' : '';

+                        $sqlLike = $filter ? 'WHERE t1.templatename LIKE "'.$modx->db->escape($filter).'%"' : '';

                         $sql = $modx->db->query('SELECT t1.*, t1.templatename AS name

-                        FROM ' . $modx->getFullTableName('site_templates') . ' AS t1

-                        ' . $sqlLike . '

+                        FROM ' . $modx->getFullTableName('site_templates').' AS t1

+                        ' . $sqlLike.'

                         ORDER BY t1.templatename ASC

                         ' . $sqlLimit);

 

                         if ($modx->hasPermission('new_template')) {

-                            $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';

+                            $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>'.$_lang['new_template'].'</a></li>';

                         }

 

                         break;

@@ -80,15 +80,15 @@ 
                     case 'element_tplvars':

                         $a = 301;

                         $sql = $modx->db->query('SELECT t1.*, IF(t2.templateid,0,1) AS disabled

-                        FROM ' . $modx->getFullTableName('site_tmplvars') . ' AS t1

-                        LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates') . ' AS t2 ON t1.id=t2.tmplvarid

-                        ' . $sqlLike . '

+                        FROM ' . $modx->getFullTableName('site_tmplvars').' AS t1

+                        LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates').' AS t2 ON t1.id=t2.tmplvarid

+                        ' . $sqlLike.'

                         GROUP BY t1.id

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

                         if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

-                            $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';

+                            $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>'.$_lang['new_tmplvars'].'</a></li>';

                         }

 

                         break;

@@ -96,13 +96,13 @@ 
                     case 'element_htmlsnippets':

                         $a = 78;

                         $sql = $modx->db->query('SELECT t1.*

-                        FROM ' . $modx->getFullTableName('site_htmlsnippets') . ' AS t1

-                        ' . $sqlLike . '

+                        FROM ' . $modx->getFullTableName('site_htmlsnippets').' AS t1

+                        ' . $sqlLike.'

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

                         if ($modx->hasPermission('new_chunk')) {

-                            $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';

+                            $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>'.$_lang['new_htmlsnippet'].'</a></li>';

                         }

 

                         break;

@@ -110,13 +110,13 @@ 
                     case 'element_snippets':

                         $a = 22;

                         $sql = $modx->db->query('SELECT t1.*

-                        FROM ' . $modx->getFullTableName('site_snippets') . ' AS t1

-                        ' . $sqlLike . '

+                        FROM ' . $modx->getFullTableName('site_snippets').' AS t1

+                        ' . $sqlLike.'

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

                         if ($modx->hasPermission('new_snippet')) {

-                            $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';

+                            $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>'.$_lang['new_snippet'].'</a></li>';

                         }

 

                         break;

@@ -124,13 +124,13 @@ 
                     case 'element_plugins':

                         $a = 102;

                         $sql = $modx->db->query('SELECT t1.*

-                        FROM ' . $modx->getFullTableName('site_plugins') . ' AS t1

-                        ' . $sqlLike . '

+                        FROM ' . $modx->getFullTableName('site_plugins').' AS t1

+                        ' . $sqlLike.'

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

                         if ($modx->hasPermission('new_plugin')) {

-                            $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';

+                            $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>'.$_lang['new_plugin'].'</a></li>';

                         }

 

                         break;

@@ -145,7 +145,7 @@ 
                             continue;

                         }

 

-                        $items .= '<li class="item ' . ($row['disabled'] ? 'disabled' : '') . ($row['locked'] ? ' locked' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main" data-parent-id="a_76__elements_' . $elements . '">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>' . "\n";

+                        $items .= '<li class="item '.($row['disabled'] ? 'disabled' : '').($row['locked'] ? ' locked' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main" data-parent-id="a_76__elements_'.$elements.'">'.$row['name'].' <small>('.$row['id'].')</small></a></li>'."\n";

                     }

                 }

 

@@ -166,18 +166,18 @@ 
             $output = '';

             $items = '';

             $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : '';

-            $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->db->escape($filter) . '%"' : '';

-            $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

+            $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->db->escape($filter).'%"' : '';

+            $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;

 

             $sql = $modx->db->query('SELECT t1.*, t1.username AS name, t2.blocked

-				FROM ' . $modx->getFullTableName('manager_users') . ' AS t1

-				LEFT JOIN ' . $modx->getFullTableName('user_attributes') . ' AS t2 ON t1.id=t2.internalKey

-				' . $sqlLike . '

+				FROM ' . $modx->getFullTableName('manager_users').' AS t1

+				LEFT JOIN ' . $modx->getFullTableName('user_attributes').' AS t2 ON t1.id=t2.internalKey

+				' . $sqlLike.'

 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

             if ($modx->hasPermission('new_user')) {

-                $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';

+                $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>'.$_lang['new_user'].'</a></li>';

             }

 

             if ($count = $modx->db->getRecordCount($sql)) {

@@ -185,7 +185,7 @@ 
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

                 while ($row = $modx->db->getRow($sql)) {

-                    $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';

+                    $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>';

                 }

             }

 

@@ -205,18 +205,18 @@ 
             $output = '';

             $items = '';

             $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : '';

-            $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->db->escape($filter) . '%"' : '';

-            $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

+            $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->db->escape($filter).'%"' : '';

+            $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;

 

             $sql = $modx->db->query('SELECT t1.*, t1.username AS name, t2.blocked

-				FROM ' . $modx->getFullTableName('web_users') . ' AS t1

-				LEFT JOIN ' . $modx->getFullTableName('web_user_attributes') . ' AS t2 ON t1.id=t2.internalKey

-				' . $sqlLike . '

+				FROM ' . $modx->getFullTableName('web_users').' AS t1

+				LEFT JOIN ' . $modx->getFullTableName('web_user_attributes').' AS t2 ON t1.id=t2.internalKey

+				' . $sqlLike.'

 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

             if ($modx->hasPermission('new_web_user')) {

-                $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';

+                $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>'.$_lang['new_web_user'].'</a></li>';

             }

 

             if ($count = $modx->db->getRecordCount($sql)) {

@@ -224,7 +224,7 @@ 
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

                 while ($row = $modx->db->getRow($sql)) {

-                    $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';

+                    $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>';

                 }

             }

 

@@ -250,35 +250,35 @@ 
                     case 'SnippetNoCache': {

 

                         $sql = $modx->db->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_snippets') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_snippets').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

                         if ($modx->db->getRecordCount($sql)) {

                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name']

+                                    'innerHTML' => '<i class="fa fa-code"></i> '.$row['name']

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=22&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=22&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']

                                 );

                             }

                         } else {

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-code"></i> ' . $name

+                                    'innerHTML' => '<i class="fa fa-code"></i> '.$name

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'],

-                                    'url' => "index.php?a=23&itemname=" . $name

+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'],

+                                    'url' => "index.php?a=23&itemname=".$name

                                 )

                             );

                         }

@@ -288,35 +288,35 @@ 
                     case 'Chunk' : {

 

                         $sql = $modx->db->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_htmlsnippets') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_htmlsnippets').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

                         if ($modx->db->getRecordCount($sql)) {

                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-th-large"></i> ' . $row['name']

+                                    'innerHTML' => '<i class="fa fa-th-large"></i> '.$row['name']

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=78&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=78&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']

                                 );

                             }

                         } else {

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name

+                                    'innerHTML' => '<i class="fa fa-th-large"></i> '.$name

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'],

-                                    'url' => "index.php?a=77&itemname=" . $name

+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'],

+                                    'url' => "index.php?a=77&itemname=".$name

                                 )

                             );

                         }

@@ -325,8 +325,8 @@ 
                     }

                     case 'AttributeValue': {

                         $sql = $modx->db->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_htmlsnippets') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_htmlsnippets').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

                         if ($modx->db->getRecordCount($sql)) {

@@ -336,52 +336,52 @@ 
                                     'innerText' => $row['name']

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=78&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=78&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']

                                 );

                             }

                         } else {

 

                             $sql = $modx->db->query('SELECT *

-							FROM ' . $modx->getFullTableName('site_snippets') . '

-							WHERE name="' . $name . '"

+							FROM ' . $modx->getFullTableName('site_snippets').'

+							WHERE name="' . $name.'"

 							LIMIT 1');

 

                             if ($modx->db->getRecordCount($sql)) {

                                 $row = $modx->db->getRow($sql);

                                 $contextmenu = array(

                                     'header' => array(

-                                        'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name']

+                                        'innerHTML' => '<i class="fa fa-code"></i> '.$row['name']

                                     ),

                                     'item' => array(

-                                        'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                        'url' => "index.php?a=22&id=" . $row['id']

+                                        'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                        'url' => "index.php?a=22&id=".$row['id']

                                     )

                                 );

                                 if (!empty($row['description'])) {

                                     $contextmenu['seperator'] = '';

                                     $contextmenu['description'] = array(

-                                        'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

+                                        'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']

                                     );

                                 }

                             } else {

                                 $contextmenu = array(

                                     'header' => array(

-                                        'innerHTML' => '<i class="fa fa-code"></i> ' . $name

+                                        'innerHTML' => '<i class="fa fa-code"></i> '.$name

                                     ),

                                     'item' => array(

-                                        'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'],

-                                        'url' => "index.php?a=77&itemname=" . $name

+                                        'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'],

+                                        'url' => "index.php?a=77&itemname=".$name

                                     ),

                                     'item2' => array(

-                                        'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'],

-                                        'url' => "index.php?a=23&itemname=" . $name

+                                        'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'],

+                                        'url' => "index.php?a=23&itemname=".$name

                                     )

                                 );

                             }

@@ -437,35 +437,35 @@ 
                         }

 

                         $sql = $modx->db->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_tmplvars') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_tmplvars').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

                         if ($modx->db->getRecordCount($sql)) {

                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $row['name']

+                                    'innerHTML' => '<i class="fa fa-list-alt"></i> '.$row['name']

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=301&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=301&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']

                                 );

                             }

                         } else {

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name

+                                    'innerHTML' => '<i class="fa fa-list-alt"></i> '.$name

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_tmplvars'],

-                                    'url' => "index.php?a=300&itemname=" . $name

+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_tmplvars'],

+                                    'url' => "index.php?a=300&itemname=".$name

                                 )

                             );

                         }

@@ -484,15 +484,15 @@ 
             $json = array();

 

             if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {

-                $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';

-                $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;

+                $id = !empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';

+                $parent = isset($_REQUEST['parent']) ? (int) $_REQUEST['parent'] : 0;

                 $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;

 

                 // set parent

                 if ($id && $parent >= 0) {

 

                     // find older parent

-                    $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));

+                    $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id='.$id));

 

                     $eventOut = $modx->invokeEvent('onBeforeMoveDocument', [

                         'id_document' => $id,

@@ -513,7 +513,7 @@ 
                     if (empty($json['errors'])) {

                         // check privileges user for move docs

                         if (!empty($modx->config['tree_show_protected']) && $role != 1) {

-                            $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');

+                            $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN('.$id.','.$parent.','.$parentOld.')');

                             if ($modx->db->getRecordCount($sql)) {

                                 $document_groups = array();

                                 while ($row = $modx->db->getRow($sql)) {

@@ -538,22 +538,22 @@ 
                             // set new parent

                             $modx->db->update(array(

                                 'parent' => $parent

-                            ), $modx->getFullTableName('site_content'), 'id=' . $id);

+                            ), $modx->getFullTableName('site_content'), 'id='.$id);

                             // set parent isfolder = 1

                             $modx->db->update(array(

                                 'isfolder' => 1

-                            ), $modx->getFullTableName('site_content'), 'id=' . $parent);

+                            ), $modx->getFullTableName('site_content'), 'id='.$parent);

 

                             if ($parent != $parentOld) {

                                 // check children docs and set parent isfolder

-                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {

+                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent='.$parentOld))) {

                                     $modx->db->update(array(

                                         'isfolder' => 1

-                                    ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

+                                    ), $modx->getFullTableName('site_content'), 'id='.$parentOld);

                                 } else {

                                     $modx->db->update(array(

                                         'isfolder' => 0

-                                    ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

+                                    ), $modx->getFullTableName('site_content'), 'id='.$parentOld);

                                 }

                             }

 

@@ -561,7 +561,7 @@ 
                             if (!empty($menuindex)) {

                                 $menuindex = explode(',', $menuindex);

                                 foreach ($menuindex as $key => $value) {

-                                    $modx->db->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);

+                                    $modx->db->query('UPDATE '.$modx->getFullTableName('site_content').' SET menuindex='.$key.' WHERE id='.$value);

                                 }

                             } else {

                                 // TODO: max(*) menuindex

@@ -590,19 +590,19 @@ 
         }

 

         case 'getLockedElements': {

-            $type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : 0;

-            $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

+            $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : 0;

+            $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;

 

             $output = !!$modx->elementIsLocked($type, $id, true);

 

             if (!$output) {

                 $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';

-                $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';

+                $docgrp_cond = $docgrp ? ' OR dg.document_group IN ('.$docgrp.')' : '';

                 $sql = '

-                    SELECT MAX(IF(1=' . $role . ' OR sc.privatemgr=0' . $docgrp_cond . ', 0, 1)) AS locked

-                    FROM ' . $modx->getFullTableName('site_content') . ' AS sc 

-                    LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id

-                    WHERE sc.id=' . $id . ' GROUP BY sc.id';

+                    SELECT MAX(IF(1=' . $role.' OR sc.privatemgr=0'.$docgrp_cond.', 0, 1)) AS locked

+                    FROM ' . $modx->getFullTableName('site_content').' AS sc 

+                    LEFT JOIN ' . $modx->getFullTableName('document_groups').' dg ON dg.document=sc.id

+                    WHERE sc.id=' . $id.' GROUP BY sc.id';

                 $sql = $modx->db->query($sql);

                 if ($modx->db->getRecordCount($sql)) {

                     $row = $modx->db->getRow($sql);

Braces +73 added lines, -73 removed lines

@@ -7,11 +7,11 @@ 
 

 $modx->db->connect();

 

-if (empty ($modx->config)) {

+if (empty ($modx->config)) {
     $modx->getSettings();

 }

 

-if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {

+if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {
     $modx->sendErrorPage();

 }

 

@@ -20,7 +20,7 @@ 
 

 $_lang = array();

 include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php';

-if ($modx->config['manager_language'] != 'english') {

+if ($modx->config['manager_language'] != 'english') {
     include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php';

 }

 include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php';

@@ -33,12 +33,12 @@ 
 // set limit sql query

 $limit = !empty($modx->config['number_of_results']) ? (int) $modx->config['number_of_results'] : 100;

 

-if (isset($action)) {

-    switch ($action) {

+if (isset($action)) {
+    switch ($action) {
 

         case '1': {

 

-            switch ($frame) {

+            switch ($frame) {
                 case 'nodes':

                     include_once MODX_MANAGER_PATH . '/frames/nodes.php';

 

@@ -52,7 +52,7 @@ 
 

             $elements = isset($_REQUEST['elements']) && is_scalar($_REQUEST['elements']) ? htmlentities($_REQUEST['elements']) : '';

 

-            if ($elements) {

+            if ($elements) {
                 $output = '';

                 $items = '';

                 $sql = '';

@@ -61,7 +61,7 @@ 
                 $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->db->escape($filter) . '%"' : '';

                 $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

 

-                switch ($elements) {

+                switch ($elements) {
                     case 'element_templates':

                         $a = 16;

                         $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->db->escape($filter) . '%"' : '';

@@ -71,7 +71,7 @@ 
                         ORDER BY t1.templatename ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('new_template')) {

+                        if ($modx->hasPermission('new_template')) {
                             $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';

                         }

 

@@ -87,7 +87,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

+                        if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
                             $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';

                         }

 

@@ -101,7 +101,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('new_chunk')) {

+                        if ($modx->hasPermission('new_chunk')) {
                             $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';

                         }

 

@@ -115,7 +115,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('new_snippet')) {

+                        if ($modx->hasPermission('new_snippet')) {
                             $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';

                         }

 

@@ -129,19 +129,19 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('new_plugin')) {

+                        if ($modx->hasPermission('new_plugin')) {
                             $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';

                         }

 

                         break;

                 }

 

-                if ($count = $modx->db->getRecordCount($sql)) {

-                    if ($count == $limit) {

+                if ($count = $modx->db->getRecordCount($sql)) {
+                    if ($count == $limit) {
                         $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                     }

-                    while ($row = $modx->db->getRow($sql)) {

-                        if (($row['disabled'] || $row['locked']) && $role != 1) {

+                    while ($row = $modx->db->getRow($sql)) {
+                        if (($row['disabled'] || $row['locked']) && $role != 1) {
                             continue;

                         }

 

@@ -149,9 +149,9 @@ 
                     }

                 }

 

-                if (isset($_REQUEST['filter'])) {

+                if (isset($_REQUEST['filter'])) {
                     $output = $items;

-                } else {

+                } else {
                     $output .= $items;

                 }

 

@@ -176,22 +176,22 @@ 
 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

-            if ($modx->hasPermission('new_user')) {

+            if ($modx->hasPermission('new_user')) {
                 $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';

             }

 

-            if ($count = $modx->db->getRecordCount($sql)) {

-                if ($count == $limit) {

+            if ($count = $modx->db->getRecordCount($sql)) {
+                if ($count == $limit) {
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

-                while ($row = $modx->db->getRow($sql)) {

+                while ($row = $modx->db->getRow($sql)) {
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';

                 }

             }

 

-            if (isset($_REQUEST['filter'])) {

+            if (isset($_REQUEST['filter'])) {
                 $output = $items;

-            } else {

+            } else {
                 $output .= $items;

             }

 

@@ -215,22 +215,22 @@ 
 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

-            if ($modx->hasPermission('new_web_user')) {

+            if ($modx->hasPermission('new_web_user')) {
                 $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';

             }

 

-            if ($count = $modx->db->getRecordCount($sql)) {

-                if ($count == $limit) {

+            if ($count = $modx->db->getRecordCount($sql)) {
+                if ($count == $limit) {
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

-                while ($row = $modx->db->getRow($sql)) {

+                while ($row = $modx->db->getRow($sql)) {
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';

                 }

             }

 

-            if (isset($_REQUEST['filter'])) {

+            if (isset($_REQUEST['filter'])) {
                 $output = $items;

-            } else {

+            } else {
                 $output .= $items;

             }

 

@@ -244,8 +244,8 @@ 
             $type = isset($_REQUEST['type']) && is_scalar($_REQUEST['type']) ? $modx->db->escape($_REQUEST['type']) : false;

             $contextmenu = '';

 

-            if ($role && $name && $type) {

-                switch ($type) {

+            if ($role && $name && $type) {
+                switch ($type) {
                     case 'Snippet':

                     case 'SnippetNoCache': {

 

@@ -254,7 +254,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

-                        if ($modx->db->getRecordCount($sql)) {

+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -265,13 +265,13 @@ 
                                     'url' => "index.php?a=22&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-code"></i> ' . $name

@@ -292,7 +292,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

-                        if ($modx->db->getRecordCount($sql)) {

+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -303,13 +303,13 @@ 
                                     'url' => "index.php?a=78&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name

@@ -329,7 +329,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

-                        if ($modx->db->getRecordCount($sql)) {

+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -340,20 +340,20 @@ 
                                     'url' => "index.php?a=78&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

                                 );

                             }

-                        } else {

+                        } else {
 

                             $sql = $modx->db->query('SELECT *

 							FROM ' . $modx->getFullTableName('site_snippets') . '

 							WHERE name="' . $name . '"

 							LIMIT 1');

 

-                            if ($modx->db->getRecordCount($sql)) {

+                            if ($modx->db->getRecordCount($sql)) {
                                 $row = $modx->db->getRow($sql);

                                 $contextmenu = array(

                                     'header' => array(

@@ -364,13 +364,13 @@ 
                                         'url' => "index.php?a=22&id=" . $row['id']

                                     )

                                 );

-                                if (!empty($row['description'])) {

+                                if (!empty($row['description'])) {
                                     $contextmenu['seperator'] = '';

                                     $contextmenu['description'] = array(

                                         'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

                                     );

                                 }

-                            } else {

+                            } else {
                                 $contextmenu = array(

                                     'header' => array(

                                         'innerHTML' => '<i class="fa fa-code"></i> ' . $name

@@ -432,7 +432,7 @@ 
                             'alias_visible'

                         );

 

-                        if (in_array($name, $default_field)) {

+                        if (in_array($name, $default_field)) {
                             return;

                         }

 

@@ -441,7 +441,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

-                        if ($modx->db->getRecordCount($sql)) {

+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -452,13 +452,13 @@ 
                                     'url' => "index.php?a=301&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name

@@ -483,13 +483,13 @@ 
         case 'movedocument' : {

             $json = array();

 

-            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {

+            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
                 $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';

                 $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;

                 $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;

 

                 // set parent

-                if ($id && $parent >= 0) {

+                if ($id && $parent >= 0) {
 

                     // find older parent

                     $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));

@@ -500,31 +500,31 @@ 
                         'new_parent'  => $parent,

                     ]);

 

-                    if (is_array($eventOut) && count($eventOut) > 0) {

+                    if (is_array($eventOut) && count($eventOut) > 0) {
                         $eventParent = array_pop($eventOut);

 

-                        if ($eventParent == $parentOld) {

+                        if ($eventParent == $parentOld) {
                             $json['errors'] = $_lang['error_movedocument2'];

-                        } else {

+                        } else {
                             $parent = $eventParent;

                         }

                     }

 

-                    if (empty($json['errors'])) {

+                    if (empty($json['errors'])) {
                         // check privileges user for move docs

-                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {

+                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {
                             $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');

-                            if ($modx->db->getRecordCount($sql)) {

+                            if ($modx->db->getRecordCount($sql)) {
                                 $document_groups = array();

-                                while ($row = $modx->db->getRow($sql)) {

+                                while ($row = $modx->db->getRow($sql)) {
                                     $document_groups[$row['document']]['groups'][] = $row['document_group'];

                                 }

-                                foreach ($document_groups as $key => $value) {

-                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {

+                                foreach ($document_groups as $key => $value) {
+                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {
                                         $json['errors'] = $_lang["error_no_privileges"];

                                     }

                                 }

-                                if ($json['errors']) {

+                                if ($json['errors']) {
                                     header('content-type: application/json');

                                     echo json_encode($json, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE);

                                     break;

@@ -532,9 +532,9 @@ 
                             }

                         }

 

-                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {

+                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
                             $json['errors'] = $_lang["error_no_privileges"];

-                        } else {

+                        } else {
                             // set new parent

                             $modx->db->update(array(

                                 'parent' => $parent

@@ -544,13 +544,13 @@ 
                                 'isfolder' => 1

                             ), $modx->getFullTableName('site_content'), 'id=' . $parent);

 

-                            if ($parent != $parentOld) {

+                            if ($parent != $parentOld) {
                                 // check children docs and set parent isfolder

-                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {

+                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
                                     $modx->db->update(array(

                                         'isfolder' => 1

                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

-                                } else {

+                                } else {
                                     $modx->db->update(array(

                                         'isfolder' => 0

                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

@@ -558,16 +558,16 @@ 
                             }

 

                             // set menuindex

-                            if (!empty($menuindex)) {

+                            if (!empty($menuindex)) {
                                 $menuindex = explode(',', $menuindex);

-                                foreach ($menuindex as $key => $value) {

+                                foreach ($menuindex as $key => $value) {
                                     $modx->db->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);

                                 }

-                            } else {

+                            } else {
                                 // TODO: max(*) menuindex

                             }

 

-                            if (!$json['errors']) {

+                            if (!$json['errors']) {
                                 $json['success'] = $_lang["actioncomplete"];

 

                                 $modx->invokeEvent('onAfterMoveDocument', [

@@ -579,7 +579,7 @@ 
                         }

                     }

                 }

-            } else {

+            } else {
                 $json['errors'] = $_lang["error_no_privileges"];

             }

 

@@ -595,7 +595,7 @@ 
 

             $output = !!$modx->elementIsLocked($type, $id, true);

 

-            if (!$output) {

+            if (!$output) {
                 $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';

                 $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';

                 $sql = '

@@ -604,7 +604,7 @@ 
                     LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id

                     WHERE sc.id=' . $id . ' GROUP BY sc.id';

                 $sql = $modx->db->query($sql);

-                if ($modx->db->getRecordCount($sql)) {

+                if ($modx->db->getRecordCount($sql)) {
                     $row = $modx->db->getRow($sql);

                     $output = !!$row['locked'];

                 }