evolution-cms / evolution

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

Doc Comments +8 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
     * The parameter $bigger_size is the bigger dimension (width or height) of calculated sizes.

     * The other dimension (height or width) will be calculated autamaticaly

     * @param integer $bigger_size

-    * @return array */

+    * @return integer[] */

 

     public function get_prop_size($bigger_size) {

 

@@ -255,7 +255,7 @@ 
     * no samo po edno (x ili y) izmerenie

     * @param integer $width

     * @param integer $height

-    * @return bool */

+    * @return gd */

 

     public function resize_overflow($width, $height) {

 

@@ -397,6 +397,12 @@ 
             return false;

     }

 

+    /**
+     * @param integer $x1
+     * @param integer $y1
+     * @param integer $x2
+     * @param integer $y2
+     */
     public function imagefilledrectangle($x1, $y1, $x2, $y2, $color) {

         $color = $this->gd_color($color);

         if ($color === false) return false;

Braces +157 added lines, -92 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com

   */

 

-class gd {

+class gd
+{
 

   /** GD resource

     * @var resource */

@@ -40,22 +41,23 @@ 
     * @param mixed $image

     * @return array */

 

-    protected function build_image($image) {

+    protected function build_image($image)
+    {
 

-        if ($image instanceof gd) {

+        if ($image instanceof gd) {
             $width = $image->get_width();

             $height = $image->get_height();

             $image = $image->get_image();

 

-        } elseif (is_resource($image) && (get_resource_type($image) == "gd")) {

+        } elseif (is_resource($image) && (get_resource_type($image) == "gd")) {
             $width = @imagesx($image);

             $height = @imagesy($image);

 

-        } elseif (is_array($image)) {

+        } elseif (is_array($image)) {
             $height = $width = end($image);

             $image = imagecreatetruecolor($width, $height);

 

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

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

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

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

@@ -65,8 +67,9 @@ 
                 ($type == IMAGETYPE_XBM)      ? @imagecreatefromxbm($image)  : false

             )))));

 

-            if ($type == IMAGETYPE_PNG)

-                imagealphablending($image, false);

+            if ($type == IMAGETYPE_PNG) {
+                            imagealphablending($image, false);
+            }
         }

 

         $return = (

@@ -80,8 +83,9 @@ 
             ? array($image, $width, $height)

             : false;

 

-        if (($return !== false) && isset($type))

-            $this->type = $type;

+        if (($return !== false) && isset($type)) {
+                    $this->type = $type;
+        }
 

         return $return;

     }

@@ -97,20 +101,22 @@ 
     * @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;

 

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

 

-        if ($image_details !== false)

-            list($this->image, $this->width, $this->height) = $image_details;

-        else

-            $this->init_error = true;

+        if ($image_details !== false) {
+                    list($this->image, $this->width, $this->height) = $image_details;
+        } else {
+                    $this->init_error = true;
+        }
 

         if (!is_null($this->image) &&

             !is_null($bigger_size) &&

             (preg_match('/^[1-9][0-9]*$/', $bigger_size) !== false)

-        ) {

+        ) {
             $image = $this->image;

             list($width, $height) = $this->get_prop_size($bigger_size);

             $this->image = imagecreatetruecolor($width, $height);

@@ -125,21 +131,24 @@ 
   /** Returns the GD resource

     * @return resource */

 

-    public function get_image() {

+    public function get_image()
+    {
         return $this->image;

     }

 

   /** Returns the image width

     * @return integer */

 

-    public function get_width() {

+    public function get_width()
+    {
         return $this->width;

     }

 

   /** Returns the image height

     * @return integer */

 

-    public function get_height() {

+    public function get_height()
+    {
         return $this->height;

     }

 

@@ -147,9 +156,12 @@ 
     * @param integer $resized_height

     * @return integer */

 

-    public function get_prop_width($resized_height) {

+    public function get_prop_width($resized_height)
+    {
         $width = intval(($this->width * $resized_height) / $this->height);

-        if (!$width) $width = 1;

+        if (!$width) {
+            $width = 1;
+        }
         return $width;

     }

 

@@ -157,9 +169,12 @@ 
     * @param integer $resized_width

     * @return integer */

 

-    public function get_prop_height($resized_width) {

+    public function get_prop_height($resized_width)
+    {
         $height = intval(($this->height * $resized_width) / $this->width);

-        if (!$height) $height = 1;

+        if (!$height) {
+            $height = 1;
+        }
         return $height;

     }

 

@@ -169,18 +184,20 @@ 
     * @param integer $bigger_size

     * @return array */

 

-    public function get_prop_size($bigger_size) {

+    public function get_prop_size($bigger_size)
+    {
 

-        if ($this->width > $this->height) {

+        if ($this->width > $this->height) {
             $width = $bigger_size;

             $height = $this->get_prop_height($width);

 

-        } elseif ($this->height > $this->width) {

+        } elseif ($this->height > $this->width) {
             $height = $bigger_size;

             $width = $this->get_prop_width($height);

 

-        } else

-            $width = $height = $bigger_size;

+        } else {
+                    $width = $height = $bigger_size;
+        }
 

         return array($width, $height);

     }

@@ -190,9 +207,14 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize($width, $height) {

-        if (!$width) $width = 1;

-        if (!$height) $height = 1;

+    public function resize($width, $height)
+    {
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
         return (

             (false !== ($img = new gd(array($width, $height)))) &&

             $img->imagecopyresampled($this) &&

@@ -207,19 +229,20 @@ 
     * @param mixed $src

     * @return bool */

 

-    public function resize_crop($src) {

+    public function resize_crop($src)
+    {
         $image_details = $this->build_image($src);

 

-        if ($image_details !== false) {

+        if ($image_details !== false) {
             list($src, $src_width, $src_height) = $image_details;

 

-            if (($src_width / $src_height) > ($this->width / $this->height)) {

+            if (($src_width / $src_height) > ($this->width / $this->height)) {
                 $src_w = $this->get_prop_width($src_height);

                 $src_h = $src_height;

                 $src_x = intval(($src_width - $src_w) / 2);

                 $src_y = 0;

 

-            } else {

+            } else {
                 $src_w = $src_width;

                 $src_h = $this->get_prop_height($src_width);

                 $src_x = 0;

@@ -228,8 +251,9 @@ 
 

             return imagecopyresampled($this->image, $src, 0, 0, $src_x, $src_y, $this->width, $this->height, $src_w, $src_h);

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 

   /** Resize image to fit in given resolution. Returns TRUE on success or FALSE on failure

@@ -237,15 +261,22 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize_fit($width, $height) {

-        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))

-            return true;

-        if (!$width || (($height / $width) < ($this->height / $this->width)))

-            $width = intval(($this->width * $height) / $this->height);

-        elseif (!$height || (($width / $height) < ($this->width / $this->height)))

-            $height = intval(($this->height * $width) / $this->width);

-        if (!$width) $width = 1;

-        if (!$height) $height = 1;

+    public function resize_fit($width, $height)
+    {
+        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height))) {
+                    return true;
+        }
+        if (!$width || (($height / $width) < ($this->height / $this->width))) {
+                    $width = intval(($this->width * $height) / $this->height);
+        } elseif (!$height || (($width / $height) < ($this->width / $this->height))) {
+                    $height = intval(($this->height * $width) / $this->width);
+        }
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
         return $this->resize($width, $height);

     }

 

@@ -256,7 +287,8 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize_overflow($width, $height) {

+    public function resize_overflow($width, $height)
+    {
 

         $big = (($this->width / $this->height) > ($width / $height))

             ? ($this->width * $height) / $this->height

@@ -265,7 +297,7 @@ 
 

         $return = ($img = new gd($this->image, $big));

 

-        if ($return) {

+        if ($return) {
             $this->image = $img->get_image();

             $this->width = $img->get_width();

             $this->height = $img->get_height();

@@ -274,7 +306,8 @@ 
         return $return;

     }

 

-    public function gd_color() {

+    public function gd_color()
+    {
         $args = func_get_args();

 

         $expr_rgb = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';

@@ -282,22 +315,23 @@ 
         $expr_hex2 = '/^\#?([0-9a-f])([0-9a-f])([0-9a-f])$/i';

         $expr_byte = '/^([01]?\d?\d|2[0-4]\d|25[0-5])$/';

 

-        if (!isset($args[0]))

-            return false;

+        if (!isset($args[0])) {
+                    return false;
+        }
 

-        if (count($args[0]) == 3) {

+        if (count($args[0]) == 3) {
             list($r, $g, $b) = $args[0];

 

-        } elseif (preg_match($expr_rgb, $args[0])) {

+        } elseif (preg_match($expr_rgb, $args[0])) {
             list($r, $g, $b) = explode(" ", preg_replace($expr_rgb, "$1 $2 $3", $args[0]));

 

-        } elseif (preg_match($expr_hex1, $args[0])) {

+        } elseif (preg_match($expr_hex1, $args[0])) {
             list($r, $g, $b) = explode(" ", preg_replace($expr_hex1, "$1 $2 $3", $args[0]));

             $r = hexdec($r);

             $g = hexdec($g);

             $b = hexdec($b);

 

-        } elseif (preg_match($expr_hex2, $args[0])) {

+        } elseif (preg_match($expr_hex2, $args[0])) {
             list($r, $g, $b) = explode(" ", preg_replace($expr_hex2, "$1$1 $2$2 $3$3", $args[0]));

             $r = hexdec($r);

             $g = hexdec($g);

@@ -307,16 +341,18 @@ 
             preg_match($expr_byte, $args[0]) &&

             preg_match($expr_byte, $args[1]) &&

             preg_match($expr_byte, $args[2])

-        ) {

+        ) {
             list($r, $g, $b) = $args;

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
 

         return imagecolorallocate($this->image, $r, $g, $b);

     }

 

-    public function fill_color($color) {

+    public function fill_color($color)
+    {
         return $this->imagefilledrectangle(0, 0, $this->width - 1, $this->height - 1, $color);

     }

 

@@ -329,20 +365,29 @@ 
         $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) {

+        if ($image_details !== false) {
             list($src, $src_width, $src_height) = $image_details;

 

-            if (is_null($dst_w)) $dst_w = $this->width - $dst_x;

-            if (is_null($dst_h)) $dst_h = $this->height - $dst_y;

-            if (is_null($src_w)) $src_w = $src_width - $src_x;

-            if (is_null($src_h)) $src_h = $src_height - $src_y;

+            if (is_null($dst_w)) {
+                $dst_w = $this->width - $dst_x;
+            }
+            if (is_null($dst_h)) {
+                $dst_h = $this->height - $dst_y;
+            }
+            if (is_null($src_w)) {
+                $src_w = $src_width - $src_x;
+            }
+            if (is_null($src_h)) {
+                $src_h = $src_height - $src_y;
+            }
             return imagecopy($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h);

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 

     public function imagecopyresampled(

@@ -351,16 +396,24 @@ 
         $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) {

+        if ($image_details !== false) {
             list($src, $src_width, $src_height) = $image_details;

 

-            if (is_null($dst_w)) $dst_w = $this->width - $dst_x;

-            if (is_null($dst_h)) $dst_h = $this->height - $dst_y;

-            if (is_null($src_w)) $src_w = $src_width - $src_x;

-            if (is_null($src_h)) $src_h = $src_height - $src_y;

+            if (is_null($dst_w)) {
+                $dst_w = $this->width - $dst_x;
+            }
+            if (is_null($dst_h)) {
+                $dst_h = $this->height - $dst_y;
+            }
+            if (is_null($src_w)) {
+                $src_w = $src_width - $src_x;
+            }
+            if (is_null($src_h)) {
+                $src_h = $src_height - $src_y;
+            }
             imagealphablending($this->image, false);

             imagesavealpha($this->image,true);

 

@@ -371,7 +424,7 @@ 
 

 			$transindex = imagecolortransparent($src);

 			$palletsize = imagecolorstotal($src);

-			if($transindex >= 0 && $transindex < $palletsize) {

+			if($transindex >= 0 && $transindex < $palletsize) {
 				$transcol = imagecolorsforindex($src, $transindex);

 

 			/*** end gif transparent fix ***/

@@ -380,44 +433,56 @@ 
 				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) imagesetpixel($this->image, $x, $y, $transindex);

+				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);
+					}
 				imagetruecolortopalette($this->image, true, 255);

-			}

-			else {

+			} else {
 				$transparent = imagecolorallocatealpha($this->image, 255, 255, 255, 127);

 				imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transparent);

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

 			}

 			return $this->image;

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 

-    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color) {

+    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color)
+    {
         $color = $this->gd_color($color);

-        if ($color === false) return false;

+        if ($color === false) {
+            return false;
+        }
         return imagefilledrectangle($this->image, $x1, $y1, $x2, $y2, $color);

     }

 

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

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

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

+    public function imagepng($filename=null, $quality=null, $filters=null)
+    {
+        if (is_null($filename) && !headers_sent()) {
+                    header("Content-Type: image/png");
+        }
         @imagesavealpha($this->image, true);

         return imagepng($this->image, $filename, $quality, $filters);

     }

 

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

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

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

+    public function imagejpeg($filename=null, $quality=75)
+    {
+        if (is_null($filename) && !headers_sent()) {
+                    header("Content-Type: image/jpeg");
+        }
         return imagejpeg($this->image, $filename, $quality);

     }

 

-    public function imagegif($filename=null) {

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

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

+    public function imagegif($filename=null)
+    {
+        if (is_null($filename) && !headers_sent()) {
+                    header("Content-Type: image/gif");
+        }
 			@imagesavealpha($this->image, true);

         return imagegif($this->image, $filename);

     }

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

Doc Comments -1 removed lines

@@ -179,7 +179,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);

Braces +42 added lines, -21 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-abstract class image {
+abstract class image
+{
     const DEFAULT_JPEG_QUALITY = 75;
 
 /** Image resource or object
@@ -41,7 +42,8 @@ 
   * @param string $property
   * @return mixed */
 
-    final public function __get($property) {
+    final public function __get($property)
+    {
         return property_exists($this, $property) ? $this->$property : null;
     }
 
@@ -57,14 +59,16 @@ 
   * @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);
 
-        if ($imageDetails !== false)
-            list($this->image, $this->width, $this->height) = $imageDetails;
-        else
-            $this->initError = true;
+        if ($imageDetails !== false) {
+                    list($this->image, $this->width, $this->height) = $imageDetails;
+        } else {
+                    $this->initError = true;
+        }
         $this->options = $options;
     }
 
@@ -75,7 +79,8 @@ 
   * @param mixed $image
   * @return object */
 
-    final static function factory($driver, $image, array $options=array()) {
+    final static function factory($driver, $image, array $options=array())
+    {
         $class = "image_$driver";
         return new $class($image, $options);
     }
@@ -86,14 +91,18 @@ 
   * @param array $drivers
   * @return string */
 
-    final static function getDriver(array $drivers=array('gd')) {
+    final static function getDriver(array $drivers=array('gd'))
+    {
         foreach ($drivers as $driver) {
-            if (!preg_match('/^[a-z0-9\_]+$/i', $driver))
-                continue;
+            if (!preg_match('/^[a-z0-9\_]+$/i', $driver)) {
+                            continue;
+            }
             $class = "image_$driver";
             if (class_exists($class) && method_exists($class, "available")) {
                 eval("\$avail = $class::available();");
-                if ($avail) return $driver;
+                if ($avail) {
+                    return $driver;
+                }
             }
         }
         return false;
@@ -105,7 +114,8 @@ 
   * @param mixed $image
   * @return array */
 
-    final protected function buildImage($image) {
+    final protected function buildImage($image)
+    {
         $class = get_class($this);
         if ($image instanceof $class) {
             $width = $image->width;
@@ -117,8 +127,9 @@ 
             $height = $image[1];
             $img = $this->getBlankImage($width, $height);
 
-        } else
-            $img = $this->getImage($image, $width, $height);
+        } else {
+                    $img = $this->getImage($image, $width, $height);
+        }
         return ($img !== false)
             ? array($img, $width, $height)
             : false;
@@ -129,9 +140,12 @@ 
   * @param integer $resizedHeight
   * @return integer */
 
-    final public function getPropWidth($resizedHeight) {
+    final public function getPropWidth($resizedHeight)
+    {
         $width = round(($this->width * $resizedHeight) / $this->height);
-        if (!$width) $width = 1;
+        if (!$width) {
+            $width = 1;
+        }
         return $width;
     }
 
@@ -140,9 +154,12 @@ 
   * @param integer $resizedWidth
   * @return integer */
 
-    final public function getPropHeight($resizedWidth) {
+    final public function getPropHeight($resizedWidth)
+    {
         $height = round(($this->height * $resizedWidth) / $this->width);
-        if (!$height) $height = 1;
+        if (!$height) {
+            $height = 1;
+        }
         return $height;
     }
 
@@ -151,13 +168,17 @@ 
   * static method should be implemented into driver classes like abstract
   * methods
   * @return bool */
-    static function available() { return false; }
+    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 */
-    static function checkImage($file) { return false; }
+    static function checkImage($file)
+    {
+return false; }
 
 /** Resize image. Should return TRUE on success or FALSE on failure
   * @param integer $width

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

Doc Comments +5 added lines

@@ -327,6 +327,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);
         if ($color === false) return false;

Braces +148 added lines, -85 removed lines

@@ -12,14 +12,20 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gd extends image {
+class image_gd extends image
+{
 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resize($width, $height)
+    {
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
         return (
             (false !== ($img = new image_gd(array($width, $height)))) &&
             $img->imageCopyResampled($this) &&
@@ -29,9 +35,11 @@ 
         );
     }
 
-    public function resizeFit($width, $height, $background=false) {
-        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))
-            return true;
+    public function resizeFit($width, $height, $background=false)
+    {
+        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height))) {
+                    return true;
+        }
         if (!$width || (($height / $width) < ($this->height / $this->width))) {
             $h = $height;
             $w = round(($this->width * $h) / $this->height);
@@ -42,13 +50,16 @@ 
             $w = $width;
             $h = $height;
         }
-        if (!$w) $w = 1;
-        if (!$h) $h = 1;
-
-        if ($background === false)
-            return $this->resize($w, $h);
+        if (!$w) {
+            $w = 1;
+        }
+        if (!$h) {
+            $h = 1;
+        }
 
-        else {
+        if ($background === false) {
+                    return $this->resize($w, $h);
+        } else {
             $img = new image_gd(array($width, $height));
             $x = round(($width - $w) / 2);
             $y = round(($height - $h) / 2);
@@ -56,8 +67,9 @@ 
             if ((false === $this->resize($w, $h)) ||
                 (false === $img->imageFilledRectangle(0, 0, $width, $height, $background)) ||
                 (false === $img->imageCopyResampled($this->image, $x, $y, 0, 0, $w, $h))
-            )
-                return false;
+            ) {
+                            return false;
+            }
 
             $this->image = $img->image;
             $this->width = $width;
@@ -67,41 +79,52 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset=false)
+    {
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
             $w = ($this->width * $h) / $this->height;
             $y = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($w + $offset) <= $width)
-                    $offset = $width - $w;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($w + $offset) <= $width) {
+                                    $offset = $width - $w;
+                }
                 $x = $offset;
-            } else
-                $x = ($width - $w) / 2;
+            } else {
+                            $x = ($width - $w) / 2;
+            }
 
         } else {
             $w = $width;
             $h = ($this->height * $w) / $this->width;
             $x = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($h + $offset) <= $height)
-                    $offset = $height - $h;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($h + $offset) <= $height) {
+                                    $offset = $height - $h;
+                }
                 $y = $offset;
-            } else
-                $y = ($height - $h) / 2;
+            } else {
+                            $y = ($height - $h) / 2;
+            }
         }
 
         $x = round($x);
         $y = round($y);
         $w = round($w);
         $h = round($h);
-        if (!$w) $w = 1;
-        if (!$h) $h = 1;
+        if (!$w) {
+            $w = 1;
+        }
+        if (!$h) {
+            $h = 1;
+        }
 
         $return = (
             (false !== ($img = new image_gd(array($width, $height))))) &&
@@ -117,50 +140,59 @@ 
         return $return;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background="#000000")
+    {
         $angle = -$angle;
         $img = @imagerotate($this->image, $angle, $this->gdColor($background));
-        if ($img === false)
-            return false;
+        if ($img === false) {
+                    return false;
+        }
         $this->width = imagesx($img);
         $this->height = imagesy($img);
         $this->image = $img;
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal()
+    {
         $img = imagecreatetruecolor($this->width, $this->height);
             imagealphablending($img, false);
             imagesavealpha($img, true);
-        if (imagecopyresampled($img, $this->image, 0, 0, ($this->width - 1), 0, $this->width, $this->height, -$this->width, $this->height))
-            $this->image = $img;
-        else
-            return false;
+        if (imagecopyresampled($img, $this->image, 0, 0, ($this->width - 1), 0, $this->width, $this->height, -$this->width, $this->height)) {
+                    $this->image = $img;
+        } else {
+                    return false;
+        }
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical()
+    {
         $img = imagecreatetruecolor($this->width, $this->height);
             imagealphablending($img, false);
             imagesavealpha($img, true);
-        if (imagecopyresampled($img, $this->image, 0, 0, 0, ($this->height - 1), $this->width, $this->height, $this->width, -$this->height))
-            $this->image = $img;
-        else
-            return false;
+        if (imagecopyresampled($img, $this->image, 0, 0, 0, ($this->height - 1), $this->width, $this->height, $this->width, -$this->height)) {
+                    $this->image = $img;
+        } else {
+                    return false;
+        }
         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;
-        if (!in_array($t, array(IMAGETYPE_PNG, IMAGETYPE_GIF)))
-            return false;
+        if (!in_array($t, array(IMAGETYPE_PNG, IMAGETYPE_GIF))) {
+                    return false;
+        }
         $imagecreate = ($t == IMAGETYPE_PNG) ? "imagecreatefrompng" : "imagecreatefromgif";
 
         if (!@imagealphablending($this->image, true) ||
             (false === ($wm = @$imagecreate($file)))
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         $w = imagesx($wm);
         $h = imagesy($wm);
@@ -176,28 +208,33 @@ 
         if ((($x + $w) > $this->width) ||
             (($y + $h) > $this->height) ||
             ($x < 0) || ($y < 0)
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
-        if (($wm === false) || !@imagecopy($this->image, $wm, $x, $y, 0, 0, $w, $h))
-            return false;
+        if (($wm === false) || !@imagecopy($this->image, $wm, $x, $y, 0, 0, $w, $h)) {
+                    return false;
+        }
 
         @imagealphablending($this->image, false);
         @imagesavealpha($this->image, true);
         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))
-            return false;
+        if (!method_exists($this, $method)) {
+                    return false;
+        }
         return $this->$method($options);
     }
 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height)
+    {
         $img = @imagecreatetruecolor($width, $height);
 //        imagealphablending($img, false);
 //        imagesavealpha($img, true);
@@ -207,7 +244,8 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height)
+    {
 
         if (is_resource($image) && (get_resource_type($image) == "gd")) {
             $width = @imagesx($image);
@@ -227,22 +265,26 @@ 
 
             return $image;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available()
+    {
         return function_exists("imagecreatefromjpeg");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file)
+    {
         if (!is_string($file) ||
             ((false === (list($width, $height, $t) = @getimagesize($file))))
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         $img =
             ($t == IMAGETYPE_GIF)  ? @imagecreatefromgif($file)  : (
@@ -258,34 +300,41 @@ 
 
     // 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;
         $filters = isset($options['filters']) ? $options['filters'] : null;
-        if (($file === null) && !headers_sent())
-            header("Content-Type: image/png");
+        if (($file === null) && !headers_sent()) {
+                    header("Content-Type: image/png");
+        }
         @imagesavealpha($this->image, true);
         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'])
             ? $options['quality']
             : self::DEFAULT_JPEG_QUALITY;
-        if (($file === null) && !headers_sent())
-            header("Content-Type: image/jpeg");
+        if (($file === null) && !headers_sent()) {
+                    header("Content-Type: image/jpeg");
+        }
         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())
-            header("Content-Type: image/gif");
+        if (isset($options['file']) && !headers_sent()) {
+                    header("Content-Type: image/gif");
+        }
         return imagegif($this->image, $file);
     }
 
-    protected function gdColor() {
+    protected function gdColor()
+    {
         $args = func_get_args();
 
         $exprRGB = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';
@@ -293,8 +342,9 @@ 
         $exprHex2 = '/^\#?([0-9a-f])([0-9a-f])([0-9a-f])$/i';
         $exprByte = '/^([01]?\d?\d|2[0-4]\d|25[0-5])$/';
 
-        if (!isset($args[0]))
-            return false;
+        if (!isset($args[0])) {
+                    return false;
+        }
 
         if (count($args[0]) == 3) {
             list($r, $g, $b) = $args[0];
@@ -321,15 +371,19 @@ 
         ) {
             list($r, $g, $b) = $args;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
 
         return imagecolorallocate($this->image, $r, $g, $b);
     }
 
-    protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color) {
+    protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color)
+    {
         $color = $this->gdColor($color);
-        if ($color === false) return false;
+        if ($color === false) {
+            return false;
+        }
         return imageFilledRectangle($this->image, $x1, $y1, $x2, $y2, $color);
     }
 
@@ -338,15 +392,24 @@ 
     ) {
         $imageDetails = $this->buildImage($src);
 
-        if ($imageDetails === false)
-            return false;
+        if ($imageDetails === false) {
+                    return false;
+        }
 
         list($src, $srcWidth, $srcHeight) = $imageDetails;
 
-        if (is_null($dstW)) $dstW = $this->width - $dstW;
-        if (is_null($dstH)) $dstH = $this->height - $dstY;
-        if (is_null($srcW)) $srcW = $srcWidth - $srcX;
-        if (is_null($srcH)) $srcH = $srcHeight - $srcY;
+        if (is_null($dstW)) {
+            $dstW = $this->width - $dstW;
+        }
+        if (is_null($dstH)) {
+            $dstH = $this->height - $dstY;
+        }
+        if (is_null($srcW)) {
+            $srcW = $srcWidth - $srcX;
+        }
+        if (is_null($srcH)) {
+            $srcH = $srcHeight - $srcY;
+        }
         return imageCopyResampled($this->image, $src, $dstX, $dstY, $srcX, $srcY, $dstW, $dstH, $srcW, $srcH);
     }
 }

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

Doc Comments +6 added lines

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

Braces +17 added lines, -11 removed lines

@@ -13,20 +13,23 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class zipFolder {
+class zipFolder
+{
     protected $zip;
     protected $root;
     protected $ignored;
 
-    function __construct($file, $folder, $ignored=null) {
+    function __construct($file, $folder, $ignored=null)
+    {
         $this->zip = new ZipArchive();
 
         $this->ignored = is_array($ignored)
             ? $ignored
             : ($ignored ? array($ignored) : array());
 
-        if ($this->zip->open($file, ZIPARCHIVE::CREATE) !== TRUE)
-            throw new Exception("cannot open <$file>\n");
+        if ($this->zip->open($file, ZIPARCHIVE::CREATE) !== TRUE) {
+                    throw new Exception("cannot open <$file>\n");
+        }
 
         $folder = rtrim($folder, '/');
 
@@ -39,19 +42,22 @@ 
         $this->zip->close();
     }
 
-    function zip($folder, $parent=null) {
+    function zip($folder, $parent=null)
+    {
         $full_path = "{$this->root}$parent$folder";
         $zip_path = "$parent$folder";
         $this->zip->addEmptyDir($zip_path);
         $dir = new DirectoryIterator($full_path);
-        foreach ($dir as $file)
-            if (!$file->isDot()) {
+        foreach ($dir as $file) {
+                    if (!$file->isDot()) {
                 $filename = $file->getFilename();
+        }
                 if (!in_array($filename, $this->ignored)) {
-                    if ($file->isDir())
-                        $this->zip($filename, "$zip_path/");
-                    else
-                        $this->zip->addFile("$full_path/$filename", "$zip_path/$filename");
+                    if ($file->isDir()) {
+                                            $this->zip($filename, "$zip_path/");
+                    } else {
+                                            $this->zip->addFile("$full_path/$filename", "$zip_path/$filename");
+                    }
                 }
             }
     }

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

Doc Comments -2 removed lines

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

Braces +22 added lines, -13 removed lines

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

manager/media/browser/mcpuk/core/types/type_img.php

Braces +7 added lines, -4 removed lines

@@ -12,17 +12,20 @@
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_img {
+class type_img
+{
 
-    public function checkFile($file, array $config) {
+    public function checkFile($file, array $config)
+    {
 
         $driver = isset($config['imageDriversPriority'])
             ? image::getDriver(explode(" ", $config['imageDriversPriority'])) : "gd";
 
         $img = image::factory($driver, $file);
 
-        if ($img->initError)
-            return "Unknown image format/encoding.";
+        if ($img->initError) {
+                    return "Unknown image format/encoding.";
+        }
 
         return true;
     }

manager/media/browser/mcpuk/core/types/type_mime.php

Braces +13 added lines, -8 removed lines

@@ -12,20 +12,25 @@
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_mime {
+class type_mime
+{
 
-    public function checkFile($file, array $config) {
-        if (!class_exists("finfo"))
-            return "Fileinfo PECL extension is missing.";
+    public function checkFile($file, array $config)
+    {
+        if (!class_exists("finfo")) {
+                    return "Fileinfo PECL extension is missing.";
+        }
 
-        if (!isset($config['params']))
-            return "Undefined MIME types.";
+        if (!isset($config['params'])) {
+                    return "Undefined MIME types.";
+        }
 
         $finfo = strlen($config['mime_magic'])
             ? new finfo(FILEINFO_MIME, $config['mime_magic'])
             : new finfo(FILEINFO_MIME);
-        if (!$finfo)
-            return "Opening fileinfo database failed.";
+        if (!$finfo) {
+                    return "Opening fileinfo database failed.";
+        }
 
         $type = $finfo->file($file);
         $type = substr($type, 0, strrpos($type, ";"));

manager/media/browser/mcpuk/css.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 
 require "core/autoload.php";
 $mtime = @filemtime(__FILE__);
-if ($mtime) httpCache::checkMTime($mtime);
+if ($mtime) {
+    httpCache::checkMTime($mtime);
+}
 $browser = new browser($modx);
 $config = $browser->config;
 ob_start();

manager/media/browser/mcpuk/browser.php

Braces +10 added lines, -4 removed lines

@@ -10,11 +10,17 @@
 			}

 		};

 <?php

-	if(isset($_GET['type']))     $type = htmlspecialchars(trim($_GET['type']), ENT_QUOTES);

-	elseif(isset($_GET['Type'])) $type = htmlspecialchars(trim($_GET['Type']), ENT_QUOTES);

-    else                         $type = 'images';

+	if(isset($_GET['type'])) {
+	    $type = htmlspecialchars(trim($_GET['type']), ENT_QUOTES);
+	} elseif(isset($_GET['Type'])) {
+	    $type = htmlspecialchars(trim($_GET['Type']), ENT_QUOTES);
+	} else {
+        $type = 'images';
+    }
     

-    if($type==='image') $type = 'images';

+    if($type==='image') {
+        $type = 'images';
+    }
     

 	$opener = (isset($_GET['editor'])) ? 'opener=' . htmlspecialchars(trim($_GET['editor']), ENT_QUOTES) : '';

 	$request_uri = "{$opener}&type={$type}";