evolution-cms / evolution

manager/includes/controls/phpmailer/PHPMailer.php

Doc Comments +1 added lines, -1 removed lines

@@ -3968,7 +3968,7 @@
      * @param int|string $options Either a PATHINFO_* constant,
      *                            or a string name to return only the specified piece
      *
-     * @return string|array
+     * @return string
      */
     public static function mb_pathinfo($path, $options = null)
     {

manager/includes/controls/phpmailer/POP3.php

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
      * Connect to a POP3 server.
      *
      * @param string   $host
-     * @param int|bool $port
+     * @param integer $port
      * @param int      $tval
      *
      * @return bool

manager/includes/controls/phpmailer/SMTP.php

Doc Comments +1 added lines, -1 removed lines

@@ -1314,7 +1314,7 @@
      * If no reply has been received yet, it will return null.
      * If no pattern was matched, it will return false.
      *
-     * @return bool|null|string
+     * @return string
      *
      * @see recordLastTransactionID()
      */

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

Doc Comments +9 added lines

@@ -666,6 +666,9 @@ 
             return json_encode(array('version' => false));
     }
 
+    /**
+     * @param string $dir
+     */
     protected function moveUploadFile($file, $dir) {
         $message = $this->checkUploadedFile($file);
 
@@ -697,6 +700,9 @@ 
         return "/" . basename($target);
     }
 
+    /**
+     * @param string $file
+     */
     protected function sendDefaultThumb($file=null) {
         if ($file !== null) {
             $ext = file::getExtension($file);
@@ -873,6 +879,9 @@ 
         return "";
     }
 
+    /**
+     * @param string $message
+     */
     protected function errorMsg($message, array $data=null) {
         if (in_array($this->action, array("thumb", "upload", "download", "downloadDir")))
             die($this->label($message, $data));

Indentation +58 added lines, -58 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 {
     protected $action;
@@ -709,54 +709,54 @@ 
         die;
     }
 
-	protected function getFiles($dir) {
-		$thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";
-		$dir = "{$this->config['uploadDir']}/$dir";
-		$return = array();
-		$files = dir::content($dir, array('types' => "file"));
-		if ($files === false)
-			return $return;
-
-		foreach ($files as $file) {
-			$ext = file::getExtension($file);
-			$smallThumb = false;
-			if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' )) ) {
-				$size = @getimagesize($file);
-				if (is_array($size) && count($size)) {
-					$thumb_file = "$thumbDir/" . basename($file);
-					if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file))
-						$this->makeThumb($file);
-					$smallThumb =
-						($size[0] <= $this->config['thumbWidth']) &&
-						($size[1] <= $this->config['thumbHeight']) &&
-						in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_JPEG));
-				}
-			}
-			$stat = stat($file);
-			if ($stat === false) continue;
-			$name = basename($file);
-			$types = $this->config['types'];
-			$types = explode(' ',$types['images'].' '.$types['image']);
-			if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) continue;
-			if ($this->type == 'images' && !in_array(strtolower($ext),$types)) continue;
-			$bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png");
-			$smallIcon = file_exists("themes/{$this->config['theme']}/img/files/small/$ext.png");
-			$thumb = file_exists("$thumbDir/$name");
-			$return[] = array(
-				'name' => stripcslashes($name),
-				'size' => $stat['size'],
-				'mtime' => $stat['mtime'],
-				'date' => @strftime($this->dateTimeSmall, $stat['mtime']),
-				'readable' => is_readable($file),
-				'writable' => file::isWritable($file),
-				'bigIcon' => $bigIcon,
-				'smallIcon' => $smallIcon,
-				'thumb' => $thumb,
-				'smallThumb' => $smallThumb
-			);
-		}
-		return $return;
-	}
+    protected function getFiles($dir) {
+        $thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";
+        $dir = "{$this->config['uploadDir']}/$dir";
+        $return = array();
+        $files = dir::content($dir, array('types' => "file"));
+        if ($files === false)
+            return $return;
+
+        foreach ($files as $file) {
+            $ext = file::getExtension($file);
+            $smallThumb = false;
+            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' )) ) {
+                $size = @getimagesize($file);
+                if (is_array($size) && count($size)) {
+                    $thumb_file = "$thumbDir/" . basename($file);
+                    if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file))
+                        $this->makeThumb($file);
+                    $smallThumb =
+                        ($size[0] <= $this->config['thumbWidth']) &&
+                        ($size[1] <= $this->config['thumbHeight']) &&
+                        in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_JPEG));
+                }
+            }
+            $stat = stat($file);
+            if ($stat === false) continue;
+            $name = basename($file);
+            $types = $this->config['types'];
+            $types = explode(' ',$types['images'].' '.$types['image']);
+            if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) continue;
+            if ($this->type == 'images' && !in_array(strtolower($ext),$types)) continue;
+            $bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png");
+            $smallIcon = file_exists("themes/{$this->config['theme']}/img/files/small/$ext.png");
+            $thumb = file_exists("$thumbDir/$name");
+            $return[] = array(
+                'name' => stripcslashes($name),
+                'size' => $stat['size'],
+                'mtime' => $stat['mtime'],
+                'date' => @strftime($this->dateTimeSmall, $stat['mtime']),
+                'readable' => is_readable($file),
+                'writable' => file::isWritable($file),
+                'bigIcon' => $bigIcon,
+                'smallIcon' => $smallIcon,
+                'thumb' => $thumb,
+                'smallThumb' => $smallThumb
+            );
+        }
+        return $return;
+    }
 
     protected function getTree($dir, $index=0) {
         $path = explode("/", $dir);

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

Doc Comments +18 added lines

@@ -385,6 +385,9 @@ 
 	}
 
 
