evolution-cms / evolution

manager/media/browser/mcpuk/config.php

Spacing +1 added lines, -1 removed lines

@@ -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,

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

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

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
       * @param integer $expire
       * @param array $headers */
 
-    public static function file($file, $type=null, $expire=null, array $headers=null)
+    public static function file($file, $type = null, $expire = null, array $headers = null)
     {
         $mtime = @filemtime($file);
         if ($mtime !== false) {
@@ -53,7 +53,7 @@ 
       * @param array $headers
       * @param bool $checkMTime */
 
-    public static function content($content, $mtime, $type=null, $expire=null, array $headers=null, $checkMTime=true)
+    public static function content($content, $mtime, $type = null, $expire = null, array $headers = null, $checkMTime = true)
     {
         if ($checkMTime) {
             self::checkMTime($mtime);
@@ -65,7 +65,7 @@ 
             $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");
@@ -85,9 +85,9 @@ 
       * the PHP to be configured as Apache module.
       * @param integer $mtime */
 
-    public static function checkMTime($mtime, $sendHeaders=null)
+    public static function checkMTime($mtime, $sendHeaders = null)
     {
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s", $mtime) . " GMT");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s", $mtime)." GMT");
 
         $headers = function_exists("getallheaders")
             ? getallheaders()

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

Spacing +3 added lines, -3 removed lines

@@ -67,9 +67,9 @@ 
                     return $this->type = 'bmp';
                 case "GI":
                     return $this->type = 'gif';
-                case chr(0xFF) . chr(0xd8):
+                case chr(0xFF).chr(0xd8):
                     return $this->type = 'jpeg';
-                case chr(0x89) . 'P':
+                case chr(0x89).'P':
                     return $this->type = 'png';
                 default:
                     return false;
@@ -182,7 +182,7 @@ 
         $response = null;
 
         // do we need more data?
-        if ($this->strpos + $n -1 >= strlen($this->str)) {
+        if ($this->strpos + $n - 1 >= strlen($this->str)) {
             $end = ($this->strpos + $n);
 
             while (strlen($this->str) < $end && $response !== false) {

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

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
       * @param string $string
       * @param bool $cdata */
 
-    public static function xmlData($string, $cdata=false)
+    public static function xmlData($string, $cdata = false)
     {
         $string = str_replace("]]>", "]]]]><![CDATA[>", $string);
         if (!$cdata) {

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

Spacing +8 added lines, -8 removed lines

@@ -38,7 +38,7 @@ 
             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";
         }
@@ -66,11 +66,11 @@ 
             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;
@@ -78,7 +78,7 @@ 
 
             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;
@@ -93,7 +93,7 @@ 
             }
             $rdir = getcwd();
             chdir($dir);
-            return ($rdir !== false) ? self::normalize($rdir . "/$url") : false;
+            return ($rdir !== false) ? self::normalize($rdir."/$url") : false;
         }
     }
 
@@ -113,7 +113,7 @@ 
                 $path = substr($path, 0, -1);
             }
             if (substr($path, 0, 1) == "\\") {
-                $path = "/" . substr($path, 1);
+                $path = "/".substr($path, 1);
             }
         }
 
@@ -143,7 +143,7 @@ 
         $path = self::normalize($path);
         $encoded = "";
         foreach (explode("/", $path) as $dir) {
-            $encoded .= rawurlencode($dir) . "/";
+            $encoded .= rawurlencode($dir)."/";
         }
         $encoded = substr($encoded, 0, -1);
         return $encoded;
@@ -158,7 +158,7 @@ 
         $path = self::normalize($path);
         $decoded = "";
         foreach (explode("/", $path) as $dir) {
-            $decoded .= rawurldecode($dir) . "/";
+            $decoded .= rawurldecode($dir)."/";
         }
         $decoded = substr($decoded, 0, -1);
         return $decoded;

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

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false)
+    public function resizeFit($width, $height, $background = false)
     {//
         if (!$width) {
             $width = 1;
@@ -78,7 +78,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false)
+    public function resizeCrop($width, $height, $offset = false)
     {
         if (!$width) {
             $width = 1;
@@ -142,7 +142,7 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000")
+    public function rotate($angle, $background = "#000000")
     {
         try {
             $this->image->rotateImage($background, $angle);
@@ -176,7 +176,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false)
+    public function watermark($file, $left = false, $top = false)
     {
         try {
             $wm = new Gmagick($file);
@@ -277,7 +277,7 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array())
+    public function output($type = "jpeg", array $options = array())
     {
         $type = strtolower($type);
         try {
@@ -297,7 +297,7 @@ 
             }
             echo $this->image;
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -317,7 +317,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 {

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

Spacing +22 added lines, -22 removed lines

@@ -56,12 +56,12 @@ 
             $image = imagecreatetruecolor($width, $height);

         } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) {

             $image =

-                ($type == IMAGETYPE_GIF)      ? @imagecreatefromgif($image)  : (

-                ($type == IMAGETYPE_WBMP)     ? @imagecreatefromwbmp($image) : (

-                ($type == IMAGETYPE_JPEG)     ? @imagecreatefromjpeg($image) : (

+                ($type == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : (

+                ($type == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : (

+                ($type == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : (

                 ($type == IMAGETYPE_JPEG2000) ? @imagecreatefromjpeg($image) : (

-                ($type == IMAGETYPE_PNG)      ? @imagecreatefrompng($image)  : (

-                ($type == IMAGETYPE_XBM)      ? @imagecreatefromxbm($image)  : false

+                ($type == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : (

+                ($type == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false

             )))));

 

             if ($type == IMAGETYPE_PNG) {

@@ -98,7 +98,7 @@ 
       * @param integer $bigger_size

       * @return gd */

 

-    public function __construct($image, $bigger_size=null)

+    public function __construct($image, $bigger_size = null)

     {

         $this->image = $this->width = $this->height = null;

 

@@ -347,11 +347,11 @@ 
 

     public function imagecopy(

         $src,

-        $dst_x=0, $dst_y=0,

-        $src_x=0, $src_y=0,

-        $dst_w=null, $dst_h=null,

-        $src_w=null, $src_h=null

-    ) {

+        $dst_x = 0, $dst_y = 0,

+        $src_x = 0, $src_y = 0,

+        $dst_w = null, $dst_h = null,

+        $src_w = null, $src_h = null

+    ){

         $image_details = $this->build_image($src);

 

         if ($image_details !== false) {

@@ -377,11 +377,11 @@ 
 

     public function imagecopyresampled(

         $src,

-        $dst_x=0, $dst_y=0,

-        $src_x=0, $src_y=0,

-        $dst_w=null, $dst_h=null,

-        $src_w=null, $src_h=null

-    ) {

+        $dst_x = 0, $dst_y = 0,

+        $src_x = 0, $src_y = 0,

+        $dst_w = null, $dst_h = null,

+        $src_w = null, $src_h = null

+    ){

         $image_details = $this->build_image($src);

 

         if ($image_details !== false) {

@@ -418,9 +418,9 @@ 
                 imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);

                 imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

                 imagecolortransparent($this->image, $transindex);

-                for ($y=0; $y<$dst_h; ++$y) {

-                    for ($x=0; $x<$dst_w; ++$x) {

-                        if (((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) {

+                for ($y = 0; $y < $dst_h; ++$y) {

+                    for ($x = 0; $x < $dst_w; ++$x) {

+                        if (((imagecolorat($this->image, $x, $y) >> 24) & 0x7F) >= 100) {

                             imagesetpixel($this->image, $x, $y, $transindex);

                         }

                     }

@@ -446,7 +446,7 @@ 
         return imagefilledrectangle($this->image, $x1, $y1, $x2, $y2, $color);

     }

 

-    public function imagepng($filename=null, $quality=null, $filters=null)

+    public function imagepng($filename = null, $quality = null, $filters = null)

     {

         if (is_null($filename) && !headers_sent()) {

             header("Content-Type: image/png");

@@ -455,7 +455,7 @@ 
         return imagepng($this->image, $filename, $quality, $filters);

     }

 

-    public function imagejpeg($filename=null, $quality=75)

+    public function imagejpeg($filename = null, $quality = 75)

     {

         if (is_null($filename) && !headers_sent()) {

             header("Content-Type: image/jpeg");

@@ -463,7 +463,7 @@ 
         return imagejpeg($this->image, $filename, $quality);

     }

 

-    public function imagegif($filename=null)

+    public function imagegif($filename = null)

     {

         if (is_null($filename) && !headers_sent()) {

             header("Content-Type: image/gif");

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

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false)
+    public function resizeFit($width, $height, $background = false)
     {//
         if (!$width) {
             $width = 1;
@@ -74,7 +74,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false)
+    public function resizeCrop($width, $height, $offset = false)
     {
         if (!$width) {
             $width = 1;
@@ -138,7 +138,7 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000")
+    public function rotate($angle, $background = "#000000")
     {
         try {
             $this->image->rotateImage(new ImagickPixel($background), $angle);
@@ -171,7 +171,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false)
+    public function watermark($file, $left = false, $top = false)
     {
         try {
             $wm = new Imagick($file);
@@ -279,7 +279,7 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array())
+    public function output($type = "jpeg", array $options = array())
     {
         $type = strtolower($type);
         try {
@@ -299,7 +299,7 @@ 
             }
             echo $this->image;
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -319,7 +319,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 {