evolution-cms / evolution

manager/media/browser/mcpuk/lang/id.php

Indentation +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 /** {Indonesian} localization file for KCFinder
-  * -Razi Senseio (Author)
-  */
+ * -Razi Senseio (Author)
+ */
 
 $lang = array(
 

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 
 $lang = array(
 
-    '_locale' => "id_ID.UTF-8",  // UNIX localization code
-    '_charset' => "utf-8",       // Browser charset
+    '_locale' => "id_ID.UTF-8", // UNIX localization code
+    '_charset' => "utf-8", // Browser charset
 
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
     '_dateTimeFull' => "%A, %e %B, %Y %H:%M",

manager/media/browser/mcpuk/lang/nl.php

Indentation +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 /** Dutch localization file for KCFinder
-  * author: Lars Anderson <lars16anderson@users.sourceforge.net>
-  */
+ * author: Lars Anderson <lars16anderson@users.sourceforge.net>
+ */
 
 $lang = array(
 

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 
 $lang = array(
 
-    '_locale' => "nl_NL.UTF-8",  // UNIX localization code
-    '_charset' => "utf-8",       // Browser charset
+    '_locale' => "nl_NL.UTF-8", // UNIX localization code
+    '_charset' => "utf-8", // Browser charset
 
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
     '_dateTimeFull' => "%A, %e.%B.%Y %H:%M",

manager/media/browser/mcpuk/lang/vi.php

Indentation +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 /** vi localization file for KCFinder
-  * Tran Van Quyet - HQV ltd
-  */
+ * Tran Van Quyet - HQV ltd
+ */
 
 $lang = array(
 

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 
 $lang = array(
 
-    '_locale' => "vi_VN.UTF-8",  // UNIX localization code
-    '_charset' => "utf-8",       // Browser charset
+    '_locale' => "vi_VN.UTF-8", // UNIX localization code
+    '_charset' => "utf-8", // Browser charset
 
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
     '_dateTimeFull' => "%A, %e %B, %Y %H:%M",

manager/media/browser/mcpuk/css.php

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Base CSS definitions
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Base CSS definitions
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 require "core/autoload.php";
 $mtime = @filemtime(__FILE__);

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

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Load language labels into JavaScript
-  *   @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 Load language labels into JavaScript
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 require "core/autoload.php";
 $input = new input();

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
     header("Content-Type: text/javascript");
     die;
 }
-$file = "lang/" . $input->get['lng'] . ".php";
+$file = "lang/".$input->get['lng'].".php";
 $files = dir::content("lang", array(
     'types' => "file",
     'pattern' => '/^.*\.php$/'
@@ -33,4 +33,4 @@ 
 header("Content-Type: text/javascript; charset={$lang['_charset']}");
 foreach ($lang as $english => $native)
     if (substr($english, 0, 1) != "_")
-        echo "browser.labels['" . text::jsValue($english) . "']=\"" . text::jsValue($native) . "\";";
+        echo "browser.labels['".text::jsValue($english)."']=\"".text::jsValue($native)."\";";

Braces +5 added lines, -2 removed lines

@@ -28,9 +28,12 @@
     die;
 }
 $mtime = @filemtime($file);
-if ($mtime) httpCache::checkMTime($mtime);
+if ($mtime) {
+    httpCache::checkMTime($mtime);
+}
 require $file;
 header("Content-Type: text/javascript; charset={$lang['_charset']}");
-foreach ($lang as $english => $native)
+foreach ($lang as $english => $native) {
     if (substr($english, 0, 1) != "_")
         echo "browser.labels['" . text::jsValue($english) . "']=\"" . text::jsValue($native) . "\";";
+}

manager/media/browser/mcpuk/js/browser/joiner.php

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Join all JavaScript files in current directory
-  *   @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 Join all JavaScript files in current directory
+ *   @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
+ */
 
 chdir(".."); // For compatibility
 chdir("..");

Braces +6 added lines, -4 removed lines

@@ -23,11 +23,13 @@
 
 foreach ($files as $file) {
     $fmtime = filemtime($file);
-    if (!isset($mtime) || ($fmtime > $mtime))
-        $mtime = $fmtime;
-}
+    if (!isset($mtime) || ($fmtime > $mtime)) {
+            $mtime = $fmtime;
+    }
+    }
 
 httpCache::checkMTime($mtime);
 header("Content-Type: text/javascript");
-foreach ($files as $file)
+foreach ($files as $file) {
     require $file;
+}

manager/media/browser/mcpuk/browser.php

Indentation +4 added lines, -4 removed lines

@@ -10,14 +10,14 @@
 			}

 		};

 <?php

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

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

+    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';

     

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

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

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

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

 ?>

 		window.location.href = "browse.php?<?php echo $request_uri; ?>";

 	</script>

Spacing +4 added lines, -4 removed lines

@@ -10,13 +10,13 @@
 			}

 		};

 <?php

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

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

+	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) : '';

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

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

 ?>

 		window.location.href = "browse.php?<?php echo $request_uri; ?>";

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}";

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