+	/**
+	 * @return string
+	 */
 	protected function normalizeFilename($filename) {
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
@@ -394,6 +397,9 @@ 
         	return $filename;
 	}
 
+	/**
+	 * @param string $dirname
+	 */
 	protected function normalizeDirname($dirname) {
         return $this->modx->stripAlias($dirname);
     }
@@ -506,6 +512,9 @@ 
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
+    /**
+     * @param string $ext
+     */
     protected function validateExtension($ext, $type) {
         $ext = trim(strtolower($ext));
         if (!isset($this->types[$type]))
@@ -531,11 +540,17 @@ 
         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)
             ? $patt[1] : "";
@@ -728,6 +743,9 @@ 
         die;
     }
 
+    /**
+     * @param string $url
+     */
     protected function callBack($url, $message="") {
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])

Indentation +74 added lines, -74 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 {
 
@@ -18,92 +18,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;
     }
@@ -132,7 +132,7 @@ 
         )
             $this->cms = $this->get['cms'];
 
-		// LINKING UPLOADED FILE
+        // LINKING UPLOADED FILE
         if (count($_FILES))
             $this->file = &$_FILES[key($_FILES)];
 
@@ -228,8 +228,8 @@ 
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
-         $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
-         $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
+            $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
+            $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
 
         // SITE ROOT
         } elseif ($this->config['uploadURL'] == "/") {
@@ -365,36 +365,36 @@ 
     }
 
 
-	protected function getTransaliasSettings() {
-		global $modx;
-
-		// 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) {
-			// Transalias plugin active?
-			$res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
-			if ($properties = $modx->db->getValue($res)) {
-				$properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
-			} else {
-				$properties = NULL;
-			}
-		} else {
-			$properties = NULL;
-		}
-		return $properties;
-	}
-
-
-	protected function normalizeFilename($filename) {
-		if ($this->getTransaliasSettings()) {
-        		$format = strrchr($filename, ".");
-        		$filename = str_replace($format, "", $filename);
-            		$filename = $this->modx->stripAlias($filename).$format;
-        	}
-        	return $filename;
-	}
-
-	protected function normalizeDirname($dirname) {
+    protected function getTransaliasSettings() {
+        global $modx;
+
+        // 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) {
+            // Transalias plugin active?
+            $res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
+            if ($properties = $modx->db->getValue($res)) {
+                $properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
+            } else {
+                $properties = NULL;
+            }
+        } else {
+            $properties = NULL;
+        }
+        return $properties;
+    }
+
+
+    protected function normalizeFilename($filename) {
+        if ($this->getTransaliasSettings()) {
+                $format = strrchr($filename, ".");
+                $filename = str_replace($format, "", $filename);
+                    $filename = $this->modx->stripAlias($filename).$format;
+            }
+            return $filename;
+    }
+
+    protected function normalizeDirname($dirname) {
         return $this->modx->stripAlias($dirname);
     }
 
