evolution-cms / evolution

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);

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

Indentation +19 added lines, -19 removed lines

@@ -1,29 +1,29 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Input class for GET, POST and COOKIE requests
-  *   @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 Input class for GET, POST and COOKIE requests
+ *   @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 input {
 
-  /** Filtered $_GET array
-    * @var array */
+    /** Filtered $_GET array
+     * @var array */
     public $get;
 
-  /** Filtered $_POST array
-    * @var array */
+    /** Filtered $_POST array
+     * @var array */
     public $post;
 
-  /** Filtered $_COOKIE array
-    * @var array */
+    /** Filtered $_COOKIE array
+     * @var array */
     public $cookie;
 
     public function __construct() {
@@ -32,9 +32,9 @@ 
         $this->cookie = &$_COOKIE;
     }
 
-  /** Magic method to get non-public properties like public.
-    * @param string $property
-    * @return mixed */
+    /** Magic method to get non-public properties like public.
+     * @param string $property
+     * @return mixed */
 
     public function __get($property) {
         return property_exists($this, $property) ? $this->$property : null;

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class input {
+class input{
 
   /** Filtered $_GET array
     * @var array */
@@ -26,7 +26,7 @@ 
     * @var array */
     public $cookie;
 
-    public function __construct() {
+    public function __construct(){
         $this->get = &$_GET;
         $this->post = &$_POST;
         $this->cookie = &$_COOKIE;
@@ -36,7 +36,7 @@ 
     * @param string $property
     * @return mixed */
 
-    public function __get($property) {
+    public function __get($property){
         return property_exists($this, $property) ? $this->$property : null;
     }
 }

Braces +6 added lines, -3 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class input {
+class input
+{
 
   /** Filtered $_GET array
     * @var array */
@@ -26,7 +27,8 @@ 
     * @var array */
     public $cookie;
 
-    public function __construct() {
+    public function __construct()
+    {
         $this->get = &$_GET;
         $this->post = &$_POST;
         $this->cookie = &$_COOKIE;
@@ -36,7 +38,8 @@ 
     * @param string $property
     * @return mixed */
 
-    public function __get($property) {
+    public function __get($property)
+    {
         return property_exists($this, $property) ? $this->$property : null;
     }
 }

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

Indentation +31 added lines, -31 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Path helper class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Path helper class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class path {
 
-  /** Get the absolute URL path of the given one. Returns FALSE if the URL
-    * is not valid or the current directory cannot be resolved (getcwd())
-    * @param string $path
-    * @return string */
+    /** Get the absolute URL path of the given one. Returns FALSE if the URL
+     * is not valid or the current directory cannot be resolved (getcwd())
+     * @param string $path
+     * @return string */
 
     static function rel2abs_url($path) {
         if (substr($path, 0, 1) == "/") return $path;
@@ -39,10 +39,10 @@ 
         return $return;
     }
 
-  /** Resolve full filesystem path of given URL. Returns FALSE if the URL
-    * cannot be resolved
-    * @param string $url
-    * @return string */
+    /** Resolve full filesystem path of given URL. Returns FALSE if the URL
+     * cannot be resolved
+     * @param string $url
+     * @return string */
 
     static function url2fullPath($url) {
         $url = self::normalize($url);
@@ -84,13 +84,13 @@ 
         }
     }
 
-  /** Normalize the given path. On Windows servers backslash will be replaced
-    * with slash. Remobes unnecessary doble slashes and double dots. Removes
-    * last slash if it exists. Examples:
-    * path::normalize("C:\\any\\path\\") returns "C:/any/path"
-    * path::normalize("/your/path/..//home/") returns "/your/home"
-    * @param string $path
-    * @return string */
+    /** Normalize the given path. On Windows servers backslash will be replaced
+     * with slash. Remobes unnecessary doble slashes and double dots. Removes
+     * last slash if it exists. Examples:
+     * path::normalize("C:\\any\\path\\") returns "C:/any/path"
+     * path::normalize("/your/path/..//home/") returns "/your/home"
+     * @param string $path
+     * @return string */
 
     static function normalize($path) {
         if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN") {
@@ -114,9 +114,9 @@ 
         return $path;
     }
 
-  /** Encode URL Path
-    * @param string $path
-    * @return string */
+    /** Encode URL Path
+     * @param string $path
+     * @return string */
 
     static function urlPathEncode($path) {
         $path = self::normalize($path);
@@ -127,9 +127,9 @@ 
         return $encoded;
     }
 
-  /** Decode URL Path
-    * @param string $path
-    * @return string */
+    /** Decode URL Path
+     * @param string $path
+     * @return string */
 
     static function urlPathDecode($path) {
         $path = self::normalize($path);

Spacing +14 added lines, -14 removed lines

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

Braces +54 added lines, -29 removed lines

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

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

Indentation +30 added lines, -30 removed lines

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

Spacing +6 added lines, -6 removed lines

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

Braces +31 added lines, -14 removed lines

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

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

Indentation +25 added lines, -25 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Text processing helper class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Text processing helper class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class text {
 
-  /** Replace repeated white spaces to single space
-    * @param string $string
-    * @return string */
+    /** Replace repeated white spaces to single space
+     * @param string $string
+     * @return string */
 
     static function clearWhitespaces($string) {
         return trim(preg_replace('/\s+/s', " ", $string));
     }
 
-  /** Normalize the string for HTML attribute value
-    * @param string $string
-    * @return string */
+    /** Normalize the string for HTML attribute value
+     * @param string $string
+     * @return string */
 
     static function htmlValue($string) {
         return
@@ -35,9 +35,9 @@ 
         $string))));
     }
 
-  /** Normalize the string for JavaScript string value
-    * @param string $string
-    * @return string */
+    /** Normalize the string for JavaScript string value
+     * @param string $string
+     * @return string */
 
     static function jsValue($string) {
         return
@@ -48,9 +48,9 @@ 
         $string))));
     }
 
-  /** Normalize the string for XML tag content data
-    * @param string $string
-    * @param bool $cdata */
+    /** Normalize the string for XML tag content data
+     * @param string $string
+     * @param bool $cdata */
 
     static function xmlData($string, $cdata=false) {
         $string = str_replace("]]>", "]]]]><![CDATA[>", $string);
@@ -59,9 +59,9 @@ 
         return $string;
     }
 
-  /** Returns compressed content of given CSS code
-    * @param string $code
-    * @return string */
+    /** Returns compressed content of given CSS code
+     * @param string $code
+     * @return string */
 
     static function compressCSS($code) {
         $code = self::clearWhitespaces($code);

Spacing +6 added lines, -6 removed lines

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

Braces +15 added lines, -8 removed lines

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