evolution-cms / evolution

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

Doc Comments +9 added lines

@@ -783,6 +783,9 @@ 
         }
     }
 
+    /**
+     * @param string $dir
+     */
     protected function moveUploadFile($file, $dir)
     {
         $message = $this->checkUploadedFile($file);
@@ -817,6 +820,9 @@ 
         return "/" . basename($target);
     }
 
+    /**
+     * @param string $file
+     */
     protected function sendDefaultThumb($file=null)
     {
         if ($file !== null) {
@@ -1028,6 +1034,9 @@ 
         return "";
     }
 
+    /**
+     * @param string $message
+     */
     protected function errorMsg($message, array $data=null)
     {
         if (in_array($this->action, array("thumb", "upload", "download", "downloadDir"))) {

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Browser actions 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 Browser actions 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 browser extends uploader
 {

Spacing +52 added lines, -52 removed lines

@@ -38,7 +38,7 @@ 
             $this->get['dir'] = $dir;
         }
 
-        $thumbsDir = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'];
+        $thumbsDir = $this->config['uploadDir']."/".$this->config['thumbsDir'];
         if ((
                 !is_dir($thumbsDir) &&
                 !@mkdir($thumbsDir, $this->config['dirPerms'])
@@ -108,7 +108,7 @@ 
             $this->session['dir'] = $this->type;
         } else {
             $type = $this->getTypeFromPath($this->session['dir']);
-            $dir = $this->config['uploadDir'] . "/" . $this->session['dir'];
+            $dir = $this->config['uploadDir']."/".$this->session['dir'];
             if (($type != $this->type) || !is_dir($dir) || !is_readable($dir)) {
                 $this->session['dir'] = $this->type;
             }
@@ -172,7 +172,7 @@ 
         }
         $file = "{$this->thumbsDir}/{$this->type}/{$this->get['dir']}/$file";
         if (!is_file($file) || !is_readable($file)) {
-            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/" . basename($file);
+            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/".basename($file);
             if (!is_file($file) || !is_readable($file)) {
                 $this->sendDefaultThumb($file);
             }
@@ -205,7 +205,7 @@ 
     protected function act_chDir()
     {
         $this->postDir(); // Just for existing check
-        $this->session['dir'] = $this->type . "/" . $this->post['dir'];
+        $this->session['dir'] = $this->type."/".$this->post['dir'];
         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");
         return json_encode(array(
             'files' => $this->getFiles($this->session['dir']),
@@ -262,12 +262,12 @@ 
         if (substr($newName, 0, 1) == ".") {
             $this->errorMsg("Folder name shouldn't begins with '.'");
         }
-        if (!@rename($dir, dirname($dir) . "/$newName")) {
+        if (!@rename($dir, dirname($dir)."/$newName")) {
             $this->errorMsg("Cannot rename the folder.");
         }
         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";
         if (is_dir($thumbDir)) {
-            @rename($thumbDir, dirname($thumbDir) . "/$newName");
+            @rename($thumbDir, dirname($thumbDir)."/$newName");
         }
         return json_encode(array('name' => $newName));
     }
@@ -332,7 +332,7 @@ 
         $dir = $this->postDir();
         if (!isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'], '../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file)
         ) {
@@ -344,9 +344,9 @@ 
         header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
         header("Cache-Control: private", false);
         header("Content-Type: application/octet-stream");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $this->post['file']) . '"');
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $this->post['file']).'"');
         header("Content-Transfer-Encoding:­ binary");
-        header("Content-Length: " . filesize($file));
+        header("Content-Length: ".filesize($file));
         readfile($file);
         die;
     }
@@ -357,7 +357,7 @@ 
         if (!$this->config['access']['files']['rename'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'], '../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             !isset($this->post['newName']) ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file)
@@ -400,7 +400,7 @@ 
         $thumbFile = "$thumbDir/{$this->post['file']}";
 
         if (file_exists($thumbFile)) {
-            @rename($thumbFile, "$thumbDir/" . basename($newName));
+            @rename($thumbFile, "$thumbDir/".basename($newName));
         }
         return true;
     }
@@ -411,7 +411,7 @@ 
         if (!$this->config['access']['files']['delete'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'], '../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file) ||
             !@unlink($file)
@@ -456,11 +456,11 @@ 
             if (!file_exists($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             } elseif (substr($base, 0, 1) == ".") {
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             } elseif (!$this->validateExtension($ext, $type)) {
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             } elseif (file_exists("$dir/$base")) {
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             } elseif (!is_readable($path) || !is_file($path)) {
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             } elseif (!@copy($path, "$dir/$base")) {
@@ -516,11 +516,11 @@ 
             if (!file_exists($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             } elseif (substr($base, 0, 1) == ".") {
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             } elseif (!$this->validateExtension($ext, $type)) {
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             } elseif (file_exists("$dir/$base")) {
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             } elseif (!is_readable($path) || !is_file($path)) {
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             } elseif (!file::isWritable($path) || !@rename($path, "$dir/$base")) {
@@ -593,15 +593,15 @@ 
         if (!isset($this->post['dir']) || $this->config['denyZipDownload']) {
             $this->errorMsg("Unknown error.");
         }
-        $filename = basename($dir) . ".zip";
+        $filename = basename($dir).".zip";
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
         new zipFolder($file, $dir);
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $filename) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $filename).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -632,7 +632,7 @@ 
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -645,8 +645,8 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="selected_files_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="selected_files_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -672,7 +672,7 @@ 
             if ($type != $this->type) {
                 continue;
             }
-            $file = $this->config['uploadDir'] . "/$file";
+            $file = $this->config['uploadDir']."/$file";
             if (!is_file($file) || !is_readable($file)) {
                 continue;
             }
@@ -680,7 +680,7 @@ 
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -693,8 +693,8 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="clipboard_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="clipboard_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -746,23 +746,23 @@ 
         } elseif (
             function_exists("curl_init") &&
             (false !== ($curl = @curl_init($url))) &&
-            (@ob_start()                 ||  (@curl_close($curl) && false)) &&
-            (@curl_exec($curl)           ||  (@curl_close($curl) && false)) &&
-            ((false !== ($ver = @ob_get_clean())) ||  (@curl_close($curl) && false)) &&
-            (@curl_close($curl)          ||  true) &&
+            (@ob_start() || (@curl_close($curl) && false)) &&
+            (@curl_exec($curl) || (@curl_close($curl) && false)) &&
+            ((false !== ($ver = @ob_get_clean())) || (@curl_close($curl) && false)) &&
+            (@curl_close($curl) || true) &&
             preg_match($pattern, $ver)
 
         // Socket extension
         ) {
         } elseif (function_exists('socket_create')) {
             $cmd =
-                "GET $path " . strtoupper($protocol) . "/1.1\r\n" .
-                "Host: $host\r\n" .
+                "GET $path ".strtoupper($protocol)."/1.1\r\n".
+                "Host: $host\r\n".
                 "Connection: Close\r\n\r\n";
 
             if ((false !== ($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) &&
-                (false !==    @socket_connect($socket, $host, $port)) &&
-                (false !==    @socket_write($socket, $cmd, strlen($cmd))) &&
+                (false !== @socket_connect($socket, $host, $port)) &&
+                (false !== @socket_write($socket, $cmd, strlen($cmd))) &&
                 (false !== ($ver = @socket_read($socket, 2048))) &&
                 preg_match($responsePattern, $ver, $match)
             ) {
@@ -795,14 +795,14 @@ 
         }
 
         $filename = $this->normalizeFilename($file['name']);
-        $target = "$dir/" . file::getInexistantFilename($filename, $dir);
+        $target = "$dir/".file::getInexistantFilename($filename, $dir);
 
         if (!@move_uploaded_file($file['tmp_name'], $target) &&
             !@rename($file['tmp_name'], $target) &&
             !@copy($file['tmp_name'], $target)
         ) {
             @unlink($file['tmp_name']);
-            return "{$file['name']}: " . $this->label("Cannot move uploaded file to target folder.");
+            return "{$file['name']}: ".$this->label("Cannot move uploaded file to target folder.");
         } elseif (function_exists('chmod')) {
             chmod($target, $this->config['filePerms']);
         }
@@ -814,10 +814,10 @@ 
 
         $this->makeThumb($target);
 
-        return "/" . basename($target);
+        return "/".basename($target);
     }
 
-    protected function sendDefaultThumb($file=null)
+    protected function sendDefaultThumb($file = null)
     {
         if ($file !== null) {
             $ext = file::getExtension($file);
@@ -844,10 +844,10 @@ 
         foreach ($files as $file) {
             $ext = file::getExtension($file);
             $smallThumb = false;
-            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' ))) {
+            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg'))) {
                 $size = @getimagesize($file);
                 if (is_array($size) && count($size)) {
-                    $thumb_file = "$thumbDir/" . basename($file);
+                    $thumb_file = "$thumbDir/".basename($file);
                     if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file)) {
                         $this->makeThumb($file);
                     }
@@ -863,7 +863,7 @@ 
             }
             $name = basename($file);
             $types = $this->config['types'];
-            $types = explode(' ', $types['images'] . ' ' . $types['image']);
+            $types = explode(' ', $types['images'].' '.$types['image']);
             if (substr($name, 0, 1) == '.' && !$this->config['showHiddenFiles']) {
                 continue;
             }
@@ -889,7 +889,7 @@ 
         return $return;
     }
 
-    protected function getTree($dir, $index=0)
+    protected function getTree($dir, $index = 0)
     {
         $path = explode("/", $dir);
 
@@ -927,11 +927,11 @@ 
         return $dirs;
     }
 
-    protected function postDir($existent=true)
+    protected function postDir($existent = true)
     {
         $dir = $this->typeDir;
         if (isset($this->post['dir'])) {
-            $dir .= "/" . $this->post['dir'];
+            $dir .= "/".$this->post['dir'];
         }
         if ($existent && (!is_dir($dir) || !is_readable($dir))) {
             $this->errorMsg("Inexistant or inaccessible folder.");
@@ -939,11 +939,11 @@ 
         return $dir;
     }
 
-    protected function getDir($existent=true)
+    protected function getDir($existent = true)
     {
         $dir = $this->typeDir;
         if (isset($this->get['dir'])) {
-            $dir .= "/" . $this->get['dir'];
+            $dir .= "/".$this->get['dir'];
         }
         if ($existent && (!is_dir($dir) || !is_readable($dir))) {
             $this->errorMsg("Inexistant or inaccessible folder.");
@@ -969,7 +969,7 @@ 
         return $return;
     }
 
-    protected function getDirInfo($dir, $removable=false)
+    protected function getDirInfo($dir, $removable = false)
     {
         if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir)) {
             return false;
@@ -1002,7 +1002,7 @@ 
         return $info;
     }
 
-    protected function output($data=null, $template=null)
+    protected function output($data = null, $template = null)
     {
         if (!is_array($data)) {
             $data = array();
@@ -1028,7 +1028,7 @@ 
         return "";
     }
 
-    protected function errorMsg($message, array $data=null)
+    protected function errorMsg($message, array $data = null)
     {
         if (in_array($this->action, array("thumb", "upload", "download", "downloadDir"))) {
             die($this->label($message, $data));

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -756,7 +756,7 @@
         ) {
         } elseif (function_exists('socket_create')) {
             $cmd =
-                "GET $path " . strtoupper($protocol) . "/1.1\r\n" .
+                "get $path " . strtoupper($protocol) . "/1.1\r\n" .
                 "Host: $host\r\n" .
                 "Connection: Close\r\n\r\n";
 

manager/media/browser/mcpuk/core/uploader.php

Doc Comments +18 added lines

@@ -427,6 +427,9 @@ 
     }
 
 
+    /**
+     * @return string
+     */
     protected function normalizeFilename($filename)
     {
         if ($this->getTransaliasSettings()) {
@@ -437,6 +440,9 @@ 
         return $filename;
     }
 
+    /**
+     * @param string $dirname
+     */
     protected function normalizeDirname($dirname)
     {
         return $this->modx->stripAlias($dirname);
@@ -566,6 +572,9 @@ 
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
+    /**
+     * @param string $ext
+     */
     protected function validateExtension($ext, $type)
     {
         $ext = trim(strtolower($ext));
@@ -595,12 +604,18 @@ 
         return in_array($ext, $exts);
     }
 
+    /**
+     * @return string
+     */
     protected function getTypeFromPath($path)
     {
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
 
+    /**
+     * @param string $path
+     */
     protected function removeTypeFromPath($path)
     {
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
@@ -811,6 +826,9 @@ 
         die;
     }
 
+    /**
+     * @param string $url
+     */
     protected function callBack($url, $message="")
     {
         $message = text::jsValue($message);

Indentation +36 added lines, -36 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Uploader 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 Uploader 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 uploader
 {
@@ -19,92 +19,92 @@ 
     const VERSION = "2.54";
 
     /** Config session-overrided settings
-      * @var array */
+     * @var array */
     protected $config = array();
 
     /** Default image driver
-      * @var string */
+     * @var string */
     protected $imageDriver = "gd";
 
     /** Opener applocation properties
-      *   $opener['name']                 Got from $_GET['opener'];
-      *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
-      *   $opener['TinyMCE']              Boolean
-      * @var array */
+     *   $opener['name']                 Got from $_GET['opener'];
+     *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
+     *   $opener['TinyMCE']              Boolean
+     * @var array */
     protected $opener = array();
 
     /** Got from $_GET['type'] or first one $config['types'] array key, if inexistant
-      * @var string */
+     * @var string */
     protected $type;
 
     /** Helper property. Local filesystem path to the Type Directory
-      * Equivalent: $config['uploadDir'] . "/" . $type
-      * @var string */
+     * Equivalent: $config['uploadDir'] . "/" . $type
+     * @var string */
     protected $typeDir;
 
     /** Helper property. Web URL to the Type Directory
-      * Equivalent: $config['uploadURL'] . "/" . $type
-      * @var string */
+     * Equivalent: $config['uploadURL'] . "/" . $type
+     * @var string */
     protected $typeURL;
 
     /** Linked to $config['types']
-      * @var array */
+     * @var array */
     protected $types = array();
 
     /** Settings which can override default settings if exists as keys in $config['types'][$type] array
-      * @var array */
+     * @var array */
     protected $typeSettings = array('disabled', 'theme', 'dirPerms', 'filePerms', 'denyZipDownload', 'maxImageWidth', 'maxImageHeight', 'thumbWidth', 'thumbHeight', 'jpegQuality', 'access', 'filenameChangeChars', 'dirnameChangeChars', 'denyExtensionRename', 'deniedExts', 'watermark');
 
     /** Got from language file
-      * @var string */
+     * @var string */
     protected $charset;
 
     /** The language got from $_GET['lng'] or $_GET['lang'] or... Please see next property
-      * @var string */
+     * @var string */
     protected $lang = 'en';
 
     /** Possible language $_GET keys
-      * @var array */
+     * @var array */
     protected $langInputNames = array('lang', 'langCode', 'lng', 'language', 'lang_code');
 
     /** Uploaded file(s) info. Linked to first $_FILES element
-      * @var array */
+     * @var array */
     protected $file;
 
     /** Next three properties are got from the current language file
-      * @var string */
+     * @var string */
     protected $dateTimeFull;   // Currently not used
     protected $dateTimeMid;    // Currently not used
     protected $dateTimeSmall;
 
     /** Contain Specified language labels
-      * @var array */
+     * @var array */
     protected $labels = array();
 
     /** Contain unprocessed $_GET array. Please use this instead of $_GET
-      * @var array */
+     * @var array */
     protected $get;
 
     /** Contain unprocessed $_POST array. Please use this instead of $_POST
-      * @var array */
+     * @var array */
     protected $post;
 
     /** Contain unprocessed $_COOKIE array. Please use this instead of $_COOKIE
-      * @var array */
+     * @var array */
     protected $cookie;
 
     /** Session array. Please use this property instead of $_SESSION
-      * @var array */
+     * @var array */
     protected $session;
 
     /** CMS integration attribute (got from $_GET['cms'])
-      * @var string */
+     * @var string */
     protected $cms = "";
 
     protected $modx = null;
     /** Magic method which allows read-only access to protected or private class properties
-      * @param string $property
-      * @return mixed */
+     * @param string $property
+     * @return mixed */
     public function __get($property)
     {
         return property_exists($this, $property) ? $this->$property : null;

Spacing +26 added lines, -27 removed lines

@@ -73,8 +73,8 @@ 
 
     /** Next three properties are got from the current language file
       * @var string */
-    protected $dateTimeFull;   // Currently not used
-    protected $dateTimeMid;    // Currently not used
+    protected $dateTimeFull; // Currently not used
+    protected $dateTimeMid; // Currently not used
     protected $dateTimeSmall;
 
     /** Contain Specified language labels
@@ -227,7 +227,7 @@ 
 
         // COOKIES INIT
         $ip = '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-        $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
+        $ip = '/^'.implode('\.', array($ip, $ip, $ip, $ip)).'$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
         ) {
@@ -247,7 +247,7 @@ 
         ) {
             list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
             $path = path::normalize($path);
-            $this->config['uploadURL'] = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/$path";
+            $this->config['uploadURL'] = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/$path";
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
@@ -293,7 +293,7 @@ 
         foreach ($this->langInputNames as $key) {
             if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
-                file_exists("lang/" . strtolower($this->get[$key]) . ".php")
+                file_exists("lang/".strtolower($this->get[$key]).".php")
             ) {
                 $this->lang = $this->get[$key];
                 break;
@@ -364,7 +364,7 @@ 
                 }
 
                 $filename = $this->normalizeFilename($file['name']);
-                $target = file::getInexistantFilename($dir . $filename);
+                $target = file::getInexistantFilename($dir.$filename);
 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
@@ -380,11 +380,11 @@ 
                     if (isset($udir)) {
                         $url .= "/$udir";
                     }
-                    $url .= "/" . basename($target);
+                    $url .= "/".basename($target);
                     if (preg_match('/^([a-z]+)\:\/\/([^\/^\:]+)(\:(\d+))?\/(.+)$/', $url, $patt)) {
                         list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
-                        $base = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/";
-                        $url = $base . path::urlPathEncode($path);
+                        $base = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/";
+                        $url = $base.path::urlPathEncode($path);
                     } else {
                         $url = path::urlPathEncode($url);
                     }
@@ -412,7 +412,7 @@ 
 
         // Cleaning uploaded filename?
         $setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-        if ($modx->db->getValue($setting)>0) {
+        if ($modx->db->getValue($setting) > 0) {
             // Transalias plugin active?
             $res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
             if ($properties = $modx->db->getValue($res)) {
@@ -432,7 +432,7 @@ 
         if ($this->getTransaliasSettings()) {
             $format = strrchr($filename, ".");
             $filename = str_replace($format, "", $filename);
-            $filename = $this->modx->stripAlias($filename) . $format;
+            $filename = $this->modx->stripAlias($filename).$format;
         }
         return $filename;
     }
@@ -442,7 +442,7 @@ 
         return $this->modx->stripAlias($dirname);
     }
 
-    protected function checkUploadedFile(array $aFile=null)
+    protected function checkUploadedFile(array $aFile = null)
     {
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
@@ -484,8 +484,7 @@ 
                 ($file['error'] == UPLOAD_ERR_NO_TMP_DIR) ?
                     $this->label("Missing a temporary folder.") : (
                 ($file['error'] == UPLOAD_ERR_CANT_WRITE) ?
-                    $this->label("Failed to write file.") :
-                    $this->label("Unknown error.")
+                    $this->label("Failed to write file.") : $this->label("Unknown error.")
             )))));
         }
 
@@ -527,15 +526,15 @@ 
 
 
         // CHECK FOR MODX MAX FILE SIZE
-        $actualfilesize=filesize($file['tmp_name']);
+        $actualfilesize = filesize($file['tmp_name']);
         if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize']) {
-            return $this->label("File is too big: " . $actualfilesize . " Bytes. (max " . $this->config['maxfilesize'] . " Bytes)");
+            return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
         }
 
         return true;
     }
 
-    protected function checkInputDir($dir, $inclType=true, $existing=true)
+    protected function checkInputDir($dir, $inclType = true, $existing = true)
     {
         $dir = path::normalize($dir);
         if (substr($dir, 0, 1) == "/") {
@@ -607,7 +606,7 @@ 
             ? $patt[1] : "";
     }
 
-    protected function imageResize($image, $file=null)
+    protected function imageResize($image, $file = null)
     {
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
@@ -702,7 +701,7 @@ 
             $img->watermark($this->config['watermark']['file'], $left, $top);
         }
 
-        $options = array( 'file' => $file );
+        $options = array('file' => $file);
 
         $type = exif_imagetype($file);
 
@@ -714,11 +713,11 @@ 
                 return $img->output('png', $options);
 
             default:
-                return $img->output('jpeg', array_merge($options, array( 'quality' => $this->config['jpegQuality'] )));
+                return $img->output('jpeg', array_merge($options, array('quality' => $this->config['jpegQuality'])));
         }
     }
 
-    protected function makeThumb($file, $overwrite=true)
+    protected function makeThumb($file, $overwrite = true)
     {
         $img = image::factory($this->imageDriver, $file);
 
@@ -728,7 +727,7 @@ 
         }
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
-        $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
+        $thumb = $this->config['uploadDir']."/".$this->config['thumbsDir']."/".$thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
         if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true)) {
@@ -757,8 +756,8 @@ 
         if ($this->imageDriver == 'gd') {
             $width  = imagesx($img->image);
             $height = imagesy($img->image);
-            $back   = image::factory($this->imageDriver, array( $width, $height ));
-            $tile   = image::factory($this->imageDriver, __DIR__ . '/../themes/' . $this->config['theme'] . '/img/bg_transparent.png');
+            $back   = image::factory($this->imageDriver, array($width, $height));
+            $tile   = image::factory($this->imageDriver, __DIR__.'/../themes/'.$this->config['theme'].'/img/bg_transparent.png');
 
             imagesettile($back->image, $tile->image);
             imagefilledrectangle($back->image, 0, 0, $width, $height, IMG_COLOR_TILED);
@@ -790,7 +789,7 @@ 
         $this->labels = $lang;
     }
 
-    protected function label($string, array $data=null)
+    protected function label($string, array $data = null)
     {
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
         if (is_array($data)) {
@@ -801,7 +800,7 @@ 
         return $return;
     }
 
-    protected function backMsg($message, array $data=null)
+    protected function backMsg($message, array $data = null)
     {
         $message = $this->label($message, $data);
         if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name'])) {
@@ -811,7 +810,7 @@ 
         die;
     }
 
-    protected function callBack($url, $message="")
+    protected function callBack($url, $message = "")
     {
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])

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

Doc Comments +6 added lines

@@ -177,6 +177,9 @@ 
     }
 
 
+    /**
+     * @param integer $n
+     */
     private function getChars($n)
     {
         $response = null;
@@ -214,6 +217,9 @@ 
     }
 
 
+    /**
+     * @param false|string $str
+     */
     private function readInt($str)
     {
         $size = unpack("C*", $str);

Spacing +3 added lines, -3 removed lines

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

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

Doc Comments +8 added lines, -2 removed lines

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

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

       * @param integer $bigger_size

-      * @return array */

+      * @return integer[] */

 

     public function get_prop_size($bigger_size)

     {

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

       * @param integer $width

       * @param integer $height

-      * @return bool */

+      * @return gd */

 

     public function resize_overflow($width, $height)

     {

@@ -437,6 +437,12 @@ 
         }

     }

 

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

     {

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

Indentation +54 added lines, -54 removed lines

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

 

 /** This file is part of KCFinder project

-  *

-  *      @desc GD extension class

-  *   @package KCFinder

-  *   @version 2.51

-  *    @author Pavel Tzonkov <pavelc@users.sourceforge.net>

-  * @copyright 2010, 2011 KCFinder Project

-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2

-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2

-  *      @link http://kcfinder.sunhater.com

-  */

+ *

+ *      @desc GD extension class

+ *   @package KCFinder

+ *   @version 2.51

+ *    @author Pavel Tzonkov <pavelc@users.sourceforge.net>

+ * @copyright 2010, 2011 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 gd

 {

 

-  /** GD resource

-    * @var resource */

+    /** GD resource

+     * @var resource */

     protected $image;

 

     /** Image width

-      * @var integer */

+     * @var integer */

     protected $width;

 

     /** Image height

-      * @var integer */

+     * @var integer */

     protected $height;

 

     /** Init error

-      * @var bool */

+     * @var bool */

     public $init_error = false;

 

     /** Last builded image type constant (IMAGETYPE_XXX)

-      * @var integer */

+     * @var integer */

     public $type;

 

     /** Returns an array. Element 0 - GD resource. Element 1 - width. Element 2 - height.

-      * Returns FALSE on failure. The only one parameter $image can be an instance of this class,

-      * a GD resource, an array(width, height) or path to image file.

-      * @param mixed $image

-      * @return array */

+     * Returns FALSE on failure. The only one parameter $image can be an instance of this class,

+     * a GD resource, an array(width, height) or path to image file.

+     * @param mixed $image

+     * @return array */

 

     protected function build_image($image)

     {

@@ -88,15 +88,15 @@ 
     }

 

     /** Parameter $image can be:

-      *   1. An instance of this class (copy instance).

-      *   2. A GD resource.

-      *   3. An array with two elements. First - width, second - height. Create a blank image.

-      *   4. A filename string. Get image form file.

-      * The non-required parameter $bigger_size is the bigger dimension (width or height) the image

-      * will be resized to. The other dimension (height or width) will be calculated autamaticaly

-      * @param mixed $image

-      * @param integer $bigger_size

-      * @return gd */

+     *   1. An instance of this class (copy instance).

+     *   2. A GD resource.

+     *   3. An array with two elements. First - width, second - height. Create a blank image.

+     *   4. A filename string. Get image form file.

+     * The non-required parameter $bigger_size is the bigger dimension (width or height) the image

+     * will be resized to. The other dimension (height or width) will be calculated autamaticaly

+     * @param mixed $image

+     * @param integer $bigger_size

+     * @return gd */

 

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

     {

@@ -126,7 +126,7 @@ 
     }

 

     /** Returns the GD resource

-      * @return resource */

+     * @return resource */

 

     public function get_image()

     {

@@ -134,7 +134,7 @@ 
     }

 

     /** Returns the image width

-      * @return integer */

+     * @return integer */

 

     public function get_width()

     {

@@ -142,7 +142,7 @@ 
     }

 

     /** Returns the image height

-      * @return integer */

+     * @return integer */

 

     public function get_height()

     {

@@ -150,8 +150,8 @@ 
     }

 

     /** Returns calculated proportional width from the given height

-      * @param integer $resized_height

-      * @return integer */

+     * @param integer $resized_height

+     * @return integer */

 

     public function get_prop_width($resized_height)

     {

@@ -163,8 +163,8 @@ 
     }

 

     /** Returns calculated proportional height from the given width

-      * @param integer $resized_width

-      * @return integer */

+     * @param integer $resized_width

+     * @return integer */

 

     public function get_prop_height($resized_width)

     {

@@ -176,10 +176,10 @@ 
     }

 

     /** Returns an array with calculated proportional width & height.

-      * The parameter $bigger_size is the bigger dimension (width or height) of calculated sizes.

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

-      * @param integer $bigger_size

-      * @return array */

+     * The parameter $bigger_size is the bigger dimension (width or height) of calculated sizes.

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

+     * @param integer $bigger_size

+     * @return array */

 

     public function get_prop_size($bigger_size)

     {

@@ -197,9 +197,9 @@ 
     }

 

     /** Resize image. Returns TRUE on success or FALSE on failure

-      * @param integer $width

-      * @param integer $height

-      * @return bool */

+     * @param integer $width

+     * @param integer $height

+     * @return bool */

 

     public function resize($width, $height)

     {

@@ -219,9 +219,9 @@ 
     }

 

     /** Resize the given image source (GD, gd object or image file path) to fit in the own image.

-      * The outside ares will be cropped out. Returns TRUE on success or FALSE on failure

-      * @param mixed $src

-      * @return bool */

+     * The outside ares will be cropped out. Returns TRUE on success or FALSE on failure

+     * @param mixed $src

+     * @return bool */

 

     public function resize_crop($src)

     {

@@ -249,9 +249,9 @@ 
     }

 

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

-      * @param integer $width

-      * @param integer $height

-      * @return bool */

+     * @param integer $width

+     * @param integer $height

+     * @return bool */

 

     public function resize_fit($width, $height)

     {

@@ -273,11 +273,11 @@ 
     }

 

     /** Neka si predstavim vyobrazhaem pravoygylnik s razmeri $width i $height.

-      * Izobrazhenieto shte se preorazmeri taka che to shte izliza ot tozi pravoygylnik,

-      * no samo po edno (x ili y) izmerenie

-      * @param integer $width

-      * @param integer $height

-      * @return bool */

+     * Izobrazhenieto shte se preorazmeri taka che to shte izliza ot tozi pravoygylnik,

+     * no samo po edno (x ili y) izmerenie

+     * @param integer $width

+     * @param integer $height

+     * @return bool */

 

     public function resize_overflow($width, $height)

     {

Spacing +22 added lines, -22 removed lines

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

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

             $image =

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

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

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

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

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

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

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

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

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

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

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

             )))));

 

             if ($type == IMAGETYPE_PNG) {

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

       * @return gd */

 

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

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

     {

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

 

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

     public function imagecopy(

         $src,

-        $dst_x=0, $dst_y=0,

-        $src_x=0, $src_y=0,

-        $dst_w=null, $dst_h=null,

-        $src_w=null, $src_h=null

-    ) {

+        $dst_x = 0, $dst_y = 0,

+        $src_x = 0, $src_y = 0,

+        $dst_w = null, $dst_h = null,

+        $src_w = null, $src_h = null

+    ){

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

 

         if ($image_details !== false) {

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

     public function imagecopyresampled(

         $src,

-        $dst_x=0, $dst_y=0,

-        $src_x=0, $src_y=0,

-        $dst_w=null, $dst_h=null,

-        $src_w=null, $src_h=null

-    ) {

+        $dst_x = 0, $dst_y = 0,

+        $src_x = 0, $src_y = 0,

+        $dst_w = null, $dst_h = null,

+        $src_w = null, $src_h = null

+    ){

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

 

         if ($image_details !== false) {

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

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

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

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

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

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

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

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

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

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

                         }

                     }

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

     }

 

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

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

     {

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

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

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

     }

 

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

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

     {

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

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

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

     }

 

-    public function imagegif($filename=null)

+    public function imagegif($filename = null)

     {

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

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

Braces +94 added lines, -94 removed lines

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

   */

 

-class gd

-{

+class gd
+{
 

   /** GD resource

     * @var resource */

@@ -41,20 +41,20 @@ 
       * @param mixed $image

       * @return array */

 

-    protected function build_image($image)

-    {

-        if ($image instanceof gd) {

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

             $height = $image->get_height();

             $image = $image->get_image();

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

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

             $height = @imagesy($image);

-        } elseif (is_array($image)) {

+        } elseif (is_array($image)) {
             list($key, $width) = each($image);

             list($key, $height) = each($image);

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

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

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

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

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

@@ -64,7 +64,7 @@ 
                 ($type == IMAGETYPE_XBM)      ? @imagecreatefromxbm($image)  : false

             )))));

 

-            if ($type == IMAGETYPE_PNG) {

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

             }

         }

@@ -80,7 +80,7 @@ 
             ? array($image, $width, $height)

             : false;

 

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

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

         }

 

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

       * @return gd */

 

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

-    {

+    public function __construct($image, $bigger_size=null)
+    {
         $this->image = $this->width = $this->height = null;

 

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

 

-        if ($image_details !== false) {

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

-        } else {

+        } else {
             $this->init_error = true;

         }

 

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

             !is_null($bigger_size) &&

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

-        ) {

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

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

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

@@ -128,24 +128,24 @@ 
     /** Returns the GD resource

       * @return resource */

 

-    public function get_image()

-    {

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

     }

 

     /** Returns the image width

       * @return integer */

 

-    public function get_width()

-    {

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

     }

 

     /** Returns the image height

       * @return integer */

 

-    public function get_height()

-    {

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

     }

 

@@ -153,10 +153,10 @@ 
       * @param integer $resized_height

       * @return integer */

 

-    public function get_prop_width($resized_height)

-    {

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

-        if (!$width) {

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

         }

         return $width;

@@ -166,10 +166,10 @@ 
       * @param integer $resized_width

       * @return integer */

 

-    public function get_prop_height($resized_width)

-    {

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

-        if (!$height) {

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

         }

         return $height;

@@ -181,15 +181,15 @@ 
       * @param integer $bigger_size

       * @return array */

 

-    public function get_prop_size($bigger_size)

-    {

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

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

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

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

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

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

-        } else {

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

         }

 

@@ -201,12 +201,12 @@ 
       * @param integer $height

       * @return bool */

 

-    public function resize($width, $height)

-    {

-        if (!$width) {

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

         }

-        if (!$height) {

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

         }

         return (

@@ -223,19 +223,19 @@ 
       * @param mixed $src

       * @return bool */

 

-    public function resize_crop($src)

-    {

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

 

-        if ($image_details !== false) {

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

 

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

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

                 $src_h = $src_height;

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

                 $src_y = 0;

-            } else {

+            } else {
                 $src_w = $src_width;

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

                 $src_x = 0;

@@ -243,7 +243,7 @@ 
             }

 

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

-        } else {

+        } else {
             return false;

         }

     }

@@ -253,20 +253,20 @@ 
       * @param integer $height

       * @return bool */

 

-    public function resize_fit($width, $height)

-    {

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

+    public function resize_fit($width, $height)
+    {
+        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height))) {
             return true;

         }

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

+        if (!$width || (($height / $width) < ($this->height / $this->width))) {
             $width = intval(($this->width * $height) / $this->height);

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

+        } elseif (!$height || (($width / $height) < ($this->width / $this->height))) {
             $height = intval(($this->height * $width) / $this->width);

         }

-        if (!$width) {

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

         }

-        if (!$height) {

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

         }

         return $this->resize($width, $height);

@@ -279,8 +279,8 @@ 
       * @param integer $height

       * @return bool */

 

-    public function resize_overflow($width, $height)

-    {

+    public function resize_overflow($width, $height)
+    {
         $big = (($this->width / $this->height) > ($width / $height))

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

             : ($this->height * $width) / $this->width;

@@ -288,7 +288,7 @@ 
 

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

 

-        if ($return) {

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

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

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

@@ -297,8 +297,8 @@ 
         return $return;

     }

 

-    public function gd_color()

-    {

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

 

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

@@ -306,20 +306,20 @@ 
         $expr_hex2 = '/^\#?([0-9a-f])([0-9a-f])([0-9a-f])$/i';

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

 

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

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

         }

 

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

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

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

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

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

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

             $r = hexdec($r);

             $g = hexdec($g);

             $b = hexdec($b);

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

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

             $r = hexdec($r);

             $g = hexdec($g);

@@ -328,17 +328,17 @@ 
             preg_match($expr_byte, $args[0]) &&

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

             preg_match($expr_byte, $args[2])

-        ) {

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

-        } else {

+        } else {
             return false;

         }

 

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

     }

 

-    public function fill_color($color)

-    {

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

     }

 

@@ -351,26 +351,26 @@ 
         $src_x=0, $src_y=0,

         $dst_w=null, $dst_h=null,

         $src_w=null, $src_h=null

-    ) {

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

 

-        if ($image_details !== false) {

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

 

-            if (is_null($dst_w)) {

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

             }

-            if (is_null($dst_h)) {

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

             }

-            if (is_null($src_w)) {

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

             }

-            if (is_null($src_h)) {

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

             }

             return imagecopy($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h);

-        } else {

+        } else {
             return false;

         }

     }

@@ -381,22 +381,22 @@ 
         $src_x=0, $src_y=0,

         $dst_w=null, $dst_h=null,

         $src_w=null, $src_h=null

-    ) {

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

 

-        if ($image_details !== false) {

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

 

-            if (is_null($dst_w)) {

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

             }

-            if (is_null($dst_h)) {

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

             }

-            if (is_null($src_w)) {

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

             }

-            if (is_null($src_h)) {

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

             }

             imagealphablending($this->image, false);

@@ -409,7 +409,7 @@ 
 

             $transindex = imagecolortransparent($src);

             $palletsize = imagecolorstotal($src);

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

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

 

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

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

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

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

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

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

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

+                for ($y=0; $y<$dst_h; ++$y) {
+                    for ($x=0; $x<$dst_w; ++$x) {
+                        if (((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) {
                             imagesetpixel($this->image, $x, $y, $transindex);

                         }

                     }

                 }

                 imagetruecolortopalette($this->image, true, 255);

-            } else {

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

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

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

             }

             return $this->image;

-        } else {

+        } else {
             return false;

         }

     }

 

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

-    {

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

-        if ($color === false) {

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

         }

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

     }

 

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

-    {

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

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

         }

         @imagesavealpha($this->image, true);

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

     }

 

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

-    {

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

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

         }

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

     }

 

-    public function imagegif($filename=null)

-    {

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

+    public function imagegif($filename=null)
+    {
+        if (is_null($filename) && !headers_sent()) {
             header("Content-Type: image/gif");

         }

         @imagesavealpha($this->image, true);

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

Doc Comments -1 removed lines

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

Indentation +93 added lines, -93 removed lines

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

Spacing +8 added lines, -8 removed lines

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

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

Doc Comments +5 added lines

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

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc GD image driver class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc GD image driver class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class image_gd extends image
 {

Spacing +16 added lines, -16 removed lines

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

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

Doc Comments +6 added lines

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

Indentation +11 added lines, -11 removed lines

@@ -1,17 +1,17 @@
 <?php
 
 /** This file is part of KCFinder project. The class are taken from
-  * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
-  *
-  *      @desc Directory to ZIP file archivator
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ * http://www.php.net/manual/en/function.ziparchive-addemptydir.php
+ *
+ *      @desc Directory to ZIP file archivator
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class zipFolder
 {

Spacing +2 added lines, -2 removed lines

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

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

Doc Comments -2 removed lines

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

Indentation +44 added lines, -44 removed lines

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

Spacing +5 added lines, -5 removed lines

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

index.php

Spacing +11 added lines, -11 removed lines

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