evolution-cms / evolution

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

Doc Comments -1 removed lines

@@ -200,7 +200,6 @@
 
     /** Resize and crop the image to fit in given resolution. Returns TRUE on
       * success or FALSE on failure
-      * @param mixed $src
       * @param integer $offset
       * @return bool */
     abstract public function resizeCrop($width, $height, $offset=false);

Indentation +93 added lines, -93 removed lines

@@ -1,46 +1,46 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Abstract 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 Abstract 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
+ */
 
 abstract class image
 {
     const DEFAULT_JPEG_QUALITY = 75;
 
     /** Image resource or object
-      * @var mixed */
+     * @var mixed */
     protected $image;
 
     /** Image width in pixels
-      * @var integer */
+     * @var integer */
     protected $width;
 
     /** Image height in pixels
-      * @var integer */
+     * @var integer */
     protected $height;
 
     /** Init error
-      * @var bool */
+     * @var bool */
     protected $initError = false;
 
     /** Driver specific options
-      * @var array */
+     * @var array */
     protected $options = array();
 
 
     /** Magic method which allows read-only access to all protected or private
-      * class properties
-      * @param string $property
-      * @return mixed */
+     * class properties
+     * @param string $property
+     * @return mixed */
 
     final public function __get($property)
     {
@@ -49,15 +49,15 @@ 
 
 
     /** Constructor. Parameter $image should be:
-      *   1. An instance of image driver class (copy instance).
-      *   2. An image represented by the type of the $image property
-      *      (resource or object).
-      *   3. An array with two elements. First - width, second - height.
-      *      Creates a blank image.
-      *   4. A filename string. Get image form file.
-      * Second paramaeter is used by pass some specific image driver options
-      * @param mixed $image
-      * @param array $options */
+     *   1. An instance of image driver class (copy instance).
+     *   2. An image represented by the type of the $image property
+     *      (resource or object).
+     *   3. An array with two elements. First - width, second - height.
+     *      Creates a blank image.
+     *   4. A filename string. Get image form file.
+     * Second paramaeter is used by pass some specific image driver options
+     * @param mixed $image
+     * @param array $options */
 
     public function __construct($image, array $options=array())
     {
@@ -74,10 +74,10 @@ 
 
 
     /** Factory pattern to load selected driver. $image and $options are passed
-      * to the constructor of the image driver
-      * @param string $driver
-      * @param mixed $image
-      * @return object */
+     * to the constructor of the image driver
+     * @param string $driver
+     * @param mixed $image
+     * @return object */
 
     final public static function factory($driver, $image, array $options=array())
     {
@@ -87,9 +87,9 @@ 
 
 
     /** Checks if the drivers in the array parameter could be used. Returns first
-      * found one
-      * @param array $drivers
-      * @return string */
+     * found one
+     * @param array $drivers
+     * @return string */
 
     final public static function getDriver(array $drivers=array('gd'))
     {
@@ -110,9 +110,9 @@ 
 
 
     /** Returns an array. Element 0 - image resource. Element 1 - width. Element 2 - height.
-      * Returns FALSE on failure.
-      * @param mixed $image
-      * @return array */
+     * Returns FALSE on failure.
+     * @param mixed $image
+     * @return array */
 
     final protected function buildImage($image)
     {
@@ -137,8 +137,8 @@ 
 
 
     /** Returns calculated proportional width from the given height
-      * @param integer $resizedHeight
-      * @return integer */
+     * @param integer $resizedHeight
+     * @return integer */
 
     final public function getPropWidth($resizedHeight)
     {
@@ -151,8 +151,8 @@ 
 
 
     /** Returns calculated proportional height from the given width
-      * @param integer $resizedWidth
-      * @return integer */
+     * @param integer $resizedWidth
+     * @return integer */
 
     final public function getPropHeight($resizedWidth)
     {
@@ -165,51 +165,51 @@ 
 
 
     /** Checks if PHP needs some extra extensions to use the image driver. This
-      * static method should be implemented into driver classes like abstract
-      * methods
-      * @return bool */
+     * static method should be implemented into driver classes like abstract
+     * methods
+     * @return bool */
     public static function available()
     {
         return false;
     }
 
     /** Checks if file is an image. This static method should be implemented into
-      * driver classes like abstract methods
-      * @param string $file
-      * @return bool */
+     * driver classes like abstract methods
+     * @param string $file
+     * @return bool */
     public static function checkImage($file)
     {
         return false;
     }
 
     /** Resize image. Should return TRUE on success or FALSE on failure
-      * @param integer $width
-      * @param integer $height
-      * @return bool */
+     * @param integer $width
+     * @param integer $height
+     * @return bool */
     abstract public function resize($width, $height);
 
     /** Resize image to fit in given resolution. Should returns TRUE on success
-      * or FALSE on failure. If $background is set, the image size will be
-      * $width x $height and the empty spaces (if any) will be filled with defined
-      * color. Background color examples: "#5f5", "#ff67ca", array(255, 255, 255)
-      * @param integer $width
-      * @param integer $height
-      * @param mixed $background
-      * @return bool */
+     * or FALSE on failure. If $background is set, the image size will be
+     * $width x $height and the empty spaces (if any) will be filled with defined
+     * color. Background color examples: "#5f5", "#ff67ca", array(255, 255, 255)
+     * @param integer $width
+     * @param integer $height
+     * @param mixed $background
+     * @return bool */
     abstract public function resizeFit($width, $height, $background=false);
 
     /** Resize and crop the image to fit in given resolution. Returns TRUE on
-      * success or FALSE on failure
-      * @param mixed $src
-      * @param integer $offset
-      * @return bool */
+     * success or FALSE on failure
+     * @param mixed $src
+     * @param integer $offset
+     * @return bool */
     abstract public function resizeCrop($width, $height, $offset=false);
 
 
     /** Rotate image
-      * @param integer $angle
-      * @param string $background
-      * @return bool */
+     * @param integer $angle
+     * @param string $background
+     * @return bool */
     abstract public function rotate($angle, $background="#000000");
 
     abstract public function flipHorizontal();
@@ -217,43 +217,43 @@ 
     abstract public function flipVertical();
 
     /** Apply a PNG or GIF watermark to the image. $top and $left parameters sets
-      * the offset of the watermark in pixels. Boolean and NULL values are possible
-      * too. In default case (FALSE, FALSE) the watermark should be applyed to
-      * the bottom right corner. NULL values means center aligning. If the
-      * watermark is bigger than the image or it's partialy or fully outside the
-      * image, it shoudn't be applied
-      * @param string $file
-      * @param mixed $top
-      * @param mixed $left
-      * @return bool */
+     * the offset of the watermark in pixels. Boolean and NULL values are possible
+     * too. In default case (FALSE, FALSE) the watermark should be applyed to
+     * the bottom right corner. NULL values means center aligning. If the
+     * watermark is bigger than the image or it's partialy or fully outside the
+     * image, it shoudn't be applied
+     * @param string $file
+     * @param mixed $top
+     * @param mixed $left
+     * @return bool */
     abstract public function watermark($file, $left=false, $top=false);
 
     /** Should output the image. Second parameter is used to pass some options like
-      *   'file' - if is set, the output will be written to a file
-      *   'quality' - compression quality
-      * It's possible to use extra specific options required by image type ($type)
-      * @param string $type
-      * @param array $options
-      * @return bool */
+     *   'file' - if is set, the output will be written to a file
+     *   'quality' - compression quality
+     * It's possible to use extra specific options required by image type ($type)
+     * @param string $type
+     * @param array $options
+     * @return bool */
     abstract public function output($type='jpeg', array $options=array());
 
     /** This method should create a blank image with selected size. Should returns
-      * resource or object related to the created image, which will be passed to
-      * $image property
-      * @param integer $width
-      * @param integer $height
-      * @return mixed */
+     * resource or object related to the created image, which will be passed to
+     * $image property
+     * @param integer $width
+     * @param integer $height
+     * @return mixed */
     abstract protected function getBlankImage($width, $height);
 
     /** This method should create an image from source image. Only first parameter
-      * ($image) is input. Its type should be filename string or a type of the
-      * $image property. See the constructor reference for details. The
-      * parametters $width and $height are output only. Should returns resource or
-      * object related to the created image, which will be passed to $image
-      * property
-      * @param mixed $image
-      * @param integer $width
-      * @param integer $height
-      * @return mixed */
+     * ($image) is input. Its type should be filename string or a type of the
+     * $image property. See the constructor reference for details. The
+     * parametters $width and $height are output only. Should returns resource or
+     * object related to the created image, which will be passed to $image
+     * property
+     * @param mixed $image
+     * @param integer $width
+     * @param integer $height
+     * @return mixed */
     abstract protected function getImage($image, &$width, &$height);
 }

Spacing +8 added lines, -8 removed lines

@@ -59,7 +59,7 @@ 
       * @param mixed $image
       * @param array $options */
 
-    public function __construct($image, array $options=array())
+    public function __construct($image, array $options = array())
     {
         $this->image = $this->width = $this->height = null;
         $imageDetails = $this->buildImage($image);
@@ -79,7 +79,7 @@ 
       * @param mixed $image
       * @return object */
 
-    final public static function factory($driver, $image, array $options=array())
+    final public static function factory($driver, $image, array $options = array())
     {
         $class = "image_$driver";
         return new $class($image, $options);
@@ -91,7 +91,7 @@ 
       * @param array $drivers
       * @return string */
 
-    final public static function getDriver(array $drivers=array('gd'))
+    final public static function getDriver(array $drivers = array('gd'))
     {
         foreach ($drivers as $driver) {
             if (!preg_match('/^[a-z0-9\_]+$/i', $driver)) {
@@ -196,21 +196,21 @@ 
       * @param integer $height
       * @param mixed $background
       * @return bool */
-    abstract public function resizeFit($width, $height, $background=false);
+    abstract public function resizeFit($width, $height, $background = false);
 
     /** Resize and crop the image to fit in given resolution. Returns TRUE on
       * success or FALSE on failure
       * @param mixed $src
       * @param integer $offset
       * @return bool */
-    abstract public function resizeCrop($width, $height, $offset=false);
+    abstract public function resizeCrop($width, $height, $offset = false);
 
 
     /** Rotate image
       * @param integer $angle
       * @param string $background
       * @return bool */
-    abstract public function rotate($angle, $background="#000000");
+    abstract public function rotate($angle, $background = "#000000");
 
     abstract public function flipHorizontal();
 
@@ -226,7 +226,7 @@ 
       * @param mixed $top
       * @param mixed $left
       * @return bool */
-    abstract public function watermark($file, $left=false, $top=false);
+    abstract public function watermark($file, $left = false, $top = false);
 
     /** Should output the image. Second parameter is used to pass some options like
       *   'file' - if is set, the output will be written to a file
@@ -235,7 +235,7 @@ 
       * @param string $type
       * @param array $options
       * @return bool */
-    abstract public function output($type='jpeg', array $options=array());
+    abstract public function output($type = 'jpeg', array $options = array());
 
     /** This method should create a blank image with selected size. Should returns
       * resource or object related to the created image, which will be passed to

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

Doc Comments +5 added lines

@@ -368,6 +368,11 @@
         return imagecolorallocate($this->image, $r, $g, $b);
     }
 
+    /**
+     * @param integer $x1
+     * @param integer $y1
+     * @param boolean $color
+     */
     protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color)
     {
         $color = $this->gdColor($color);

Indentation +10 added lines, -10 removed lines

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

Spacing +16 added lines, -16 removed lines

@@ -35,7 +35,7 @@ 
         );
     }
 
-    public function resizeFit($width, $height, $background=false)
+    public function resizeFit($width, $height, $background = false)
     {
         if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height))) {
             return true;
@@ -79,7 +79,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false)
+    public function resizeCrop($width, $height, $offset = false)
     {
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
@@ -138,7 +138,7 @@ 
         return $return;
     }
 
-    public function rotate($angle, $background="#000000")
+    public function rotate($angle, $background = "#000000")
     {
         $angle = -$angle;
         $img = @imagerotate($this->image, $angle, $this->gdColor($background));
@@ -177,7 +177,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false)
+    public function watermark($file, $left = false, $top = false)
     {
         $info = getimagesize($file);
         list($w, $h, $t) = $info;
@@ -219,7 +219,7 @@ 
         return true;
     }
 
-    public function output($type='jpeg', array $options=array())
+    public function output($type = 'jpeg', array $options = array())
     {
         $method = "output_$type";
         if (!method_exists($this, $method)) {
@@ -252,11 +252,11 @@ 
             (false !== (list($width, $height, $t) = @getimagesize($image)))
         ) {
             $image =
-                ($t == IMAGETYPE_GIF)  ? @imagecreatefromgif($image)  : (
+                ($t == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : (
                 ($t == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : (
                 ($t == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : (
-                ($t == IMAGETYPE_PNG)  ? @imagecreatefrompng($image)  : (
-                ($t == IMAGETYPE_XBM)  ? @imagecreatefromxbm($image)  : false
+                ($t == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : (
+                ($t == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false
             ))));
 
             return $image;
@@ -282,11 +282,11 @@ 
         }
 
         $img =
-            ($t == IMAGETYPE_GIF)  ? @imagecreatefromgif($file)  : (
+            ($t == IMAGETYPE_GIF) ? @imagecreatefromgif($file) : (
             ($t == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($file) : (
             ($t == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($file) : (
-            ($t == IMAGETYPE_PNG)  ? @imagecreatefrompng($file)  : (
-            ($t == IMAGETYPE_XBM)  ? @imagecreatefromxbm($file)  : false
+            ($t == IMAGETYPE_PNG) ? @imagecreatefrompng($file) : (
+            ($t == IMAGETYPE_XBM) ? @imagecreatefromxbm($file) : false
         ))));
 
         return ($img !== false);
@@ -295,7 +295,7 @@ 
 
     // OWN METHODS
 
-    protected function output_png(array $options=array())
+    protected function output_png(array $options = array())
     {
         $file = isset($options['file']) ? $options['file'] : null;
         $quality = isset($options['quality']) ? $options['quality'] : null;
@@ -307,7 +307,7 @@ 
         return imagepng($this->image, $file, $quality, $filters);
     }
 
-    protected function output_jpeg(array $options=array())
+    protected function output_jpeg(array $options = array())
     {
         $file = isset($options['file']) ? $options['file'] : null;
         $quality = isset($options['quality'])
@@ -319,7 +319,7 @@ 
         return imagejpeg($this->image, $file, $quality);
     }
 
-    protected function output_gif(array $options=array())
+    protected function output_gif(array $options = array())
     {
         $file = isset($options['file']) ? $options['file'] : null;
         if (isset($options['file']) && !headers_sent()) {
@@ -378,8 +378,8 @@ 
     }
 
     protected function imageCopyResampled(
-        $src, $dstX=0, $dstY=0, $srcX=0, $srcY=0, $dstW=null, $dstH=null, $srcW=null, $srcH=null
-    ) {
+        $src, $dstX = 0, $dstY = 0, $srcX = 0, $srcY = 0, $dstW = null, $dstH = null, $srcW = null, $srcH = null
+    ){
         $imageDetails = $this->buildImage($src);
 
         if ($imageDetails === false) {

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

Doc Comments +6 added lines

@@ -19,6 +19,9 @@ 
     protected $root;
     protected $ignored;
 
+    /**
+     * @param string $folder
+     */
     public function __construct($file, $folder, $ignored=null)
     {
         $this->zip = new ZipArchive();
@@ -42,6 +45,9 @@ 
         $this->zip->close();
     }
 
+    /**
+     * @param string $folder
+     */
     public function zip($folder, $parent=null)
     {
         $full_path = "{$this->root}$parent$folder";

Indentation +11 added lines, -11 removed lines

@@ -1,17 +1,17 @@
 <?php
 
 /** This file is part of KCFinder project. The class are taken from
-  * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
-  *
-  *      @desc Directory to ZIP file archivator
-  *   @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
-  */
+ * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
+ *
+ *      @desc Directory to ZIP file archivator
+ *   @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 zipFolder
 {

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
     protected $root;
     protected $ignored;
 
-    public function __construct($file, $folder, $ignored=null)
+    public function __construct($file, $folder, $ignored = null)
     {
         $this->zip = new ZipArchive();
 
@@ -42,7 +42,7 @@ 
         $this->zip->close();
     }
 
-    public function zip($folder, $parent=null)
+    public function zip($folder, $parent = null)
     {
         $full_path = "{$this->root}$parent$folder";
         $zip_path = "$parent$folder";

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

Doc Comments -2 removed lines

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

Indentation +44 added lines, -44 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -120,7 +120,7 @@ 
       * @param bool $toLower
       * @return string */
 
-    public static function getExtension($filename, $toLower=true)
+    public static function getExtension($filename, $toLower = true)
     {
         return preg_match('/^.*\.([^\.]*)$/s', $filename, $patt)
             ? ($toLower ? strtolower($patt[1]) : $patt[1]) : "";
@@ -137,7 +137,7 @@ 
       * @param string $magic
       * @return string */
 
-    public static function getMimeType($filename, $magic=null)
+    public static function getMimeType($filename, $magic = null)
     {
         if (class_exists("finfo")) {
             $finfo = ($magic === null)
@@ -174,7 +174,7 @@ 
       * @param string $tpl
       * @return string */
 
-    public static function getInexistantFilename($filename, $dir=null, $tpl=null)
+    public static function getInexistantFilename($filename, $dir = null, $tpl = null)
     {
         if ($tpl === null) {
             $tpl = "{name}({sufix}){ext}";
@@ -196,13 +196,13 @@ 
         $i = 1;
         $file = "$dir/$filename";
         while (file_exists($file)) {
-            $file = "$dir/" . str_replace('{sufix}', $i++, $tpl);
+            $file = "$dir/".str_replace('{sufix}', $i++, $tpl);
         }
 
         return $fullPath
             ? $file
             : (strlen($fdir)
-                ? "$fdir/" . basename($file)
+                ? "$fdir/".basename($file)
                 : basename($file));
     }
 }

index.php

Spacing +11 added lines, -11 removed lines

@@ -45,7 +45,7 @@ 
  * -----------------------------
  */
 
-$autoloader = __DIR__ . '/vendor/autoload.php';
+$autoloader = __DIR__.'/vendor/autoload.php';
 if (file_exists($autoloader) && is_readable($autoloader)) {
     include_once($autoloader);
 }
@@ -54,15 +54,15 @@ 
     $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
 }
 
-$base_path = str_replace('\\', '/', dirname(__FILE__)) . '/';
-if (is_file($base_path . 'assets/cache/siteManager.php')) {
-    include_once($base_path . 'assets/cache/siteManager.php');
+$base_path = str_replace('\\', '/', dirname(__FILE__)).'/';
+if (is_file($base_path.'assets/cache/siteManager.php')) {
+    include_once($base_path.'assets/cache/siteManager.php');
 }
 if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
     define('MGR_DIR', 'manager');
 }
-if (is_file($base_path . 'assets/cache/siteHostnames.php')) {
-    include_once($base_path . 'assets/cache/siteHostnames.php');
+if (is_file($base_path.'assets/cache/siteHostnames.php')) {
+    include_once($base_path.'assets/cache/siteHostnames.php');
 }
 if (!defined('MODX_SITE_HOSTNAMES')) {
     define('MODX_SITE_HOSTNAMES', '');
@@ -72,7 +72,7 @@ 
 $mstart = memory_get_usage();
 
 // harden it
-require_once(dirname(__FILE__) . '/' . MGR_DIR . '/includes/protect.inc.php');
+require_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/protect.inc.php');
 
 // set some settings, and address some IE issues
 @ini_set('url_rewriter.tags', '');
@@ -89,7 +89,7 @@ 
  */
 
 define('IN_PARSER_MODE', true);
-if (! defined('IN_MANAGER_MODE')) {
+if (!defined('IN_MANAGER_MODE')) {
     define('IN_MANAGER_MODE', false);
 }
 if (!defined('MODX_API_MODE')) {
@@ -97,8 +97,8 @@ 
 }
 
 // get the required includes
-if (!isset($database_user) || $database_user=="") {
-    $rt = @include_once(dirname(__FILE__) . '/' . MGR_DIR . '/includes/config.inc.php');
+if (!isset($database_user) || $database_user == "") {
+    $rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
     // Be sure config.inc.php is there and that it contains some important values
     if (!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
         readfile('install/not_installed.tpl');
@@ -114,7 +114,7 @@ 
     $modx = new $coreClass;
 }
 if (!isset($modx) || !($modx instanceof \DocumentParser)) {
-    include_once(MODX_MANAGER_PATH . 'includes/document.parser.class.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
     $modx = DocumentParser::getInstance();
 }
 

manager/index.php

Spacing +37 added lines, -37 removed lines

@@ -48,7 +48,7 @@ 
  *          content
  */
 
-$autoloader = realpath(__DIR__ . '/../vendor/autoload.php');
+$autoloader = realpath(__DIR__.'/../vendor/autoload.php');
 if (file_exists($autoloader) && is_readable($autoloader)) {
     include_once($autoloader);
 }
@@ -58,17 +58,17 @@ 
 $mstart = memory_get_usage();
 $self      = str_replace('\\', '/', __FILE__);
 $self_dir  = str_replace('/index.php', '', $self);
-$mgr_dir   = substr($self_dir, strrpos($self_dir, '/')+1);
-$base_path = str_replace($mgr_dir . '/index.php', '', $self);
-$site_mgr_path = $base_path . 'assets/cache/siteManager.php';
+$mgr_dir   = substr($self_dir, strrpos($self_dir, '/') + 1);
+$base_path = str_replace($mgr_dir.'/index.php', '', $self);
+$site_mgr_path = $base_path.'assets/cache/siteManager.php';
 if (is_file($site_mgr_path)) {
     include_once($site_mgr_path);
 }
-$site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
+$site_hostnames_path = $base_path.'assets/cache/siteHostnames.php';
 if (is_file($site_hostnames_path)) {
     include_once($site_hostnames_path);
 }
-if (!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
+if (!defined('MGR_DIR') || MGR_DIR !== $mgr_dir) {
     $src = "<?php\n";
     $src .= "define('MGR_DIR', '{$mgr_dir}');\n";
     $rs = file_put_contents($site_mgr_path, $src);
@@ -77,13 +77,13 @@ 
         exit;
     }
     sleep(1);
-    header('Location:' . $_SERVER['REQUEST_URI']);
+    header('Location:'.$_SERVER['REQUEST_URI']);
     exit;
 }
 
 // we use this to make sure files are accessed through
 // the manager instead of seperately.
-if (! defined('IN_MANAGER_MODE')) {
+if (!defined('IN_MANAGER_MODE')) {
     define('IN_MANAGER_MODE', true);
 }
 
@@ -92,7 +92,7 @@ 
 
 // send anti caching headers
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 header("Cache-Control: no-store, no-cache, must-revalidate");
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");
@@ -104,7 +104,7 @@ 
 include_once "includes/lang/english.inc.php";
 
 // check PHP version. EVO is compatible with php 5 (5.0.0+)
-$php_ver_comp =  version_compare(phpversion(), "5.0.0");
+$php_ver_comp = version_compare(phpversion(), "5.0.0");
         // -1 if left is less, 0 if equal, +1 if left is higher
 if ($php_ver_comp < 0) {
     echo sprintf($_lang['php_version_check'], phpversion());
@@ -118,8 +118,8 @@ 
 }
 
 // set some runtime options
-$incPath = str_replace("\\", "/", dirname(__FILE__) . "/includes/"); // Mod by Raymond
-set_include_path(get_include_path() . PATH_SEPARATOR . $incPath);
+$incPath = str_replace("\\", "/", dirname(__FILE__)."/includes/"); // Mod by Raymond
+set_include_path(get_include_path().PATH_SEPARATOR.$incPath);
 
 if (!defined('ENT_COMPAT')) {
     define('ENT_COMPAT', 2);
@@ -133,7 +133,7 @@ 
 
 // set the document_root :|
 if (!isset($_SERVER['DOCUMENT_ROOT']) || empty($_SERVER['DOCUMENT_ROOT'])) {
-    $_SERVER['DOCUMENT_ROOT'] = str_replace($_SERVER['PATH_INFO'], "", preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED'])) . "/";
+    $_SERVER['DOCUMENT_ROOT'] = str_replace($_SERVER['PATH_INFO'], "", preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED']))."/";
 }
 
 // include_once config file
@@ -152,7 +152,7 @@ 
     $modx = new $coreClass;
 }
 if (!isset($modx) || !($modx instanceof DocumentParser)) {
-    include_once(MODX_MANAGER_PATH . 'includes/document.parser.class.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
     $modx = evolutionCMS();
 }
 
@@ -171,35 +171,35 @@ 
 // Now that session is given get user settings and merge into $modx->config
 $usersettings = $modx->getUserSettings();
 
-$settings =& $modx->config;
+$settings = & $modx->config;
 extract($modx->config, EXTR_OVERWRITE);
 
 // now include_once different language file as english
-if (!isset($manager_language) || !file_exists(MODX_MANAGER_PATH . "includes/lang/" . $manager_language . ".inc.php")) {
+if (!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
     $manager_language = "english"; // if not set, get the english language file.
 }
 
 // $length_eng_lang = count($_lang); // Not used for now, required for difference-check with other languages than english (i.e. inside installer)
 
-if ($manager_language!="english" && file_exists(MODX_MANAGER_PATH . "includes/lang/" . $manager_language . ".inc.php")) {
-    include_once "lang/" . $manager_language . ".inc.php";
+if ($manager_language != "english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
+    include_once "lang/".$manager_language.".inc.php";
 }
 
 // allow custom language overrides not altered by future EVO-updates
-if (file_exists(MODX_MANAGER_PATH . "includes/lang/override/" . $manager_language . ".inc.php")) {
-    include_once "lang/override/" . $manager_language . ".inc.php";
+if (file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
+    include_once "lang/override/".$manager_language.".inc.php";
 }
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
 foreach ($_lang as $k=>$v) {
-    if (strpos($v, '[+')!==false) {
+    if (strpos($v, '[+') !== false) {
         $_lang[$k] = str_replace($s, $r, $v);
     }
 }
 
 // send the charset header
-header('Content-Type: text/html; charset=' . $modx_manager_charset);
+header('Content-Type: text/html; charset='.$modx_manager_charset);
 
 /*
  * include_once "version.inc.php"; //include version info. Use $modx->getVersionData()
@@ -217,11 +217,11 @@ 
 // include_once the style variables file
 if (isset($manager_theme) && !isset($_style)) {
     $_style = array();
-    include_once "media/style/" . $manager_theme . "/style.php";
+    include_once "media/style/".$manager_theme."/style.php";
 }
 
 // check if user is allowed to access manager interface
-if (isset($allow_manager_access) && $allow_manager_access==0) {
+if (isset($allow_manager_access) && $allow_manager_access == 0) {
     include_once "manager.lockout.inc.php";
 }
 
@@ -234,8 +234,8 @@ 
 // first we check to see if this is a frameset request
 if (!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
     // this looks to be a top-level frameset request, so let's serve up a frameset
-    if (is_file(MODX_MANAGER_PATH . "media/style/" . $manager_theme . "/frames/1.php")) {
-        include_once "media/style/" . $manager_theme . "/frames/1.php";
+    if (is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
+        include_once "media/style/".$manager_theme."/frames/1.php";
     } else {
         include_once "frames/1.php";
     }
@@ -243,7 +243,7 @@ 
 }
 
 // OK, let's retrieve the action directive from the request
-$option = array('min_range'=>1,'max_range'=>2000);
+$option = array('min_range'=>1, 'max_range'=>2000);
 if (isset($_GET['a']) && isset($_POST['a'])) {
     $modx->webAlertAndQuit($_lang['error_double_action']);
 } elseif (isset($_GET['a'])) {
@@ -262,12 +262,12 @@ 
 $modx->manager->action = $action;
 
 // attempt to foil some simple types of CSRF attacks
-if (isset($modx->config['validate_referer']) && (int)$modx->config['validate_referer']) {
+if (isset($modx->config['validate_referer']) && (int) $modx->config['validate_referer']) {
     if (isset($_SERVER['HTTP_REFERER'])) {
         $referer = $_SERVER['HTTP_REFERER'];
 
         if (!empty($referer)) {
-            if (!preg_match('/^' . preg_quote(MODX_SITE_URL, '/') . '/i', $referer)) {
+            if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) {
                 $modx->webAlertAndQuit("A possible CSRF attempt was detected from referer: {$referer}.", "index.php");
             }
         } else {
@@ -285,8 +285,8 @@ 
 function includeFileProcessor($filepath, $manager_theme)
 {
     $element = "";
-    if (is_file(MODX_MANAGER_PATH . "media/style/" . $manager_theme . "/" . $filepath)) {
-        $element = MODX_MANAGER_PATH . "media/style/" . $manager_theme . "/" . $filepath;
+    if (is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
+        $element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
     } else {
         $element = $filepath;
     }
@@ -301,10 +301,10 @@ 
     case 1:
         // get the requested frame
         $frame = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['f']);
-        if ($frame>9) {
-            $enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
+        if ($frame > 9) {
+            $enable_debug = false; // this is to stop the debug thingy being attached to the framesets
         }
-        include_once(includeFileProcessor("frames/" . $frame . ".php", $manager_theme));
+        include_once(includeFileProcessor("frames/".$frame.".php", $manager_theme));
     break;
 /********************************************************************/
 /* show the homepage                                                */
@@ -992,9 +992,9 @@ 
         // say that what was requested doesn't do anything yet
         include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
         echo "
-			<div class='sectionHeader'>" . $_lang['functionnotimpl'] . "</div>
+			<div class='sectionHeader'>" . $_lang['functionnotimpl']."</div>
 			<div class='sectionBody'>
-				<p>" . $_lang['functionnotimpl_message'] . "</p>
+				<p>" . $_lang['functionnotimpl_message']."</p>
 			</div>
 		";
         include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
@@ -1002,7 +1002,7 @@ 
 
 /********************************************************************/
 // log action, unless it's a frame request
-if ($action!=1 && $action!=7 && $action!=2) {
+if ($action != 1 && $action != 7 && $action != 2) {
     include_once "log.class.inc.php";
     $log = new logHandler;
     $log->initAndWriteLog();

manager/frames/nodes.functions.inc.php

Spacing +31 added lines, -31 removed lines

@@ -39,13 +39,13 @@ 
         case 'publishedon':
         case 'pub_date':
         case 'unpub_date':
-            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'], 'sc.' . $_SESSION['tree_sortby']);
+            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'], 'sc.'.$_SESSION['tree_sortby']);
             break;
         default:
-            $sortby = 'sc.' . $_SESSION['tree_sortby'];
+            $sortby = 'sc.'.$_SESSION['tree_sortby'];
     };
 
-    $orderby = $modx->db->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+    $orderby = $modx->db->escape($sortby.' '.$_SESSION['tree_sortdir']);
 
     // Folder sorting gets special setup ;) Add menuindex and pagetitle
     if ($_SESSION['tree_sortby'] == 'isfolder') {
@@ -59,11 +59,11 @@ 
     $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
     $showProtected = false;
     if (isset($modx->config['tree_show_protected'])) {
-        $showProtected = (boolean)$modx->config['tree_show_protected'];
+        $showProtected = (boolean) $modx->config['tree_show_protected'];
     }
-    $mgrRole = (isset($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
+    $mgrRole = (isset($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
     if ($showProtected == false) {
-        $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+        $access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
     } else {
         $access = '';
     }
@@ -99,7 +99,7 @@ 
         }
 
         $weblinkDisplay = $row['type'] == 'reference' ? sprintf(' %s', $_style['tree_linkgo']) : '';
-        $pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
+        $pageIdDisplay = '<small>('.($modx_textdir ? '&rlm;' : '').$row['id'].')</small>';
 
         // Prepare displaying user-locks
         $lockedByUser = '';
@@ -110,7 +110,7 @@ 
                     'element_type' => $_lang["lock_element_type_7"],
                     'lasthit_df' => $rowLock['lasthit_df']
                 ));
-                $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
+                $lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>';
             } else {
                 $title = $modx->parseText($_lang["lock_element_locked_by"], array(
                     'element_type' => $_lang["lock_element_type_7"],
@@ -118,9 +118,9 @@ 
                     'lasthit_df' => $rowLock['lasthit_df']
                 ));
                 if ($modx->hasPermission('remove_locks')) {
-                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                 } else {
-                    $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                    $lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                 }
             }
         }
@@ -129,22 +129,22 @@ 
 
         $title = '';
         if (isDateNode($nodeNameSource)) {
-            $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+            $title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]';
         }
-        $title .= $_lang['id'] . ': ' . $row['id'];
-        $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
-        $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
-        $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
-        $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
-        $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
-        $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
-        $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
-        $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
-        $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
-        $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
-        $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= $_lang['id'].': '.$row['id'];
+        $title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle'];
+        $title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex'];
+        $title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-');
+        $title .= '[+lf+]'.$_lang['template'].': '.$row['templatename'];
+        $title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']);
+        $title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']);
+        $title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
         $title = $modx->htmlspecialchars($title);
-        $title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+        $title = str_replace('[+lf+]', ' &#13;', $title); // replace line-breaks with empty space as fall-back
 
         $data = array(
             'id' => $row['id'],
@@ -228,7 +228,7 @@ 
             }
 
             if ($ph['contextmenu']) {
-                $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
             }
 
             if ($_SESSION['tree_show_only_folders']) {
@@ -285,7 +285,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -323,7 +323,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -374,7 +374,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -416,7 +416,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -493,7 +493,7 @@ 
                     $nodetitle .= $modx->config['friendly_url_suffix'];
                 }
             }
-            $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
+            $nodetitle = $modx->config['friendly_url_prefix'].$nodetitle;
             break;
         case 'pagetitle':
             $nodetitle = $row['pagetitle'];
@@ -553,7 +553,7 @@ 
 {
     $modx = evolutionCMS();
 
-    return (int)$modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
+    return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM '.$modx->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' '));
 }
 
 /**

manager/frames/tree.php

Spacing +4 added lines, -4 removed lines

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

-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 

@@ -36,19 +36,19 @@ 
 

 		<?php if ($use_browser && $modx->hasPermission('assets_images')) {

         ?>

-			<a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['images_management']; ?></a>

+			<a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"]."\n".$_lang['em_button_shift'] ?>"><?php echo $_style['images_management']; ?></a>

 		<?php

     } ?>

 

 		<?php if ($use_browser && $modx->hasPermission('assets_files')) {

         ?>

-			<a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['files_management']; ?></a>

+			<a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"]."\n".$_lang['em_button_shift'] ?>"><?php echo $_style['files_management']; ?></a>

 		<?php

     } ?>

 

 		<?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) {

         ?>

-			<a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['element_management']; ?></a>

+			<a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"]."\n".$_lang['em_button_shift'] ?>"><?php echo $_style['element_management']; ?></a>

 		<?php

     } ?>

 

Braces +10 added lines, -10 removed lines

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

-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 

 // invoke OnManagerTreeInit event

 $evtOut = $modx->invokeEvent('OnManagerTreeInit', $_REQUEST);

-if (is_array($evtOut)) {

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

 }

 ?>

@@ -17,7 +17,7 @@ 
 

 		<a class="treeButton" id="treeMenu_collapsetree" onclick="modx.tree.collapseTree();" title="<?php echo $_lang['collapse_tree']; ?>"><?php echo $_style['collapse_tree']; ?></a>

 

-		<?php if ($modx->hasPermission('new_document')) {

+		<?php if ($modx->hasPermission('new_document')) {
     ?>

 			<a class="treeButton" id="treeMenu_addresource" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=4', title: '<?php echo $_lang['add_resource']; ?>'});" title="<?php echo $_lang['add_resource']; ?>"><?php echo $_style['add_doc_tree']; ?></a>

 			<a class="treeButton" id="treeMenu_addweblink" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=72', title: '<?php echo $_lang['add_weblink']; ?>'});" title="<?php echo $_lang['add_weblink']; ?>"><?php echo $_style['add_weblink_tree']; ?></a>

@@ -28,31 +28,31 @@ 
 

 		<a class="treeButton" id="treeMenu_sortingtree" onclick="modx.tree.showSorter(event);" title="<?php echo $_lang['sort_tree']; ?>"><?php echo $_style['sort_tree']; ?></a>

 

-		<?php if ($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {

+		<?php if ($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
         ?>

 			<a class="treeButton" id="treeMenu_sortingindex" onclick="modx.tabs({url: '<?= MODX_MANAGER_URL ?>?a=56&id=0', title: '<?php echo $_lang['sort_menuindex']; ?>'});" title="<?php echo $_lang['sort_menuindex']; ?>"><?php echo $_style['sort_menuindex']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($use_browser && $modx->hasPermission('assets_images')) {

+		<?php if ($use_browser && $modx->hasPermission('assets_images')) {
         ?>

 			<a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['images_management']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($use_browser && $modx->hasPermission('assets_files')) {

+		<?php if ($use_browser && $modx->hasPermission('assets_files')) {
         ?>

 			<a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['files_management']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) {

+		<?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) {
         ?>

 			<a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['element_management']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($modx->hasPermission('empty_trash')) {

+		<?php if ($modx->hasPermission('empty_trash')) {
         ?>

 			<a class="treeButton treeButtonDisabled" id="treeMenu_emptytrash" title="<?php echo $_lang['empty_recycle_bin_empty']; ?>"><?php echo $_style['empty_recycle_bin_empty']; ?></a>

 		<?php

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

         // invoke OnManagerTreePrerender event

         $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->db->escape($_REQUEST));

-        if (is_array($evtOut)) {

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

         }

         ?>

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

         // invoke OnManagerTreeRender event

         $evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->db->escape($_REQUEST));

-        if (is_array($evtOut)) {

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

         }

         ?>

manager/frames/mainmenu.php

Spacing +42 added lines, -42 removed lines

@@ -21,7 +21,7 @@ 
 $sitemenu['site'] = array(

     'site',

     'main',

-    '<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>',

+    '<i class="fa fa-tachometer"></i><span class="menu-item-text">'.$_lang['home'].'</span>',

     'index.php?a=2',

     $_lang['home'],

     '',

@@ -36,7 +36,7 @@ 
     $sitemenu['elements'] = array(

         'elements',

         'main',

-        '<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>',

+        '<i class="fa fa-th"></i><span class="menu-item-text">'.$_lang['elements'].'</span>',

         'javascript:;',

         $_lang['elements'],

         ' return false;',

@@ -52,7 +52,7 @@ 
     $sitemenu['modules'] = array(

         'modules',

         'main',

-        '<i class="' . $_style['icons_modules'] . '"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>',

+        '<i class="'.$_style['icons_modules'].'"></i><span class="menu-item-text">'.$_lang['modules'].'</span>',

         'javascript:;',

         $_lang['modules'],

         ' return false;',

@@ -68,7 +68,7 @@ 
     $sitemenu['users'] = array(

         'users',

         'main',

-        '<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>',

+        '<i class="fa fa-users"></i><span class="menu-item-text">'.$_lang['users'].'</span>',

         'javascript:;',

         $_lang['users'],

         ' return false;',

@@ -84,7 +84,7 @@ 
     $sitemenu['tools'] = array(

         'tools',

         'main',

-        '<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>',

+        '<i class="fa fa-wrench"></i><span class="menu-item-text">'.$_lang['tools'].'</span>',

         'javascript:;',

         $_lang['tools'],

         ' return false;',

@@ -101,8 +101,8 @@ 
     $sitemenu['element_templates'] = array(

         'element_templates',

         'elements',

-        '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',

-        'index.php?a=76&tab=' . $tab++,

+        '<i class="fa fa-newspaper-o"></i>'.$_lang['manage_templates'].'<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab='.$tab++,

         $_lang['manage_templates'],

         '',

         'new_template,edit_template',

@@ -116,8 +116,8 @@ 
     $sitemenu['element_tplvars'] = array(

         'element_tplvars',

         'elements',

-        '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',

-        'index.php?a=76&tab=' . $tab++,

+        '<i class="fa fa-list-alt"></i>'.$_lang['tmplvars'].'<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab='.$tab++,

         $_lang['tmplvars'],

         '',

         'new_template,edit_template',

@@ -131,8 +131,8 @@ 
     $sitemenu['element_htmlsnippets'] = array(

         'element_htmlsnippets',

         'elements',

-        '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',

-        'index.php?a=76&tab=' . $tab++,

+        '<i class="fa fa-th-large"></i>'.$_lang['manage_htmlsnippets'].'<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab='.$tab++,

         $_lang['manage_htmlsnippets'],

         '',

         'new_chunk,edit_chunk',

@@ -146,8 +146,8 @@ 
     $sitemenu['element_snippets'] = array(

         'element_snippets',

         'elements',

-        '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',

-        'index.php?a=76&tab=' . $tab++,

+        '<i class="fa fa-code"></i>'.$_lang['manage_snippets'].'<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab='.$tab++,

         $_lang['manage_snippets'],

         '',

         'new_snippet,edit_snippet',

@@ -161,8 +161,8 @@ 
     $sitemenu['element_plugins'] = array(

         'element_plugins',

         'elements',

-        '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',

-        'index.php?a=76&tab=' . $tab++,

+        '<i class="fa fa-plug"></i>'.$_lang['manage_plugins'].'<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab='.$tab++,

         $_lang['manage_plugins'],

         '',

         'new_plugin,edit_plugin',

@@ -178,7 +178,7 @@ 
     $sitemenu['manage_files'] = array(

         'manage_files',

         'elements',

-        '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],

+        '<i class="fa fa-folder-open-o"></i>'.$_lang['manage_files'],

         'index.php?a=31',

         $_lang['manage_files'],

         '',

@@ -193,7 +193,7 @@ 
     $sitemenu['manage_categories'] = array(

         'manage_categories',

         'elements',

-        '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],

+        '<i class="fa fa-object-group"></i>'.$_lang['manage_categories'],

         'index.php?a=120',

         $_lang['manage_categories'],

         '',

@@ -210,7 +210,7 @@ 
     $sitemenu['new_module'] = array(

         'new_module',

         'modules',

-        '<i class="' . $_style['icons_modules'] . '"></i>' . $_lang['module_management'],

+        '<i class="'.$_style['icons_modules'].'"></i>'.$_lang['module_management'],

         'index.php?a=106',

         $_lang['module_management'],

         '',

@@ -225,21 +225,21 @@ 
 if ($modx->hasPermission('exec_module')) {

     if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

         $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

-				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

-				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

-				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

-                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

+				FROM ' . $modx->getFullTableName('site_modules').' AS sm

+				LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id

+				LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group

+                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

     } else {

         $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

     }

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

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

-            $sitemenu['module' . $row['id']] = array(

-                'module' . $row['id'],

+            $sitemenu['module'.$row['id']] = array(

+                'module'.$row['id'],

                 'modules',

-                ($row['icon'] != '' ? '<i class="' . $row['icon'] . '"></i>' : '<i class="' . $_style['icons_module'] . '"></i>') . $row['name'],

-                'index.php?a=112&id=' . $row['id'],

+                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>').$row['name'],

+                'index.php?a=112&id='.$row['id'],

                 $row['name'],

                 '',

                 '',

@@ -258,7 +258,7 @@ 
     $sitemenu['user_management_title'] = array(

         'user_management_title',

         'users',

-        '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+        '<i class="fa fa fa-user"></i>'.$_lang['user_management_title'].'<i class="fa fa-angle-right toggle"></i>',

         'index.php?a=75',

         $_lang['user_management_title'],

         '',

@@ -274,7 +274,7 @@ 
     $sitemenu['web_user_management_title'] = array(

         'web_user_management_title',

         'users',

-        '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+        '<i class="fa fa-users"></i>'.$_lang['web_user_management_title'].'<i class="fa fa-angle-right toggle"></i>',

         'index.php?a=99',

         $_lang['web_user_management_title'],

         '',

@@ -290,7 +290,7 @@ 
     $sitemenu['role_management_title'] = array(

         'role_management_title',

         'users',

-        '<i class="fa fa-legal"></i>' . $_lang['role_management_title'],

+        '<i class="fa fa-legal"></i>'.$_lang['role_management_title'],

         'index.php?a=86',

         $_lang['role_management_title'],

         '',

@@ -306,7 +306,7 @@ 
     $sitemenu['manager_permissions'] = array(

         'manager_permissions',

         'users',

-        '<i class="fa fa-male"></i>' . $_lang['manager_permissions'],

+        '<i class="fa fa-male"></i>'.$_lang['manager_permissions'],

         'index.php?a=40',

         $_lang['manager_permissions'],

         '',

@@ -322,7 +322,7 @@ 
     $sitemenu['web_permissions'] = array(

         'web_permissions',

         'users',

-        '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],

+        '<i class="fa fa-universal-access"></i>'.$_lang['web_permissions'],

         'index.php?a=91',

         $_lang['web_permissions'],

         '',

@@ -339,7 +339,7 @@ 
 $sitemenu['refresh_site'] = array(

     'refresh_site',

     'tools',

-    '<i class="fa fa-recycle"></i>' . $_lang['refresh_site'],

+    '<i class="fa fa-recycle"></i>'.$_lang['refresh_site'],

     'index.php?a=26',

     $_lang['refresh_site'],

     '',

@@ -353,7 +353,7 @@ 
             'a', // tag

             'javascript:;', // href

             'btn btn-secondary', // class or btn-success

-            'modx.popup({url:\'index.php?a=26\', title:\'' . $_lang['refresh_site'] . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick

+            'modx.popup({url:\'index.php?a=26\', title:\''.$_lang['refresh_site'].'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick

             $_lang['refresh_site'], // title

             '<i class="fa fa-recycle"></i>' // innerHTML

         )

@@ -363,7 +363,7 @@ 
 $sitemenu['search'] = array(

     'search',

     'tools',

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

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

     'index.php?a=71',

     $_lang['search'],

     '',

@@ -378,7 +378,7 @@ 
     $sitemenu['bk_manager'] = array(

         'bk_manager',

         'tools',

-        '<i class="fa fa-database"></i>' . $_lang['bk_manager'],

+        '<i class="fa fa-database"></i>'.$_lang['bk_manager'],

         'index.php?a=93',

         $_lang['bk_manager'],

         '',

@@ -394,7 +394,7 @@ 
     $sitemenu['remove_locks'] = array(

         'remove_locks',

         'tools',

-        '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],

+        '<i class="fa fa-hourglass"></i>'.$_lang['remove_locks'],

         'javascript:modx.removeLocks();',

         $_lang['remove_locks'],

         '',

@@ -410,7 +410,7 @@ 
     $sitemenu['import_site'] = array(

         'import_site',

         'tools',

-        '<i class="fa fa-upload"></i>' . $_lang['import_site'],

+        '<i class="fa fa-upload"></i>'.$_lang['import_site'],

         'index.php?a=95',

         $_lang['import_site'],

         '',

@@ -426,7 +426,7 @@ 
     $sitemenu['export_site'] = array(

         'export_site',

         'tools',

-        '<i class="fa fa-download"></i>' . $_lang['export_site'],

+        '<i class="fa fa-download"></i>'.$_lang['export_site'],

         'index.php?a=83',

         $_lang['export_site'],

         '',

@@ -446,15 +446,15 @@ 
             $newmenu = array_merge($newmenu, unserialize($item));

         }

     }

-    if (count($newmenu)> 0) {

+    if (count($newmenu) > 0) {

         $sitemenu = $newmenu;

     }

 }

 

-if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

-    include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

+if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php')) {

+    include_once(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php');

 } else {

-    include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

+    include_once(MODX_MANAGER_PATH.'includes/menu.class.inc.php');

 }

 $menu = new EVOmenu();

 $menu->Build($sitemenu, array(

Braces +32 added lines, -32 removed lines

@@ -32,7 +32,7 @@ 
     'active'

 );

 

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

+if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
     $sitemenu['elements'] = array(

         'elements',

         'main',

@@ -48,7 +48,7 @@ 
     );

 }

 

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

+if ($modx->hasPermission('exec_module')) {
     $sitemenu['modules'] = array(

         'modules',

         'main',

@@ -64,7 +64,7 @@ 
     );

 }

 

-if ($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

+if ($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
     $sitemenu['users'] = array(

         'users',

         'main',

@@ -80,7 +80,7 @@ 
     );

 }

 

-if ($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

+if ($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
     $sitemenu['tools'] = array(

         'tools',

         'main',

@@ -97,7 +97,7 @@ 
 }

 

 $tab = 0;

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

+if ($modx->hasPermission('edit_template')) {
     $sitemenu['element_templates'] = array(

         'element_templates',

         'elements',

@@ -112,7 +112,7 @@ 
         'dropdown-toggle'

     );

 }

-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')) {
     $sitemenu['element_tplvars'] = array(

         'element_tplvars',

         'elements',

@@ -127,7 +127,7 @@ 
         'dropdown-toggle'

     );

 }

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

+if ($modx->hasPermission('edit_chunk')) {
     $sitemenu['element_htmlsnippets'] = array(

         'element_htmlsnippets',

         'elements',

@@ -142,7 +142,7 @@ 
         'dropdown-toggle'

     );

 }

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

+if ($modx->hasPermission('edit_snippet')) {
     $sitemenu['element_snippets'] = array(

         'element_snippets',

         'elements',

@@ -157,7 +157,7 @@ 
         'dropdown-toggle'

     );

 }

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

+if ($modx->hasPermission('edit_plugin')) {
     $sitemenu['element_plugins'] = array(

         'element_plugins',

         'elements',

@@ -174,7 +174,7 @@ 
 }

 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');

 

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

+if ($modx->hasPermission('file_manager')) {
     $sitemenu['manage_files'] = array(

         'manage_files',

         'elements',

@@ -189,7 +189,7 @@ 
         ''

     );

 }

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

+if ($modx->hasPermission('category_manager')) {
     $sitemenu['manage_categories'] = array(

         'manage_categories',

         'elements',

@@ -206,7 +206,7 @@ 
 }

 

 // Modules Menu Items

-if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {

+if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
     $sitemenu['new_module'] = array(

         'new_module',

         'modules',

@@ -222,19 +222,19 @@ 
     );

 }

 

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

-    if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+if ($modx->hasPermission('exec_module')) {
+    if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
         $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-    } else {

+    } else {
         $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

     }

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

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

+    if ($modx->db->getRecordCount($rs)) {
+        while ($row = $modx->db->getRow($rs)) {
             $sitemenu['module' . $row['id']] = array(

                 'module' . $row['id'],

                 'modules',

@@ -254,7 +254,7 @@ 
 

 // security menu items (users)

 

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

+if ($modx->hasPermission('edit_user')) {
     $sitemenu['user_management_title'] = array(

         'user_management_title',

         'users',

@@ -270,7 +270,7 @@ 
     );

 }

 

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

+if ($modx->hasPermission('edit_web_user')) {
     $sitemenu['web_user_management_title'] = array(

         'web_user_management_title',

         'users',

@@ -286,7 +286,7 @@ 
     );

 }

 

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

+if ($modx->hasPermission('edit_role')) {
     $sitemenu['role_management_title'] = array(

         'role_management_title',

         'users',

@@ -302,7 +302,7 @@ 
     );

 }

 

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

+if ($modx->hasPermission('access_permissions')) {
     $sitemenu['manager_permissions'] = array(

         'manager_permissions',

         'users',

@@ -318,7 +318,7 @@ 
     );

 }

 

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

+if ($modx->hasPermission('web_access_permissions')) {
     $sitemenu['web_permissions'] = array(

         'web_permissions',

         'users',

@@ -374,7 +374,7 @@ 
     ''

 );

 

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

+if ($modx->hasPermission('bk_manager')) {
     $sitemenu['bk_manager'] = array(

         'bk_manager',

         'tools',

@@ -390,7 +390,7 @@ 
     );

 }

 

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

+if ($modx->hasPermission('remove_locks')) {
     $sitemenu['remove_locks'] = array(

         'remove_locks',

         'tools',

@@ -406,7 +406,7 @@ 
     );

 }

 

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

+if ($modx->hasPermission('import_static')) {
     $sitemenu['import_site'] = array(

         'import_site',

         'tools',

@@ -422,7 +422,7 @@ 
     );

 }

 

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

+if ($modx->hasPermission('export_static')) {
     $sitemenu['export_site'] = array(

         'export_site',

         'tools',

@@ -439,21 +439,21 @@ 
 }

 

 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));

-if (is_array($menu)) {

+if (is_array($menu)) {
     $newmenu = array();

-    foreach ($menu as $item) {

-        if (is_array(unserialize($item))) {

+    foreach ($menu as $item) {
+        if (is_array(unserialize($item))) {
             $newmenu = array_merge($newmenu, unserialize($item));

         }

     }

-    if (count($newmenu)> 0) {

+    if (count($newmenu)> 0) {
         $sitemenu = $newmenu;

     }

 }

 

-if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

+if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
     include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

-} else {

+} else {
     include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

 }

 $menu = new EVOmenu();