@@ -472,10 +472,10 @@ 
             return $this->label("The image is too big and/or cannot be resized.");
 
 
-	// CHECK FOR MODX MAX FILE SIZE                
-	$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)");
+    // CHECK FOR MODX MAX FILE SIZE                
+    $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 true;
     }
@@ -627,7 +627,7 @@ 
             $top = isset($this->config['watermark']['top'])
                 ? $this->config['watermark']['top'] : false;
             $img->watermark($this->config['watermark']['file'], $left, $top);
-		}
+        }
 
         $options = array( 'file' => $file );
 

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

Doc Comments +6 added lines

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

Indentation +218 added lines, -218 removed lines

@@ -13,227 +13,227 @@
 
 class fastImage
 {
-	private $strpos = 0;
-	private $str;
-	private $uri;
-	private $type;
-	private $handle;
+    private $strpos = 0;
+    private $str;
+    private $uri;
+    private $type;
+    private $handle;
 
-	public function __construct($uri = null)
-	{
-		if ($uri) $this->load($uri);
-	}
+    public function __construct($uri = null)
+    {
+        if ($uri) $this->load($uri);
+    }
 
 
-	public function load($uri)
-	{
-		if ($this->handle) $this->close();
-
-		$this->uri = $uri;
-		$this->handle = fopen($uri, 'r');
-	}
-
-
-	public function close()
-	{
-		if (is_resource($this->handle)) fclose($this->handle);
-	}
+    public function load($uri)
+    {
+        if ($this->handle) $this->close();
+
+        $this->uri = $uri;
+        $this->handle = fopen($uri, 'r');
+    }
+
+
+    public function close()
+    {
+        if (is_resource($this->handle)) fclose($this->handle);
+    }
 
 
-	public function getSize()
-	{
-		$this->strpos = 0;
-		if ($this->getType())
-		{
-			return array_values($this->parseSize());
-		}
-
-		return false;
-	}
-
-
-	public function getType()
-	{
-		$this->strpos = 0;
-
-		if (!$this->type)
-		{
-			switch ($this->getChars(2))
-			{
-				case "BM":
-					return $this->type = 'bmp';
-				case "GI":
-					return $this->type = 'gif';
-				case chr(0xFF).chr(0xd8):
-					return $this->type = 'jpeg';
-				case chr(0x89).'P':
-					return $this->type = 'png';
-				default:
-					return false;
-			}
-		}
-
-		return $this->type;
-	}
-
-
-	private function parseSize()
-	{
-		$this->strpos = 0;
-
-		switch ($this->type)
-		{
-			case 'png':
-				return $this->parseSizeForPNG();
-			case 'gif':
-				return $this->parseSizeForGIF();
-			case 'bmp':
-				return $this->parseSizeForBMP();
-			case 'jpeg':
-				return $this->parseSizeForJPEG();
-		}
-
-		return null;
-	}
-
-
-	private function parseSizeForPNG()
-	{
-		$chars = $this->getChars(25);
-
-		return unpack("N*", substr($chars, 16, 8));
-	}
-
-
-	private function parseSizeForGIF()
-	{
-		$chars = $this->getChars(11);
-
-		return unpack("S*", substr($chars, 6, 4));
-	}
-
-
-	private function parseSizeForBMP()
-	{
-		$chars = $this->getChars(29);
-	 	$chars = substr($chars, 14, 14);
-		$type = unpack('C', $chars);
-
-		return (reset($type) == 40) ? unpack('L*', substr($chars, 4)) : unpack('L*', substr($chars, 4, 8));
-	}
-
-
-	private function parseSizeForJPEG()
-	{
-		$state = null;
-
-		while (true)
-		{
-			switch ($state)
-			{
-				default:
-					$this->getChars(2);
-					$state = 'started';
-					break;
-
-				case 'started':
-					$b = $this->getByte();
-					if ($b === false) return false;
-
-					$state = $b == 0xFF ? 'sof' : 'started';
-					break;
-
-				case 'sof':
-					$b = $this->getByte();
-					if (in_array($b, range(0xe0, 0xef)))
-					{
-						$state = 'skipframe';
-					}
-					elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
-					{
-						$state = 'readsize';
-					}
-					elseif ($b == 0xFF)
-					{
-						$state = 'sof';
-					}
-					else
-					{
-						$state = 'skipframe';
-					}
-					break;
-
-				case 'skipframe':
-					$skip = $this->readInt($this->getChars(2)) - 2;
-					$state = 'doskip';
-					break;
-
-				case 'doskip':
-					$this->getChars($skip);
-					$state = 'started';
-					break;
-
-				case 'readsize':
-					$c = $this->getChars(7);
-
-					return array($this->readInt(substr($c, 5, 2)), $this->readInt(substr($c, 3, 2)));
-			}
-		}
-	}
-
-
-	private function getChars($n)
-	{
-		$response = null;
-
-		// do we need more data?
-		if ($this->strpos + $n -1 >= strlen($this->str))
-		{
-			$end = ($this->strpos + $n);
-
-			while (strlen($this->str) < $end && $response !== false)
-			{
-				// read more from the file handle
-				$need = $end - ftell($this->handle);
-
-				if ($response = fread($this->handle, $need))
-				{
-					$this->str .= $response;
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-
-		$result = substr($this->str, $this->strpos, $n);
-		$this->strpos += $n;
-
-		// we are dealing with bytes here, so force the encoding
-		return mb_convert_encoding($result, "8BIT");
-	}
-
-
-	private function getByte()
-	{
-		$c = $this->getChars(1);
-		$b = unpack("C", $c);
-
-		return reset($b);
-	}
-
-
-	private function readInt($str)
-	{
-		$size = unpack("C*", $str);
-
-	    	return ($size[1] << 8) + $size[2];
-	}
-
-
-	public function __destruct()
-	{
-		$this->close();
-	}
+    public function getSize()
+    {
+        $this->strpos = 0;
+        if ($this->getType())
+        {
+            return array_values($this->parseSize());
+        }
+
+        return false;
+    }
+
+
+    public function getType()
+    {
+        $this->strpos = 0;
+
+        if (!$this->type)
+        {
+            switch ($this->getChars(2))
+            {
+                case "BM":
+                    return $this->type = 'bmp';
+                case "GI":
+                    return $this->type = 'gif';
+                case chr(0xFF).chr(0xd8):
+                    return $this->type = 'jpeg';
+                case chr(0x89).'P':
+                    return $this->type = 'png';
+                default:
+                    return false;
+            }
+        }
+
+        return $this->type;
+    }
+
+
+    private function parseSize()
+    {
+        $this->strpos = 0;
+
+        switch ($this->type)
+        {
+            case 'png':
+                return $this->parseSizeForPNG();
+            case 'gif':
+                return $this->parseSizeForGIF();
+            case 'bmp':
+                return $this->parseSizeForBMP();
+            case 'jpeg':
+                return $this->parseSizeForJPEG();
+        }
+
+        return null;
+    }
+
+
+    private function parseSizeForPNG()
+    {
+        $chars = $this->getChars(25);
+
+        return unpack("N*", substr($chars, 16, 8));
+    }
+
+
+    private function parseSizeForGIF()
+    {
+        $chars = $this->getChars(11);
+
+        return unpack("S*", substr($chars, 6, 4));
+    }
+
+
+    private function parseSizeForBMP()
+    {
+        $chars = $this->getChars(29);
+            $chars = substr($chars, 14, 14);
+        $type = unpack('C', $chars);
+
+        return (reset($type) == 40) ? unpack('L*', substr($chars, 4)) : unpack('L*', substr($chars, 4, 8));
+    }
+
+
+    private function parseSizeForJPEG()
+    {
+        $state = null;
+
+        while (true)
+        {
+            switch ($state)
+            {
+                default:
+                    $this->getChars(2);
+                    $state = 'started';
+                    break;
+
+                case 'started':
+                    $b = $this->getByte();
+                    if ($b === false) return false;
+
+                    $state = $b == 0xFF ? 'sof' : 'started';
+                    break;
+
+                case 'sof':
+                    $b = $this->getByte();
+                    if (in_array($b, range(0xe0, 0xef)))
+                    {
+                        $state = 'skipframe';
+                    }
+                    elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
+                    {
+                        $state = 'readsize';
+                    }
+                    elseif ($b == 0xFF)
+                    {
+                        $state = 'sof';
+                    }
+                    else
+                    {
+                        $state = 'skipframe';
+                    }
+                    break;
+
+                case 'skipframe':
+                    $skip = $this->readInt($this->getChars(2)) - 2;
+                    $state = 'doskip';
+                    break;
+
+                case 'doskip':
+                    $this->getChars($skip);
+                    $state = 'started';
+                    break;
+
+                case 'readsize':
+                    $c = $this->getChars(7);
+
+                    return array($this->readInt(substr($c, 5, 2)), $this->readInt(substr($c, 3, 2)));
+            }
+        }
+    }
+
+
+    private function getChars($n)
+    {
+        $response = null;
+
+        // do we need more data?
+        if ($this->strpos + $n -1 >= strlen($this->str))
+        {
+            $end = ($this->strpos + $n);
+
+            while (strlen($this->str) < $end && $response !== false)
+            {
+                // read more from the file handle
+                $need = $end - ftell($this->handle);
+
+                if ($response = fread($this->handle, $need))
+                {
+                    $this->str .= $response;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        $result = substr($this->str, $this->strpos, $n);
+        $this->strpos += $n;
+
+        // we are dealing with bytes here, so force the encoding
+        return mb_convert_encoding($result, "8BIT");
+    }
+
+
+    private function getByte()
+    {
+        $c = $this->getChars(1);
+        $b = unpack("C", $c);
+
+        return reset($b);
+    }
+
+
+    private function readInt($str)
+    {
+        $size = unpack("C*", $str);
+
+            return ($size[1] << 8) + $size[2];
+    }
+
+
+    public function __destruct()
+    {
+        $this->close();
+    }
 }

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

Doc Comments +8 added lines, -2 removed lines

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

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

     * @param integer $bigger_size

-    * @return array */

+    * @return integer[] */

 

     public function get_prop_size($bigger_size) {

 

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

     * @param integer $width

     * @param integer $height

-    * @return bool */

+    * @return gd */

 

     public function resize_overflow($width, $height) {

 

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

     }

 

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

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

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

Indentation +92 added lines, -92 removed lines

@@ -1,44 +1,44 @@ 
 <?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 */

+    /** Image width

+     * @var integer */

     protected $width;

 

-  /** Image height

-    * @var integer */

+    /** Image height

+     * @var integer */

     protected $height;

 

-  /** Init error

-    * @var bool */

+    /** Init error

+     * @var bool */

     public $init_error = false;

 

-  /** Last builded image type constant (IMAGETYPE_XXX)

-    * @var integer */

+    /** Last builded image type constant (IMAGETYPE_XXX)

+     * @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 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 */

 

     protected function build_image($image) {

 

@@ -87,16 +87,16 @@ 
         return $return;

     }

 

-  /** 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 */

+    /** 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 */

 

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

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

@@ -123,30 +123,30 @@ 
         }

     }

 

-  /** Returns the GD resource

-    * @return resource */

+    /** Returns the GD resource

+     * @return resource */

 

     public function get_image() {

         return $this->image;

     }

 

-  /** Returns the image width

-    * @return integer */

+    /** Returns the image width

+     * @return integer */

 

     public function get_width() {

         return $this->width;

     }

 

-  /** Returns the image height

-    * @return integer */

+    /** Returns the image height

+     * @return integer */

 

     public function get_height() {

         return $this->height;

     }

 

-  /** Returns calculated proportional width from the given height

-    * @param integer $resized_height

-    * @return integer */

+    /** Returns calculated proportional width from the given height

+     * @param integer $resized_height

+     * @return integer */

 

     public function get_prop_width($resized_height) {

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

@@ -154,9 +154,9 @@ 
         return $width;

     }

 

-  /** Returns calculated proportional height from the given width

-    * @param integer $resized_width

-    * @return integer */

+    /** Returns calculated proportional height from the given width

+     * @param integer $resized_width

+     * @return integer */

 

     public function get_prop_height($resized_width) {

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

@@ -164,11 +164,11 @@ 
         return $height;

     }

 

-  /** 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 */

+    /** 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 */

 

     public function get_prop_size($bigger_size) {

 

@@ -186,10 +186,10 @@ 
         return array($width, $height);

     }

 

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

-    * @param integer $width

-    * @param integer $height

-    * @return bool */

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

+     * @param integer $width

+     * @param integer $height

+     * @return bool */

 

     public function resize($width, $height) {

         if (!$width) $width = 1;

@@ -203,10 +203,10 @@ 
         );

     }

 

-  /** 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 */

+    /** 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 */

 

     public function resize_crop($src) {

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

@@ -233,10 +233,10 @@ 
             return false;

     }

 

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

-    * @param integer $width

-    * @param integer $height

-    * @return bool */

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

+     * @param integer $width

+     * @param integer $height

+     * @return bool */

 

     public function resize_fit($width, $height) {

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

@@ -250,12 +250,12 @@ 
         return $this->resize($width, $height);

     }

 

-  /** 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 */

+    /** 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 */

 

     public function resize_overflow($width, $height) {

 

@@ -368,30 +368,30 @@ 
 

 

 

-			/*** gif transparent fix - 1.10.2013 ***/

+            /*** gif transparent fix - 1.10.2013 ***/

 

-			$transindex = imagecolortransparent($src);

-			$palletsize = imagecolorstotal($src);

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

-				$transcol = imagecolorsforindex($src, $transindex);

+            $transindex = imagecolortransparent($src);

+            $palletsize = imagecolorstotal($src);

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

+                $transcol = imagecolorsforindex($src, $transindex);

 

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

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

 

-				$transindex = imagecolorallocatealpha($this->image, $transcol['red'], $transcol['green'], $transcol['blue'], 127);

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

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

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

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

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

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

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

-			}

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

+                $transindex = imagecolorallocatealpha($this->image, $transcol['red'], $transcol['green'], $transcol['blue'], 127);

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

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

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

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

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

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

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

+            }

+            else {

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

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

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

+            }

+            return $this->image;

 

         } else

             return false;

@@ -419,7 +419,7 @@ 
     public function imagegif($filename=null) {

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

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

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

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

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

     }

 }

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

Doc Comments -1 removed lines

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

Indentation +93 added lines, -93 removed lines

@@ -1,45 +1,45 @@ 
 <?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) {
         return property_exists($this, $property) ? $this->$property : null;
@@ -47,15 +47,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()) {
         $this->image = $this->width = $this->height = null;
@@ -70,10 +70,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 static function factory($driver, $image, array $options=array()) {
         $class = "image_$driver";
@@ -82,9 +82,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 static function getDriver(array $drivers=array('gd')) {
         foreach ($drivers as $driver) {
@@ -101,9 +101,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) {
         $class = get_class($this);
@@ -128,8 +128,8 @@ 
 
 
 /** Returns calculated proportional width from the given height
-  * @param integer $resizedHeight
-  * @return integer */
+ * @param integer $resizedHeight
+ * @return integer */
 
     final public function getPropWidth($resizedHeight) {
         $width = round(($this->width * $resizedHeight) / $this->height);
@@ -139,8 +139,8 @@ 
 
 
 /** Returns calculated proportional height from the given width
-  * @param integer $resizedWidth
-  * @return integer */
+ * @param integer $resizedWidth
+ * @return integer */
 
     final public function getPropHeight($resizedWidth) {
         $height = round(($this->height * $resizedWidth) / $this->width);
@@ -150,45 +150,45 @@ 
 
 
 /** 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 */
     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 */
     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();
@@ -196,44 +196,44 @@ 
     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);
 
 }

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

Doc Comments +5 added lines

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

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 {