Indentation +29 added lines, -29 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Directory 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 Directory 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 dir {
 
-  /** Checks if the given directory is really writable. The standard PHP
-    * function is_writable() does not work properly on Windows servers
-    * @param string $dir
-    * @return bool */
+    /** Checks if the given directory is really writable. The standard PHP
+     * function is_writable() does not work properly on Windows servers
+     * @param string $dir
+     * @return bool */
 
     static function isWritable($dir) {
         $dir = path::normalize($dir);
@@ -33,16 +33,16 @@ 
         return true;
     }
 
-  /** Recursively delete the given directory. Returns TRUE on success.
-    * If $firstFailExit parameter is true (default), the method returns the
-    * path to the first failed file or directory which cannot be deleted.
-    * If $firstFailExit is false, the method returns an array with failed
-    * files and directories which cannot be deleted. The third parameter
-    * $failed is used for internal use only.
-    * @param string $dir
-    * @param bool $firstFailExit
-    * @param array $failed
-    * @return mixed */
+    /** Recursively delete the given directory. Returns TRUE on success.
+     * If $firstFailExit parameter is true (default), the method returns the
+     * path to the first failed file or directory which cannot be deleted.
+     * If $firstFailExit is false, the method returns an array with failed
+     * files and directories which cannot be deleted. The third parameter
+     * $failed is used for internal use only.
+     * @param string $dir
+     * @param bool $firstFailExit
+     * @param array $failed
+     * @return mixed */
 
     static function prune($dir, $firstFailExit=true, array $failed=null) {
         if ($failed === null) $failed = array();
@@ -81,11 +81,11 @@ 
         return count($failed) ? $failed : true;
     }
 
-  /** Get the content of the given directory. Returns an array with filenames
-    * or FALSE on failure
-    * @param string $dir
-    * @param array $options
-    * @return mixed */
+    /** Get the content of the given directory. Returns an array with filenames
+     * or FALSE on failure
+     * @param string $dir
+     * @param array $options
+     * @return mixed */
 
     static function content($dir, array $options=null) {
 

Spacing +8 added lines, -8 removed lines

@@ -12,20 +12,20 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class dir {
+class dir{
 
   /** Checks if the given directory is really writable. The standard PHP
     * function is_writable() does not work properly on Windows servers
     * @param string $dir
     * @return bool */
 
-    static function isWritable($dir) {
+    static function isWritable($dir){
         $dir = path::normalize($dir);
         if (!is_dir($dir))
             return false;
         $i = 0;
         do {
-            $file = "$dir/is_writable_" . md5($i++);
+            $file = "$dir/is_writable_".md5($i++);
         } while (file_exists($file));
         if (!@touch($file))
             return false;
@@ -44,7 +44,7 @@ 
     * @param array $failed
     * @return mixed */
 
-    static function prune($dir, $firstFailExit=true, array $failed=null) {
+    static function prune($dir, $firstFailExit = true, array $failed = null){
         if ($failed === null) $failed = array();
         $files = self::content($dir);
         if ($files === false) {
@@ -87,12 +87,12 @@ 
     * @param array $options
     * @return mixed */
 
-    static function content($dir, array $options=null) {
+    static function content($dir, array $options = null){
 
         $defaultOptions = array(
-            'types' => "all",   // Allowed: "all" or possible return values
+            'types' => "all", // Allowed: "all" or possible return values
                                 // of filetype(), or an array with them
-            'addPath' => true,  // Whether to add directory path to filenames
+            'addPath' => true, // Whether to add directory path to filenames
             'pattern' => '/./', // Regular expression pattern for filename
             'followLinks' => true
         );
@@ -145,7 +145,7 @@ 
         return $files;
     }
 
-    static function fileSort($a, $b) {
+    static function fileSort($a, $b){
         if (function_exists("mb_strtolower")) {
             $a = mb_strtolower($a);
             $b = mb_strtolower($b);

Braces +63 added lines, -39 removed lines

@@ -12,23 +12,27 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class dir {
+class dir
+{
 
   /** Checks if the given directory is really writable. The standard PHP
     * function is_writable() does not work properly on Windows servers
     * @param string $dir
     * @return bool */
 
-    static function isWritable($dir) {
+    static function isWritable($dir)
+    {
         $dir = path::normalize($dir);
-        if (!is_dir($dir))
-            return false;
+        if (!is_dir($dir)) {
+                    return false;
+        }
         $i = 0;
         do {
             $file = "$dir/is_writable_" . md5($i++);
         } while (file_exists($file));
-        if (!@touch($file))
-            return false;
+        if (!@touch($file)) {
+                    return false;
+        }
         unlink($file);
         return true;
     }
@@ -44,12 +48,16 @@ 
     * @param array $failed
     * @return mixed */
 
-    static function prune($dir, $firstFailExit=true, array $failed=null) {
-        if ($failed === null) $failed = array();
+    static function prune($dir, $firstFailExit=true, array $failed=null)
+    {
+        if ($failed === null) {
+            $failed = array();
+        }
         $files = self::content($dir);
         if ($files === false) {
-            if ($firstFailExit)
-                return $dir;
+            if ($firstFailExit) {
+                            return $dir;
+            }
             $failed[] = $dir;
             return $failed;
         }
@@ -58,23 +66,27 @@ 
             if (is_dir($file)) {
                 $failed_in = self::prune($file, $firstFailExit, $failed);
                 if ($failed_in !== true) {
-                    if ($firstFailExit)
-                        return $failed_in;
-                    if (is_array($failed_in))
-                        $failed = array_merge($failed, $failed_in);
-                    else
-                        $failed[] = $failed_in;
+                    if ($firstFailExit) {
+                                            return $failed_in;
+                    }
+                    if (is_array($failed_in)) {
+                                            $failed = array_merge($failed, $failed_in);
+                    } else {
+                                            $failed[] = $failed_in;
+                    }
                 }
             } elseif (!@unlink($file)) {
-                if ($firstFailExit)
-                    return $file;
+                if ($firstFailExit) {
+                                    return $file;
+                }
                 $failed[] = $file;
             }
         }
 
         if (!@rmdir($dir)) {
-            if ($firstFailExit)
-                return $dir;
+            if ($firstFailExit) {
+                            return $dir;
+            }
             $failed[] = $dir;
         }
 
@@ -87,7 +99,8 @@ 
     * @param array $options
     * @return mixed */
 
-    static function content($dir, array $options=null) {
+    static function content($dir, array $options=null)
+    {
 
         $defaultOptions = array(
             'types' => "all",   // Allowed: "all" or possible return values
@@ -97,23 +110,28 @@ 
             'followLinks' => true
         );
 
-        if (!is_dir($dir) || !is_readable($dir))
-            return false;
+        if (!is_dir($dir) || !is_readable($dir)) {
+                    return false;
+        }
 
-        if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN")
-            $dir = str_replace("\\", "/", $dir);
+        if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN") {
+                    $dir = str_replace("\\", "/", $dir);
+        }
         $dir = rtrim($dir, "/");
 
         $dh = @opendir($dir);
-        if ($dh === false)
-            return false;
+        if ($dh === false) {
+                    return false;
+        }
 
-        if ($options === null)
-            $options = $defaultOptions;
+        if ($options === null) {
+                    $options = $defaultOptions;
+        }
 
-        foreach ($defaultOptions as $key => $val)
-            if (!isset($options[$key]))
+        foreach ($defaultOptions as $key => $val) {
+                    if (!isset($options[$key]))
                 $options[$key] = $val;
+        }
 
         $files = array();
         while (($file = @readdir($dh)) !== false) {
@@ -124,28 +142,32 @@ 
                 do {
                     $ldir = dirname($lfile);
                     $lfile = @readlink($lfile);
-                    if (substr($lfile, 0, 1) != "/")
-                        $lfile = "$ldir/$lfile";
+                    if (substr($lfile, 0, 1) != "/") {
+                                            $lfile = "$ldir/$lfile";
+                    }
                     $type = filetype($lfile);
                 } while ($type == "link");
             }
 
             if ((($type === "dir") && (($file == ".") || ($file == ".."))) ||
                 !preg_match($options['pattern'], $file)
-            )
-                continue;
+            ) {
+                            continue;
+            }
 
             if (($options['types'] === "all") || ($type === $options['types']) ||
                 ((is_array($options['types'])) && in_array($type, $options['types']))
-            )
-                $files[] = $options['addPath'] ? "$dir/$file" : $file;
+            ) {
+                            $files[] = $options['addPath'] ? "$dir/$file" : $file;
+            }
         }
         closedir($dh);
         usort($files, array("dir", "fileSort"));
         return $files;
     }
 
-    static function fileSort($a, $b) {
+    static function fileSort($a, $b)
+    {
         if (function_exists("mb_strtolower")) {
             $a = mb_strtolower($a);
             $b = mb_strtolower($b);
@@ -153,7 +175,9 @@ 
             $a = strtolower($a);
             $b = strtolower($b);
         }
-        if ($a == $b) return 0;
+        if ($a == $b) {
+            return 0;
+        }
         return ($a < $b) ? -1 : 1;
     }
 }

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

Indentation +10 added lines, -10 removed lines

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

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_imagick extends image {
+class image_imagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -65,7 +65,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -115,7 +115,7 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background = "#000000"){
         try {
             $this->image->rotateImage(new ImagickPixel($background), $angle);
             $size = $this->image->getImageGeometry();
@@ -127,7 +127,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -136,7 +136,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -145,7 +145,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left = false, $top = false){
         try {
             $wm = new Imagick($file);
             $size = $wm->getImageGeometry();
@@ -181,7 +181,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Imagick();
             $img->newImage($width, $height, "none");
@@ -192,7 +192,7 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_object($image) && ($image instanceof image_imagick)) {
             try {
@@ -234,11 +234,11 @@ 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available(){
         return class_exists("Imagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file){
         try {
             new Imagick($file);
         } catch (Exception $e) {
@@ -250,7 +250,7 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type = "jpeg", array $options = array()){
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -269,7 +269,7 @@ 
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -289,7 +289,7 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options = array()){
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setImageCompression(Imagick::COMPRESSION_JPEG);

Braces +81 added lines, -40 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_imagick extends image {
+class image_imagick extends image
+{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,9 +22,15 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resize($width, $height)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
         try {
             $this->image->scaleImage($width, $height);
         } catch (Exception $e) {
@@ -34,9 +41,15 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeFit($width, $height, $background=false)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         try {
             $this->image->scaleImage($width, $height, true);
@@ -65,43 +78,58 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeCrop($width, $height, $offset=false)
+    {
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
             $w = ($this->width * $h) / $this->height;
             $y = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($w + $offset) <= $width)
-                    $offset = $width - $w;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($w + $offset) <= $width) {
+                                    $offset = $width - $w;
+                }
                 $x = $offset;
-            } else
-                $x = ($width - $w) / 2;
+            } else {
+                            $x = ($width - $w) / 2;
+            }
 
         } else {
             $w = $width;
             $h = ($this->height * $w) / $this->width;
             $x = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($h + $offset) <= $height)
-                    $offset = $height - $h;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($h + $offset) <= $height) {
+                                    $offset = $height - $h;
+                }
                 $y = $offset;
-            } else
-                $y = ($height - $h) / 2;
+            } else {
+                            $y = ($height - $h) / 2;
+            }
         }
 
         $x = round($x);
         $y = round($y);
         $w = round($w);
         $h = round($h);
-        if (!$w) $w = 1;
-        if (!$h) $h = 1;
+        if (!$w) {
+            $w = 1;
+        }
+        if (!$h) {
+            $h = 1;
+        }
 
         try {
             $this->image->scaleImage($w, $h);
@@ -115,7 +143,8 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background="#000000")
+    {
         try {
             $this->image->rotateImage(new ImagickPixel($background), $angle);
             $size = $this->image->getImageGeometry();
@@ -127,7 +156,8 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal()
+    {
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -136,7 +166,8 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical()
+    {
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -145,7 +176,8 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left=false, $top=false)
+    {
         try {
             $wm = new Imagick($file);
             $size = $wm->getImageGeometry();
@@ -167,8 +199,9 @@ 
         if ((($x + $w) > $this->width) ||
             (($y + $h) > $this->height) ||
             ($x < 0) || ($y < 0)
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         try {
             $this->image->compositeImage($wm, Imagick::COMPOSITE_DEFAULT, $x, $y);
@@ -181,7 +214,8 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height)
+    {
         try {
             $img = new Imagick();
             $img->newImage($width, $height, "none");
@@ -192,7 +226,8 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height)
+    {
 
         if (is_object($image) && ($image instanceof image_imagick)) {
             try {
@@ -227,18 +262,21 @@ 
             $height = $size['height'];
             return $image;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available()
+    {
         return class_exists("Imagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file)
+    {
         try {
             new Imagick($file);
         } catch (Exception $e) {
@@ -250,7 +288,8 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type="jpeg", array $options=array())
+    {
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -258,8 +297,9 @@ 
             return false;
         }
         $method = "optimize_$type";
-        if (method_exists($this, $method) && !$this->$method($options))
-            return false;
+        if (method_exists($this, $method) && !$this->$method($options)) {
+                    return false;
+        }
 
         if (!isset($options['file'])) {
             if (!headers_sent()) {
@@ -289,7 +329,8 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options=array())
+    {
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setImageCompression(Imagick::COMPRESSION_JPEG);