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

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

Doc Comments +6 added lines

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

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 {
     protected $zip;

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

Doc Comments -2 removed lines

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

Indentation +48 added lines, -48 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 {
 
@@ -100,10 +100,10 @@ 
         'zip'   => 'application/x-zip'
     );
 
-  /** 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 */
+    /** Checks if the given file is really writable. The standard PHP function
+     * is_writable() does not work properly on Windows servers.
+     * @param string $dir
+     * @return bool */
 
     static function isWritable($filename) {
         $filename = path::normalize($filename);
@@ -113,26 +113,26 @@ 
         return true;
     }
 
-  /** Get the extension from filename
-    * @param string $file
-    * @param bool $toLower
-    * @return string */
+    /** Get the extension from filename
+     * @param string $file
+     * @param bool $toLower
+     * @return string */
 
     static function getExtension($filename, $toLower=true) {
         return preg_match('/^.*\.([^\.]*)$/s', $filename, $patt)
             ? ($toLower ? strtolower($patt[1]) : $patt[1]) : "";
     }
 
-  /** 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 */
+    /** 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 */
 
     static function getMimeType($filename, $magic=null) {
         if (class_exists("finfo")) {
@@ -149,26 +149,26 @@ 
         return isset(self::$MIME[$ext]) ? self::$MIME[$ext] : "application/octet-stream";
     }
 
-  /** 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 */
+    /** 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 */
 
     static function getInexistantFilename($filename, $dir=null, $tpl=null) {
         if ($tpl === null)  $tpl = "{name}({sufix}){ext}";