Piou-piou / Ruined-World

libs/ckfinder/core/connector/php/php4/Utils/Misc.php

Doc Comments +3 added lines, -1 removed lines

@@ -25,6 +25,9 @@ 
  */
 class CKFinder_Connector_Utils_Misc
 {
+    /**
+     * @param integer $number
+     */
     function getErrorMessage($number, $arg = "") {
         $langCode = 'en';
         if (!empty($_GET['langCode']) && preg_match("/^[a-z\-]+$/", $_GET['langCode'])) {
@@ -113,7 +116,6 @@ 
      *
      * @static
      * @access public
-     * @param string $filename
      * @return boolean
      */
     function setMemoryForImage($imageWidth, $imageHeight, $imageBits, $imageChannels)

Indentation +341 added lines, -341 removed lines

@@ -25,345 +25,345 @@
  */
 class CKFinder_Connector_Utils_Misc
 {
-    function getErrorMessage($number, $arg = "") {
-        $langCode = 'en';
-        if (!empty($_GET['langCode']) && preg_match("/^[a-z\-]+$/", $_GET['langCode'])) {
-            if (file_exists(CKFINDER_CONNECTOR_LANG_PATH . "/" . $_GET['langCode'] . ".php"))
-                $langCode = $_GET['langCode'];
-        }
-        include CKFINDER_CONNECTOR_LANG_PATH . "/" . $langCode . ".php";
-        if ($number) {
-            if (!empty ($GLOBALS['CKFLang']['Errors'][$number])) {
-                $errorMessage = str_replace("%1", $arg, $GLOBALS['CKFLang']['Errors'][$number]);
-            } else {
-                $errorMessage = str_replace("%1", $number, $GLOBALS['CKFLang']['ErrorUnknown']);
-            }
-        } else {
-            $errorMessage = "";
-        }
-        return $errorMessage;
-    }
-
-    /**
-     * Convert any value to boolean, strings like "false", "FalSE" and "off" are also considered as false
-     *
-     * @static
-     * @access public
-     * @param mixed $value
-     * @return boolean
-     */
-    function booleanValue($value)
-    {
-        if (strcasecmp("false", $value) == 0 || strcasecmp("off", $value) == 0 || !$value) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * @link http://pl.php.net/manual/en/function.imagecopyresampled.php
-     * replacement to imagecopyresampled that will deliver results that are almost identical except MUCH faster (very typically 30 times faster)
-     *
-     * @static
-     * @access public
-     * @param string $dst_image
-     * @param string $src_image
-     * @param int $dst_x
-     * @param int $dst_y
-     * @param int $src_x
-     * @param int $src_y
-     * @param int $dst_w
-     * @param int $dst_h
-     * @param int $src_w
-     * @param int $src_h
-     * @param int $quality
-     * @return boolean
-     */
-    function fastImageCopyResampled (&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 3)
-    {
-        if (empty($src_image) || empty($dst_image)) {
-            return false;
-        }
-
-        if ($quality <= 1) {
-            $temp = imagecreatetruecolor ($dst_w + 1, $dst_h + 1);
-            imagecopyresized ($temp, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w + 1, $dst_h + 1, $src_w, $src_h);
-            imagecopyresized ($dst_image, $temp, 0, 0, 0, 0, $dst_w, $dst_h, $dst_w, $dst_h);
-            imagedestroy ($temp);
-
-        } elseif ($quality < 5 && (($dst_w * $quality) < $src_w || ($dst_h * $quality) < $src_h)) {
-            $tmp_w = $dst_w * $quality;
-            $tmp_h = $dst_h * $quality;
-            $temp = imagecreatetruecolor ($tmp_w + 1, $tmp_h + 1);
-            imagecopyresized ($temp, $src_image, 0, 0, $src_x, $src_y, $tmp_w + 1, $tmp_h + 1, $src_w, $src_h);
-            imagecopyresampled ($dst_image, $temp, $dst_x, $dst_y, 0, 0, $dst_w, $dst_h, $tmp_w, $tmp_h);
-            imagedestroy ($temp);
-
-        } else {
-            imagecopyresampled ($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-        }
-
-        return true;
-    }
-
-    /**
-     * @link http://pl.php.net/manual/pl/function.imagecreatefromjpeg.php
-     * function posted by e dot a dot schultz at gmail dot com
-     *
-     * @static
-     * @access public
-     * @param string $filename
-     * @return boolean
-     */
-    function setMemoryForImage($imageWidth, $imageHeight, $imageBits, $imageChannels)
-    {
-        $MB = 1048576;  // number of bytes in 1M
-        $K64 = 65536;    // number of bytes in 64K
-        $TWEAKFACTOR = 2.4;  // Or whatever works for you
-        $memoryNeeded = round( ( $imageWidth * $imageHeight
-        * $imageBits
-        * $imageChannels / 8
-        + $K64
-        ) * $TWEAKFACTOR
-        ) + 3*$MB;
-
-        //ini_get('memory_limit') only works if compiled with "--enable-memory-limit" also
-        //Default memory limit is 8MB so well stick with that.
-        //To find out what yours is, view your php.ini file.
-        $memoryLimit = CKFinder_Connector_Utils_Misc::returnBytes(@ini_get('memory_limit'))/$MB;
-        if (!$memoryLimit) {
-            $memoryLimit = 8;
-        }
-
-        $memoryLimitMB = $memoryLimit * $MB;
-        if (function_exists('memory_get_usage')) {
-            if (memory_get_usage() + $memoryNeeded > $memoryLimitMB) {
-                $newLimit = $memoryLimit + ceil( ( memory_get_usage()
-                + $memoryNeeded
-                - $memoryLimitMB
-                ) / $MB
-                );
-                if (@ini_set( 'memory_limit', $newLimit . 'M' ) === false) {
-                    return false;
-                }
-            }
-        } else {
-            if ($memoryNeeded + 3*$MB > $memoryLimitMB) {
-                $newLimit = $memoryLimit + ceil(( 3*$MB
-                + $memoryNeeded
-                - $memoryLimitMB
-                ) / $MB
-                );
-                if (false === @ini_set( 'memory_limit', $newLimit . 'M' )) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * convert shorthand php.ini notation into bytes, much like how the PHP source does it
-     * @link http://pl.php.net/manual/en/function.ini-get.php
-     *
-     * @static
-     * @access public
-     * @param string $val
-     * @return int
-     */
-    function returnBytes($val)
-    {
-        $val = trim($val);
-        if (!$val) {
-            return 0;
-        }
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
-            // The 'G' modifier is available since PHP 5.1.0
-            case 'g':
-                $val *= 1024;
-            case 'm':
-                $val *= 1024;
-            case 'k':
-                $val *= 1024;
-        }
-
-        return $val;
-    }
-
-    /**
-    * Checks if a value exists in an array (case insensitive)
-    *
-    * @static
-    * @access public
-    * @param string $needle
-    * @param array $haystack
-    * @return boolean
-    */
-    function inArrayCaseInsensitive($needle, $haystack)
-    {
-        if (!$haystack || !is_array($haystack)) {
-            return false;
-        }
-        $lcase = array();
-        foreach ($haystack as $key => $val) {
-            $lcase[$key] = strtolower($val);
-        }
-        return in_array($needle, $lcase);
-    }
-
-    /**
-    * UTF-8 compatible version of basename()
-    *
-    * @static
-    * @access public
-    * @param string $file
-    * @return string
-    */
-    function mbBasename($file)
-    {
-        $explode = explode('/', str_replace("\\", "/", $file));
-        return end($explode);
-    }
-
-    /**
-    * Source: http://pl.php.net/imagecreate
-    * (optimized for speed and memory usage, but yet not very efficient)
-    *
-    * @static
-    * @access public
-    * @param string $filename
-    * @return resource
-    */
-    function imageCreateFromBmp($filename)
-    {
-        //20 seconds seems to be a reasonable value to not kill a server and process images up to 1680x1050
-        @set_time_limit(20);
-
-        if (false === ($f1 = fopen($filename, "rb"))) {
-            return false;
-        }
-
-        $FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1, 14));
-        if ($FILE['file_type'] != 19778) {
-            return false;
-        }
-
-        $BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
-        '/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
-        '/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1, 40));
-
-        $BMP['colors'] = pow(2,$BMP['bits_per_pixel']);
-
-        if ($BMP['size_bitmap'] == 0) {
-            $BMP['size_bitmap'] = $FILE['file_size'] - $FILE['bitmap_offset'];
-        }
-
-        $BMP['bytes_per_pixel'] = $BMP['bits_per_pixel']/8;
-        $BMP['bytes_per_pixel2'] = ceil($BMP['bytes_per_pixel']);
-        $BMP['decal'] = ($BMP['width']*$BMP['bytes_per_pixel']/4);
-        $BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
-        $BMP['decal'] = 4-(4*$BMP['decal']);
-
-        if ($BMP['decal'] == 4) {
-            $BMP['decal'] = 0;
-        }
-
-        $PALETTE = array();
-        if ($BMP['colors'] < 16777216) {
-            $PALETTE = unpack('V'.$BMP['colors'], fread($f1, $BMP['colors']*4));
-        }
-
-        //2048x1536px@24bit don't even try to process larger files as it will probably fail
-        if ($BMP['size_bitmap'] > 3 * 2048 * 1536) {
-            return false;
-        }
-
-        $IMG = fread($f1, $BMP['size_bitmap']);
-        fclose($f1);
-        $VIDE = chr(0);
-
-        $res = imagecreatetruecolor($BMP['width'],$BMP['height']);
-        $P = 0;
-        $Y = $BMP['height']-1;
-
-        $line_length = $BMP['bytes_per_pixel']*$BMP['width'];
-
-        if ($BMP['bits_per_pixel'] == 24) {
-            while ($Y >= 0)
-            {
-                $X=0;
-                $temp = unpack( "C*", substr($IMG, $P, $line_length));
-
-                while ($X < $BMP['width'])
-                {
-                    $offset = $X*3;
-                    imagesetpixel($res, $X++, $Y, ($temp[$offset+3] << 16) + ($temp[$offset+2] << 8) + $temp[$offset+1]);
-                }
-                $Y--;
-                $P += $line_length + $BMP['decal'];
-            }
-        }
-        elseif ($BMP['bits_per_pixel'] == 8)
-        {
-            while ($Y >= 0)
-            {
-                $X=0;
-
-                $temp = unpack( "C*", substr($IMG, $P, $line_length));
-
-                while ($X < $BMP['width'])
-                {
-                    imagesetpixel($res, $X++, $Y, $PALETTE[$temp[$X] +1]);
-                }
-                $Y--;
-                $P += $line_length + $BMP['decal'];
-            }
-        }
-        elseif ($BMP['bits_per_pixel'] == 4)
-        {
-            while ($Y >= 0)
-            {
-                $X=0;
-                $i = 1;
-                $low = true;
-
-                $temp = unpack( "C*", substr($IMG, $P, $line_length));
-
-                while ($X < $BMP['width'])
-                {
-                    if ($low) {
-                        $index = $temp[$i] >> 4;
-                    }
-                    else {
-                        $index = $temp[$i++] & 0x0F;
-                    }
-                    $low = !$low;
-
-                    imagesetpixel($res, $X++, $Y, $PALETTE[$index +1]);
-                }
-                $Y--;
-                $P += $line_length + $BMP['decal'];
-            }
-        }
-        elseif ($BMP['bits_per_pixel'] == 1)
-        {
-            $COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
-            if     (($P*8)%8 == 0) $COLOR[1] =  $COLOR[1]        >>7;
-            elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6;
-            elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5;
-            elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4;
-            elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3;
-            elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2;
-            elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1;
-            elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
-            $COLOR[1] = $PALETTE[$COLOR[1]+1];
-        }
-        else {
-            return false;
-        }
-
-        return $res;
-    }
+	function getErrorMessage($number, $arg = "") {
+		$langCode = 'en';
+		if (!empty($_GET['langCode']) && preg_match("/^[a-z\-]+$/", $_GET['langCode'])) {
+			if (file_exists(CKFINDER_CONNECTOR_LANG_PATH . "/" . $_GET['langCode'] . ".php"))
+				$langCode = $_GET['langCode'];
+		}
+		include CKFINDER_CONNECTOR_LANG_PATH . "/" . $langCode . ".php";
+		if ($number) {
+			if (!empty ($GLOBALS['CKFLang']['Errors'][$number])) {
+				$errorMessage = str_replace("%1", $arg, $GLOBALS['CKFLang']['Errors'][$number]);
+			} else {
+				$errorMessage = str_replace("%1", $number, $GLOBALS['CKFLang']['ErrorUnknown']);
+			}
+		} else {
+			$errorMessage = "";
+		}
+		return $errorMessage;
+	}
+
+	/**
+	 * Convert any value to boolean, strings like "false", "FalSE" and "off" are also considered as false
+	 *
+	 * @static
+	 * @access public
+	 * @param mixed $value
+	 * @return boolean
+	 */
+	function booleanValue($value)
+	{
+		if (strcasecmp("false", $value) == 0 || strcasecmp("off", $value) == 0 || !$value) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 * @link http://pl.php.net/manual/en/function.imagecopyresampled.php
+	 * replacement to imagecopyresampled that will deliver results that are almost identical except MUCH faster (very typically 30 times faster)
+	 *
+	 * @static
+	 * @access public
+	 * @param string $dst_image
+	 * @param string $src_image
+	 * @param int $dst_x
+	 * @param int $dst_y
+	 * @param int $src_x
+	 * @param int $src_y
+	 * @param int $dst_w
+	 * @param int $dst_h
+	 * @param int $src_w
+	 * @param int $src_h
+	 * @param int $quality
+	 * @return boolean
+	 */
+	function fastImageCopyResampled (&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 3)
+	{
+		if (empty($src_image) || empty($dst_image)) {
+			return false;
+		}
+
+		if ($quality <= 1) {
+			$temp = imagecreatetruecolor ($dst_w + 1, $dst_h + 1);
+			imagecopyresized ($temp, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w + 1, $dst_h + 1, $src_w, $src_h);
+			imagecopyresized ($dst_image, $temp, 0, 0, 0, 0, $dst_w, $dst_h, $dst_w, $dst_h);
+			imagedestroy ($temp);
+
+		} elseif ($quality < 5 && (($dst_w * $quality) < $src_w || ($dst_h * $quality) < $src_h)) {
+			$tmp_w = $dst_w * $quality;
+			$tmp_h = $dst_h * $quality;
+			$temp = imagecreatetruecolor ($tmp_w + 1, $tmp_h + 1);
+			imagecopyresized ($temp, $src_image, 0, 0, $src_x, $src_y, $tmp_w + 1, $tmp_h + 1, $src_w, $src_h);
+			imagecopyresampled ($dst_image, $temp, $dst_x, $dst_y, 0, 0, $dst_w, $dst_h, $tmp_w, $tmp_h);
+			imagedestroy ($temp);
+
+		} else {
+			imagecopyresampled ($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @link http://pl.php.net/manual/pl/function.imagecreatefromjpeg.php
+	 * function posted by e dot a dot schultz at gmail dot com
+	 *
+	 * @static
+	 * @access public
+	 * @param string $filename
+	 * @return boolean
+	 */
+	function setMemoryForImage($imageWidth, $imageHeight, $imageBits, $imageChannels)
+	{
+		$MB = 1048576;  // number of bytes in 1M
+		$K64 = 65536;    // number of bytes in 64K
+		$TWEAKFACTOR = 2.4;  // Or whatever works for you
+		$memoryNeeded = round( ( $imageWidth * $imageHeight
+		* $imageBits
+		* $imageChannels / 8
+		+ $K64
+		) * $TWEAKFACTOR
+		) + 3*$MB;
+
+		//ini_get('memory_limit') only works if compiled with "--enable-memory-limit" also
+		//Default memory limit is 8MB so well stick with that.
+		//To find out what yours is, view your php.ini file.
+		$memoryLimit = CKFinder_Connector_Utils_Misc::returnBytes(@ini_get('memory_limit'))/$MB;
+		if (!$memoryLimit) {
+			$memoryLimit = 8;
+		}
+
+		$memoryLimitMB = $memoryLimit * $MB;
+		if (function_exists('memory_get_usage')) {
+			if (memory_get_usage() + $memoryNeeded > $memoryLimitMB) {
+				$newLimit = $memoryLimit + ceil( ( memory_get_usage()
+				+ $memoryNeeded
+				- $memoryLimitMB
+				) / $MB
+				);
+				if (@ini_set( 'memory_limit', $newLimit . 'M' ) === false) {
+					return false;
+				}
+			}
+		} else {
+			if ($memoryNeeded + 3*$MB > $memoryLimitMB) {
+				$newLimit = $memoryLimit + ceil(( 3*$MB
+				+ $memoryNeeded
+				- $memoryLimitMB
+				) / $MB
+				);
+				if (false === @ini_set( 'memory_limit', $newLimit . 'M' )) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * convert shorthand php.ini notation into bytes, much like how the PHP source does it
+	 * @link http://pl.php.net/manual/en/function.ini-get.php
+	 *
+	 * @static
+	 * @access public
+	 * @param string $val
+	 * @return int
+	 */
+	function returnBytes($val)
+	{
+		$val = trim($val);
+		if (!$val) {
+			return 0;
+		}
+		$last = strtolower($val[strlen($val)-1]);
+		switch($last) {
+			// The 'G' modifier is available since PHP 5.1.0
+			case 'g':
+				$val *= 1024;
+			case 'm':
+				$val *= 1024;
+			case 'k':
+				$val *= 1024;
+		}
+
+		return $val;
+	}
+
+	/**
+	 * Checks if a value exists in an array (case insensitive)
+	 *
+	 * @static
+	 * @access public
+	 * @param string $needle
+	 * @param array $haystack
+	 * @return boolean
+	 */
+	function inArrayCaseInsensitive($needle, $haystack)
+	{
+		if (!$haystack || !is_array($haystack)) {
+			return false;
+		}
+		$lcase = array();
+		foreach ($haystack as $key => $val) {
+			$lcase[$key] = strtolower($val);
+		}
+		return in_array($needle, $lcase);
+	}
+
+	/**
+	 * UTF-8 compatible version of basename()
+	 *
+	 * @static
+	 * @access public
+	 * @param string $file
+	 * @return string
+	 */
+	function mbBasename($file)
+	{
+		$explode = explode('/', str_replace("\\", "/", $file));
+		return end($explode);
+	}
+
+	/**
+	 * Source: http://pl.php.net/imagecreate
+	 * (optimized for speed and memory usage, but yet not very efficient)
+	 *
+	 * @static
+	 * @access public
+	 * @param string $filename
+	 * @return resource
+	 */
+	function imageCreateFromBmp($filename)
+	{
+		//20 seconds seems to be a reasonable value to not kill a server and process images up to 1680x1050
+		@set_time_limit(20);
+
+		if (false === ($f1 = fopen($filename, "rb"))) {
+			return false;
+		}
+
+		$FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1, 14));
+		if ($FILE['file_type'] != 19778) {
+			return false;
+		}
+
+		$BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
+		'/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
+		'/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1, 40));
+
+		$BMP['colors'] = pow(2,$BMP['bits_per_pixel']);
+
+		if ($BMP['size_bitmap'] == 0) {
+			$BMP['size_bitmap'] = $FILE['file_size'] - $FILE['bitmap_offset'];
+		}
+
+		$BMP['bytes_per_pixel'] = $BMP['bits_per_pixel']/8;
+		$BMP['bytes_per_pixel2'] = ceil($BMP['bytes_per_pixel']);
+		$BMP['decal'] = ($BMP['width']*$BMP['bytes_per_pixel']/4);
+		$BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
+		$BMP['decal'] = 4-(4*$BMP['decal']);
+
+		if ($BMP['decal'] == 4) {
+			$BMP['decal'] = 0;
+		}
+
+		$PALETTE = array();
+		if ($BMP['colors'] < 16777216) {
+			$PALETTE = unpack('V'.$BMP['colors'], fread($f1, $BMP['colors']*4));
+		}
+
+		//2048x1536px@24bit don't even try to process larger files as it will probably fail
+		if ($BMP['size_bitmap'] > 3 * 2048 * 1536) {
+			return false;
+		}
+
+		$IMG = fread($f1, $BMP['size_bitmap']);
+		fclose($f1);
+		$VIDE = chr(0);
+
+		$res = imagecreatetruecolor($BMP['width'],$BMP['height']);
+		$P = 0;
+		$Y = $BMP['height']-1;
+
+		$line_length = $BMP['bytes_per_pixel']*$BMP['width'];
+
+		if ($BMP['bits_per_pixel'] == 24) {
+			while ($Y >= 0)
+			{
+				$X=0;
+				$temp = unpack( "C*", substr($IMG, $P, $line_length));
+
+				while ($X < $BMP['width'])
+				{
+					$offset = $X*3;
+					imagesetpixel($res, $X++, $Y, ($temp[$offset+3] << 16) + ($temp[$offset+2] << 8) + $temp[$offset+1]);
+				}
+				$Y--;
+				$P += $line_length + $BMP['decal'];
+			}
+		}
+		elseif ($BMP['bits_per_pixel'] == 8)
+		{
+			while ($Y >= 0)
+			{
+				$X=0;
+
+				$temp = unpack( "C*", substr($IMG, $P, $line_length));
+
+				while ($X < $BMP['width'])
+				{
+					imagesetpixel($res, $X++, $Y, $PALETTE[$temp[$X] +1]);
+				}
+				$Y--;
+				$P += $line_length + $BMP['decal'];
+			}
+		}
+		elseif ($BMP['bits_per_pixel'] == 4)
+		{
+			while ($Y >= 0)
+			{
+				$X=0;
+				$i = 1;
+				$low = true;
+
+				$temp = unpack( "C*", substr($IMG, $P, $line_length));
+
+				while ($X < $BMP['width'])
+				{
+					if ($low) {
+						$index = $temp[$i] >> 4;
+					}
+					else {
+						$index = $temp[$i++] & 0x0F;
+					}
+					$low = !$low;
+
+					imagesetpixel($res, $X++, $Y, $PALETTE[$index +1]);
+				}
+				$Y--;
+				$P += $line_length + $BMP['decal'];
+			}
+		}
+		elseif ($BMP['bits_per_pixel'] == 1)
+		{
+			$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
+			if     (($P*8)%8 == 0) $COLOR[1] =  $COLOR[1]        >>7;
+			elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6;
+			elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5;
+			elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4;
+			elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3;
+			elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2;
+			elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1;
+			elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
+			$COLOR[1] = $PALETTE[$COLOR[1]+1];
+		}
+		else {
+			return false;
+		}
+
+		return $res;
+	}
 }

Spacing +54 added lines, -54 removed lines

@@ -28,10 +28,10 @@ 
     function getErrorMessage($number, $arg = "") {
         $langCode = 'en';
         if (!empty($_GET['langCode']) && preg_match("/^[a-z\-]+$/", $_GET['langCode'])) {
-            if (file_exists(CKFINDER_CONNECTOR_LANG_PATH . "/" . $_GET['langCode'] . ".php"))
+            if (file_exists(CKFINDER_CONNECTOR_LANG_PATH."/".$_GET['langCode'].".php"))
                 $langCode = $_GET['langCode'];
         }
-        include CKFINDER_CONNECTOR_LANG_PATH . "/" . $langCode . ".php";
+        include CKFINDER_CONNECTOR_LANG_PATH."/".$langCode.".php";
         if ($number) {
             if (!empty ($GLOBALS['CKFLang']['Errors'][$number])) {
                 $errorMessage = str_replace("%1", $arg, $GLOBALS['CKFLang']['Errors'][$number]);
@@ -80,28 +80,28 @@ 
      * @param int $quality
      * @return boolean
      */
-    function fastImageCopyResampled (&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 3)
+    function fastImageCopyResampled(&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 3)
     {
         if (empty($src_image) || empty($dst_image)) {
             return false;
         }
 
         if ($quality <= 1) {
-            $temp = imagecreatetruecolor ($dst_w + 1, $dst_h + 1);
-            imagecopyresized ($temp, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w + 1, $dst_h + 1, $src_w, $src_h);
-            imagecopyresized ($dst_image, $temp, 0, 0, 0, 0, $dst_w, $dst_h, $dst_w, $dst_h);
-            imagedestroy ($temp);
+            $temp = imagecreatetruecolor($dst_w + 1, $dst_h + 1);
+            imagecopyresized($temp, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w + 1, $dst_h + 1, $src_w, $src_h);
+            imagecopyresized($dst_image, $temp, 0, 0, 0, 0, $dst_w, $dst_h, $dst_w, $dst_h);
+            imagedestroy($temp);
 
         } elseif ($quality < 5 && (($dst_w * $quality) < $src_w || ($dst_h * $quality) < $src_h)) {
             $tmp_w = $dst_w * $quality;
             $tmp_h = $dst_h * $quality;
-            $temp = imagecreatetruecolor ($tmp_w + 1, $tmp_h + 1);
-            imagecopyresized ($temp, $src_image, 0, 0, $src_x, $src_y, $tmp_w + 1, $tmp_h + 1, $src_w, $src_h);
-            imagecopyresampled ($dst_image, $temp, $dst_x, $dst_y, 0, 0, $dst_w, $dst_h, $tmp_w, $tmp_h);
-            imagedestroy ($temp);
+            $temp = imagecreatetruecolor($tmp_w + 1, $tmp_h + 1);
+            imagecopyresized($temp, $src_image, 0, 0, $src_x, $src_y, $tmp_w + 1, $tmp_h + 1, $src_w, $src_h);
+            imagecopyresampled($dst_image, $temp, $dst_x, $dst_y, 0, 0, $dst_w, $dst_h, $tmp_w, $tmp_h);
+            imagedestroy($temp);
 
         } else {
-            imagecopyresampled ($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+            imagecopyresampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
         }
 
         return true;
@@ -118,20 +118,20 @@ 
      */
     function setMemoryForImage($imageWidth, $imageHeight, $imageBits, $imageChannels)
     {
-        $MB = 1048576;  // number of bytes in 1M
-        $K64 = 65536;    // number of bytes in 64K
-        $TWEAKFACTOR = 2.4;  // Or whatever works for you
-        $memoryNeeded = round( ( $imageWidth * $imageHeight
+        $MB = 1048576; // number of bytes in 1M
+        $K64 = 65536; // number of bytes in 64K
+        $TWEAKFACTOR = 2.4; // Or whatever works for you
+        $memoryNeeded = round(($imageWidth * $imageHeight
         * $imageBits
         * $imageChannels / 8
         + $K64
         ) * $TWEAKFACTOR
-        ) + 3*$MB;
+        ) + 3 * $MB;
 
         //ini_get('memory_limit') only works if compiled with "--enable-memory-limit" also
         //Default memory limit is 8MB so well stick with that.
         //To find out what yours is, view your php.ini file.
-        $memoryLimit = CKFinder_Connector_Utils_Misc::returnBytes(@ini_get('memory_limit'))/$MB;
+        $memoryLimit = CKFinder_Connector_Utils_Misc::returnBytes(@ini_get('memory_limit')) / $MB;
         if (!$memoryLimit) {
             $memoryLimit = 8;
         }
@@ -139,23 +139,23 @@ 
         $memoryLimitMB = $memoryLimit * $MB;
         if (function_exists('memory_get_usage')) {
             if (memory_get_usage() + $memoryNeeded > $memoryLimitMB) {
-                $newLimit = $memoryLimit + ceil( ( memory_get_usage()
+                $newLimit = $memoryLimit + ceil((memory_get_usage()
                 + $memoryNeeded
                 - $memoryLimitMB
                 ) / $MB
                 );
-                if (@ini_set( 'memory_limit', $newLimit . 'M' ) === false) {
+                if (@ini_set('memory_limit', $newLimit.'M') === false) {
                     return false;
                 }
             }
         } else {
-            if ($memoryNeeded + 3*$MB > $memoryLimitMB) {
-                $newLimit = $memoryLimit + ceil(( 3*$MB
+            if ($memoryNeeded + 3 * $MB > $memoryLimitMB) {
+                $newLimit = $memoryLimit + ceil((3 * $MB
                 + $memoryNeeded
                 - $memoryLimitMB
                 ) / $MB
                 );
-                if (false === @ini_set( 'memory_limit', $newLimit . 'M' )) {
+                if (false === @ini_set('memory_limit', $newLimit.'M')) {
                     return false;
                 }
             }
@@ -178,8 +178,8 @@ 
         if (!$val) {
             return 0;
         }
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
+        $last = strtolower($val[strlen($val) - 1]);
+        switch ($last) {
             // The 'G' modifier is available since PHP 5.1.0
             case 'g':
                 $val *= 1024;
@@ -254,17 +254,17 @@ 
         '/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
         '/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1, 40));
 
-        $BMP['colors'] = pow(2,$BMP['bits_per_pixel']);
+        $BMP['colors'] = pow(2, $BMP['bits_per_pixel']);
 
         if ($BMP['size_bitmap'] == 0) {
             $BMP['size_bitmap'] = $FILE['file_size'] - $FILE['bitmap_offset'];
         }
 
-        $BMP['bytes_per_pixel'] = $BMP['bits_per_pixel']/8;
+        $BMP['bytes_per_pixel'] = $BMP['bits_per_pixel'] / 8;
         $BMP['bytes_per_pixel2'] = ceil($BMP['bytes_per_pixel']);
-        $BMP['decal'] = ($BMP['width']*$BMP['bytes_per_pixel']/4);
-        $BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
-        $BMP['decal'] = 4-(4*$BMP['decal']);
+        $BMP['decal'] = ($BMP['width'] * $BMP['bytes_per_pixel'] / 4);
+        $BMP['decal'] -= floor($BMP['width'] * $BMP['bytes_per_pixel'] / 4);
+        $BMP['decal'] = 4 - (4 * $BMP['decal']);
 
         if ($BMP['decal'] == 4) {
             $BMP['decal'] = 0;
@@ -272,7 +272,7 @@ 
 
         $PALETTE = array();
         if ($BMP['colors'] < 16777216) {
-            $PALETTE = unpack('V'.$BMP['colors'], fread($f1, $BMP['colors']*4));
+            $PALETTE = unpack('V'.$BMP['colors'], fread($f1, $BMP['colors'] * 4));
         }
 
         //2048x1536px@24bit don't even try to process larger files as it will probably fail
@@ -284,22 +284,22 @@ 
         fclose($f1);
         $VIDE = chr(0);
 
-        $res = imagecreatetruecolor($BMP['width'],$BMP['height']);
+        $res = imagecreatetruecolor($BMP['width'], $BMP['height']);
         $P = 0;
-        $Y = $BMP['height']-1;
+        $Y = $BMP['height'] - 1;
 
-        $line_length = $BMP['bytes_per_pixel']*$BMP['width'];
+        $line_length = $BMP['bytes_per_pixel'] * $BMP['width'];
 
         if ($BMP['bits_per_pixel'] == 24) {
             while ($Y >= 0)
             {
-                $X=0;
-                $temp = unpack( "C*", substr($IMG, $P, $line_length));
+                $X = 0;
+                $temp = unpack("C*", substr($IMG, $P, $line_length));
 
                 while ($X < $BMP['width'])
                 {
-                    $offset = $X*3;
-                    imagesetpixel($res, $X++, $Y, ($temp[$offset+3] << 16) + ($temp[$offset+2] << 8) + $temp[$offset+1]);
+                    $offset = $X * 3;
+                    imagesetpixel($res, $X++, $Y, ($temp[$offset + 3] << 16) + ($temp[$offset + 2] << 8) + $temp[$offset + 1]);
                 }
                 $Y--;
                 $P += $line_length + $BMP['decal'];
@@ -309,13 +309,13 @@ 
         {
             while ($Y >= 0)
             {
-                $X=0;
+                $X = 0;
 
-                $temp = unpack( "C*", substr($IMG, $P, $line_length));
+                $temp = unpack("C*", substr($IMG, $P, $line_length));
 
                 while ($X < $BMP['width'])
                 {
-                    imagesetpixel($res, $X++, $Y, $PALETTE[$temp[$X] +1]);
+                    imagesetpixel($res, $X++, $Y, $PALETTE[$temp[$X] + 1]);
                 }
                 $Y--;
                 $P += $line_length + $BMP['decal'];
@@ -325,11 +325,11 @@ 
         {
             while ($Y >= 0)
             {
-                $X=0;
+                $X = 0;
                 $i = 1;
                 $low = true;
 
-                $temp = unpack( "C*", substr($IMG, $P, $line_length));
+                $temp = unpack("C*", substr($IMG, $P, $line_length));
 
                 while ($X < $BMP['width'])
                 {
@@ -341,7 +341,7 @@ 
                     }
                     $low = !$low;
 
-                    imagesetpixel($res, $X++, $Y, $PALETTE[$index +1]);
+                    imagesetpixel($res, $X++, $Y, $PALETTE[$index + 1]);
                 }
                 $Y--;
                 $P += $line_length + $BMP['decal'];
@@ -349,16 +349,16 @@ 
         }
         elseif ($BMP['bits_per_pixel'] == 1)
         {
-            $COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
-            if     (($P*8)%8 == 0) $COLOR[1] =  $COLOR[1]        >>7;
-            elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6;
-            elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5;
-            elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4;
-            elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3;
-            elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2;
-            elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1;
-            elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
-            $COLOR[1] = $PALETTE[$COLOR[1]+1];
+            $COLOR = unpack("n", $VIDE.substr($IMG, floor($P), 1));
+            if (($P * 8) % 8 == 0) $COLOR[1] = $COLOR[1] >> 7;
+            elseif (($P * 8) % 8 == 1) $COLOR[1] = ($COLOR[1] & 0x40) >> 6;
+            elseif (($P * 8) % 8 == 2) $COLOR[1] = ($COLOR[1] & 0x20) >> 5;
+            elseif (($P * 8) % 8 == 3) $COLOR[1] = ($COLOR[1] & 0x10) >> 4;
+            elseif (($P * 8) % 8 == 4) $COLOR[1] = ($COLOR[1] & 0x8) >> 3;
+            elseif (($P * 8) % 8 == 5) $COLOR[1] = ($COLOR[1] & 0x4) >> 2;
+            elseif (($P * 8) % 8 == 6) $COLOR[1] = ($COLOR[1] & 0x2) >> 1;
+            elseif (($P * 8) % 8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
+            $COLOR[1] = $PALETTE[$COLOR[1] + 1];
         }
         else {
             return false;

Braces +28 added lines, -21 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -28,8 +30,9 @@ 
     function getErrorMessage($number, $arg = "") {
         $langCode = 'en';
         if (!empty($_GET['langCode']) && preg_match("/^[a-z\-]+$/", $_GET['langCode'])) {
-            if (file_exists(CKFINDER_CONNECTOR_LANG_PATH . "/" . $_GET['langCode'] . ".php"))
-                $langCode = $_GET['langCode'];
+            if (file_exists(CKFINDER_CONNECTOR_LANG_PATH . "/" . $_GET['langCode'] . ".php")) {
+                            $langCode = $_GET['langCode'];
+            }
         }
         include CKFINDER_CONNECTOR_LANG_PATH . "/" . $langCode . ".php";
         if ($number) {
@@ -304,8 +307,7 @@ 
                 $Y--;
                 $P += $line_length + $BMP['decal'];
             }
-        }
-        elseif ($BMP['bits_per_pixel'] == 8)
+        } elseif ($BMP['bits_per_pixel'] == 8)
         {
             while ($Y >= 0)
             {
@@ -320,8 +322,7 @@ 
                 $Y--;
                 $P += $line_length + $BMP['decal'];
             }
-        }
-        elseif ($BMP['bits_per_pixel'] == 4)
+        } elseif ($BMP['bits_per_pixel'] == 4)
         {
             while ($Y >= 0)
             {
@@ -335,8 +336,7 @@ 
                 {
                     if ($low) {
                         $index = $temp[$i] >> 4;
-                    }
-                    else {
+                    } else {
                         $index = $temp[$i++] & 0x0F;
                     }
                     $low = !$low;
@@ -346,21 +346,28 @@ 
                 $Y--;
                 $P += $line_length + $BMP['decal'];
             }
-        }
-        elseif ($BMP['bits_per_pixel'] == 1)
+        } elseif ($BMP['bits_per_pixel'] == 1)
         {
             $COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
-            if     (($P*8)%8 == 0) $COLOR[1] =  $COLOR[1]        >>7;
-            elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6;
-            elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5;
-            elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4;
-            elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3;
-            elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2;
-            elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1;
-            elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
+            if     (($P*8)%8 == 0) {
+            	$COLOR[1] =  $COLOR[1]        >>7;
+            } elseif (($P*8)%8 == 1) {
+            	$COLOR[1] = ($COLOR[1] & 0x40)>>6;
+            } elseif (($P*8)%8 == 2) {
+            	$COLOR[1] = ($COLOR[1] & 0x20)>>5;
+            } elseif (($P*8)%8 == 3) {
+            	$COLOR[1] = ($COLOR[1] & 0x10)>>4;
+            } elseif (($P*8)%8 == 4) {
+            	$COLOR[1] = ($COLOR[1] & 0x8)>>3;
+            } elseif (($P*8)%8 == 5) {
+            	$COLOR[1] = ($COLOR[1] & 0x4)>>2;
+            } elseif (($P*8)%8 == 6) {
+            	$COLOR[1] = ($COLOR[1] & 0x2)>>1;
+            } elseif (($P*8)%8 == 7) {
+            	$COLOR[1] = ($COLOR[1] & 0x1);
+            }
             $COLOR[1] = $PALETTE[$COLOR[1]+1];
-        }
-        else {
+        } else {
             return false;
         }
 

libs/ckfinder/core/connector/php/php4/Utils/XmlNode.php

Doc Comments -3 removed lines

@@ -107,7 +107,6 @@ 
     /**
      * Set element value
      *
-     * @param string $name
      * @param string $value
      * @access public
      */
@@ -119,8 +118,6 @@ 
     /**
      * Get element value
      *
-     * @param string $name
-     * @param string $value
      * @access public
      */
     function getValue()

Indentation +154 added lines, -154 removed lines

@@ -27,158 +27,158 @@
  */
 class Ckfinder_Connector_Utils_XmlNode
 {
-    /**
-     * Array that stores XML attributes
-     *
-     * @access private
-     * @var array
-     */
-    var $_attributes = array();
-    /**
-     * Array that stores child nodes
-     *
-     * @access private
-     * @var array
-     */
-    var $_childNodes = array();
-    /**
-     * Node name
-     *
-     * @access private
-     * @var string
-     */
-    var $_name;
-    /**
-     * Node value
-     *
-     * @access private
-     * @var string
-     */
-    var $_value;
-
-    /**
-     * Create new node
-     *
-     * @param string $nodeName node name
-     * @param string $nodeValue node value
-     * @return Ckfinder_Connector_Utils_XmlNode
-     */
-    function Ckfinder_Connector_Utils_XmlNode($nodeName, $nodeValue = null)
-    {
-        $this->_name = $nodeName;
-        if (!is_null($nodeValue)) {
-            $this->_value = $nodeValue;
-        }
-    }
-
-    function &getChild($name)
-    {
-        foreach ($this->_childNodes as $i => $node) {
-            if ($node->_name == $name) {
-                return $this->_childNodes[$i];
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Add attribute
-     *
-     * @param string $name
-     * @param string $value
-     * @access public
-     */
-    function addAttribute($name, $value)
-    {
-        $this->_attributes[$name] = $value;
-    }
-
-    /**
-     * Get attribute value
-     *
-     * @param string $name
-     * @access public
-     */
-    function getAttribute($name)
-    {
-        return $this->_attributes[$name];
-    }
-
-    /**
-     * Set element value
-     *
-     * @param string $name
-     * @param string $value
-     * @access public
-     */
-    function setValue($value)
-    {
-        $this->_value = $value;
-    }
-
-    /**
-     * Get element value
-     *
-     * @param string $name
-     * @param string $value
-     * @access public
-     */
-    function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Adds new child at the end of the children
-     *
-     * @param Ckfinder_Connector_Utils_XmlNode $node
-     * @access public
-     */
-    function addChild(&$node)
-    {
-        $this->_childNodes[] =& $node;
-    }
-
-    /**
-     * Return a well-formed XML string based on Ckfinder_Connector_Utils_XmlNode element
-     *
-     * @return string
-     * @access public
-     */
-    function asXML()
-    {
-        $ret = "<" . $this->_name;
-
-        //print Attributes
-        if (sizeof($this->_attributes)>0) {
-            foreach ($this->_attributes as $_name => $_value) {
-                $ret .= " " . $_name . '="' . htmlspecialchars($_value) . '"';
-            }
-        }
-
-        //if there is nothing more
-        if (is_null($this->_value) && !sizeof($this->_childNodes)) {
-            $ret .= " />";
-            return $ret;
-        }
-
-        //close opening tag
-        $ret .= ">";
-
-        //print value
-        if (!is_null($this->_value)) {
-            $ret .= htmlspecialchars($this->_value);
-        }
-
-        //print child nodes
-        if (sizeof($this->_childNodes)>0) {
-            foreach ($this->_childNodes as $_node) {
-                $ret .= $_node->asXml();
-            }
-        }
-
-        $ret .= "</" . $this->_name . ">";
-
-        return $ret;
-    }
+	/**
+	 * Array that stores XML attributes
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $_attributes = array();
+	/**
+	 * Array that stores child nodes
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $_childNodes = array();
+	/**
+	 * Node name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $_name;
+	/**
+	 * Node value
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $_value;
+
+	/**
+	 * Create new node
+	 *
+	 * @param string $nodeName node name
+	 * @param string $nodeValue node value
+	 * @return Ckfinder_Connector_Utils_XmlNode
+	 */
+	function Ckfinder_Connector_Utils_XmlNode($nodeName, $nodeValue = null)
+	{
+		$this->_name = $nodeName;
+		if (!is_null($nodeValue)) {
+			$this->_value = $nodeValue;
+		}
+	}
+
+	function &getChild($name)
+	{
+		foreach ($this->_childNodes as $i => $node) {
+			if ($node->_name == $name) {
+				return $this->_childNodes[$i];
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Add attribute
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @access public
+	 */
+	function addAttribute($name, $value)
+	{
+		$this->_attributes[$name] = $value;
+	}
+
+	/**
+	 * Get attribute value
+	 *
+	 * @param string $name
+	 * @access public
+	 */
+	function getAttribute($name)
+	{
+		return $this->_attributes[$name];
+	}
+
+	/**
+	 * Set element value
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @access public
+	 */
+	function setValue($value)
+	{
+		$this->_value = $value;
+	}
+
+	/**
+	 * Get element value
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @access public
+	 */
+	function getValue()
+	{
+		return $this->_value;
+	}
+
+	/**
+	 * Adds new child at the end of the children
+	 *
+	 * @param Ckfinder_Connector_Utils_XmlNode $node
+	 * @access public
+	 */
+	function addChild(&$node)
+	{
+		$this->_childNodes[] =& $node;
+	}
+
+	/**
+	 * Return a well-formed XML string based on Ckfinder_Connector_Utils_XmlNode element
+	 *
+	 * @return string
+	 * @access public
+	 */
+	function asXML()
+	{
+		$ret = "<" . $this->_name;
+
+		//print Attributes
+		if (sizeof($this->_attributes)>0) {
+			foreach ($this->_attributes as $_name => $_value) {
+				$ret .= " " . $_name . '="' . htmlspecialchars($_value) . '"';
+			}
+		}
+
+		//if there is nothing more
+		if (is_null($this->_value) && !sizeof($this->_childNodes)) {
+			$ret .= " />";
+			return $ret;
+		}
+
+		//close opening tag
+		$ret .= ">";
+
+		//print value
+		if (!is_null($this->_value)) {
+			$ret .= htmlspecialchars($this->_value);
+		}
+
+		//print child nodes
+		if (sizeof($this->_childNodes)>0) {
+			foreach ($this->_childNodes as $_node) {
+				$ret .= $_node->asXml();
+			}
+		}
+
+		$ret .= "</" . $this->_name . ">";
+
+		return $ret;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -136,7 +136,7 @@ 
      */
     function addChild(&$node)
     {
-        $this->_childNodes[] =& $node;
+        $this->_childNodes[] = & $node;
     }
 
     /**
@@ -147,12 +147,12 @@ 
      */
     function asXML()
     {
-        $ret = "<" . $this->_name;
+        $ret = "<".$this->_name;
 
         //print Attributes
-        if (sizeof($this->_attributes)>0) {
+        if (sizeof($this->_attributes) > 0) {
             foreach ($this->_attributes as $_name => $_value) {
-                $ret .= " " . $_name . '="' . htmlspecialchars($_value) . '"';
+                $ret .= " ".$_name.'="'.htmlspecialchars($_value).'"';
             }
         }
 
@@ -171,13 +171,13 @@ 
         }
 
         //print child nodes
-        if (sizeof($this->_childNodes)>0) {
+        if (sizeof($this->_childNodes) > 0) {
             foreach ($this->_childNodes as $_node) {
                 $ret .= $_node->asXml();
             }
         }
 
-        $ret .= "</" . $this->_name . ">";
+        $ret .= "</".$this->_name.">";
 
         return $ret;
     }

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder

libs/ckfinder/core/connector/php/php5/CommandHandler/CopyFiles.php

Doc Comments +4 added lines

@@ -243,6 +243,10 @@
         }
     }
 
+    /**
+     * @param integer $errorCode
+     * @param string $path
+     */
     private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
     {
         $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");

Indentation +220 added lines, -220 removed lines

@@ -32,224 +32,224 @@
  */
 class CKFinder_Connector_CommandHandler_CopyFiles extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * Command name
-     *
-     * @access private
-     * @var string
-     */
-    private $command = "CopyFiles";
-
-
-    /**
-     * handle request and build XML
-     * @access protected
-     *
-     */
-    protected function buildXml()
-    {
-        if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        $clientPath = $this->_currentFolder->getClientPath();
-        $sServerDir = $this->_currentFolder->getServerPath();
-        $currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $_aclConfig = $_config->getAccessControlConfig();
-        $aclMasks = array();
-        $_resourceTypeConfig = array();
-
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
-
-        // Create the "Errors" node.
-        $oErrorsNode = new CKFinder_Connector_Utils_XmlNode("Errors");
-        $errorCode = CKFINDER_CONNECTOR_ERROR_NONE;
-        $copied = 0;
-        $copiedAll = 0;
-        if (!empty($_POST['copied'])) {
-            $copiedAll = intval($_POST['copied']);
-        }
-        $checkedPaths = array();
-
-        $oCopyFilesNode = new Ckfinder_Connector_Utils_XmlNode("CopyFiles");
-
-        if (!empty($_POST['files']) && is_array($_POST['files'])) {
-            foreach ($_POST['files'] as $index => $arr) {
-                if (empty($arr['name'])) {
-                    continue;
-                }
-                if (!isset($arr['name'], $arr['type'], $arr['folder'])) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
-
-                // file name
-                $name = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['name']);
-                // resource type
-                $type = $arr['type'];
-                // client path
-                $path = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['folder']);
-                // options
-                $options = (!empty($arr['options'])) ? $arr['options'] : '';
-
-                $destinationFilePath = $sServerDir.$name;
-
-                // check #1 (path)
-                if (!CKFinder_Connector_Utils_FileSystem::checkFileName($name) || preg_match(CKFINDER_REGEX_INVALID_PATH, $path)) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
-
-                // get resource type config for current file
-                if (!isset($_resourceTypeConfig[$type])) {
-                    $_resourceTypeConfig[$type] = $_config->getResourceTypeConfig($type);
-                }
-
-                // check #2 (resource type)
-                if (is_null($_resourceTypeConfig[$type])) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
-
-                // check #3 (extension)
-                if (!$_resourceTypeConfig[$type]->checkExtension($name, false)) {
-                    $errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
-                    $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                    continue;
-                }
-
-                // check #4 (extension) - when moving to another resource type, double check extension
-                if ($currentResourceTypeConfig->getName() != $type) {
-                    if (!$currentResourceTypeConfig->checkExtension($name, false)) {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                }
-
-                // check #5 (hidden folders)
-                // cache results
-                if (empty($checkedPaths[$path])) {
-                    $checkedPaths[$path] = true;
-
-                    if ($_resourceTypeConfig[$type]->checkIsHiddenPath($path)) {
-                        $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                    }
-                }
-
-                $sourceFilePath = $_resourceTypeConfig[$type]->getDirectory().$path.$name;
-
-                // check #6 (hidden file name)
-                if ($currentResourceTypeConfig->checkIsHiddenFile($name)) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
-
-                // check #7 (Access Control, need file view permission to source files)
-                if (!isset($aclMasks[$type."@".$path])) {
-                    $aclMasks[$type."@".$path] = $_aclConfig->getComputedMask($type, $path);
-                }
-
-                $isAuthorized = (($aclMasks[$type."@".$path] & CKFINDER_CONNECTOR_ACL_FILE_VIEW) == CKFINDER_CONNECTOR_ACL_FILE_VIEW);
-                if (!$isAuthorized) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-                }
-
-                // check #8 (invalid file name)
-                if (!file_exists($sourceFilePath) || !is_file($sourceFilePath)) {
-                    $errorCode = CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND;
-                    $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                    continue;
-                }
-
-                // check #9 (max size)
-                if ($currentResourceTypeConfig->getName() != $type) {
-                    $maxSize = $currentResourceTypeConfig->getMaxSize();
-                    $fileSize = filesize($sourceFilePath);
-                    if ($maxSize && $fileSize>$maxSize) {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                }
-
-                //$overwrite
-                // finally, no errors so far, we may attempt to copy a file
-                // protection against copying files to itself
-                if ($sourceFilePath == $destinationFilePath) {
-                    $errorCode = CKFINDER_CONNECTOR_ERROR_SOURCE_AND_TARGET_PATH_EQUAL;
-                    $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                    continue;
-                }
-                // check if file exists if we don't force overwriting
-                else if (file_exists($destinationFilePath) && strpos($options, "overwrite") === false) {
-                    if (strpos($options, "autorename") !== false) {
-                        $iCounter = 1;
-                        while (true)
-                        {
-                            $fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name) .
-                                "(" . $iCounter . ")" . "." .
-                                CKFinder_Connector_Utils_FileSystem::getExtension($name);
-
-                            $destinationFilePath = $sServerDir.$fileName;
-                            if (!file_exists($destinationFilePath)) {
-                                break;
-                            }
-                            else {
-                                $iCounter++;
-                            }
-                        }
-                        if (!@copy($sourceFilePath, $destinationFilePath)) {
-                            $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                            $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                            continue;
-                        }
-                        else {
-                            $copied++;
-                        }
-                    }
-                    else {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                }
-                // copy() overwrites without warning
-                else {
-                    if (!@copy($sourceFilePath, $destinationFilePath)) {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                    else {
-                        $copied++;
-                    }
-                }
-            }
-        }
-
-        $this->_connectorNode->addChild($oCopyFilesNode);
-        if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
-            $this->_connectorNode->addChild($oErrorsNode);
-        }
-        $oCopyFilesNode->addAttribute("copied", $copied);
-        $oCopyFilesNode->addAttribute("copiedTotal", $copiedAll + $copied);
-
-        /**
-         * Note: actually we could have more than one error.
-         * This is just a flag for CKFinder interface telling it to check all errors.
-         */
-        if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_COPY_FAILED);
-        }
-    }
-
-    private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
-    {
-        $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
-        $oErrorNode->addAttribute("code", $errorCode);
-        $oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
-        $oErrorNode->addAttribute("type", $type);
-        $oErrorNode->addAttribute("folder", $path);
-        $oErrorsNode->addChild($oErrorNode);
-    }
+	/**
+	 * Command name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	private $command = "CopyFiles";
+
+
+	/**
+	 * handle request and build XML
+	 * @access protected
+	 *
+	 */
+	protected function buildXml()
+	{
+		if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
+
+		$clientPath = $this->_currentFolder->getClientPath();
+		$sServerDir = $this->_currentFolder->getServerPath();
+		$currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$_aclConfig = $_config->getAccessControlConfig();
+		$aclMasks = array();
+		$_resourceTypeConfig = array();
+
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
+
+		// Create the "Errors" node.
+		$oErrorsNode = new CKFinder_Connector_Utils_XmlNode("Errors");
+		$errorCode = CKFINDER_CONNECTOR_ERROR_NONE;
+		$copied = 0;
+		$copiedAll = 0;
+		if (!empty($_POST['copied'])) {
+			$copiedAll = intval($_POST['copied']);
+		}
+		$checkedPaths = array();
+
+		$oCopyFilesNode = new Ckfinder_Connector_Utils_XmlNode("CopyFiles");
+
+		if (!empty($_POST['files']) && is_array($_POST['files'])) {
+			foreach ($_POST['files'] as $index => $arr) {
+				if (empty($arr['name'])) {
+					continue;
+				}
+				if (!isset($arr['name'], $arr['type'], $arr['folder'])) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
+
+				// file name
+				$name = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['name']);
+				// resource type
+				$type = $arr['type'];
+				// client path
+				$path = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['folder']);
+				// options
+				$options = (!empty($arr['options'])) ? $arr['options'] : '';
+
+				$destinationFilePath = $sServerDir.$name;
+
+				// check #1 (path)
+				if (!CKFinder_Connector_Utils_FileSystem::checkFileName($name) || preg_match(CKFINDER_REGEX_INVALID_PATH, $path)) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
+
+				// get resource type config for current file
+				if (!isset($_resourceTypeConfig[$type])) {
+					$_resourceTypeConfig[$type] = $_config->getResourceTypeConfig($type);
+				}
+
+				// check #2 (resource type)
+				if (is_null($_resourceTypeConfig[$type])) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
+
+				// check #3 (extension)
+				if (!$_resourceTypeConfig[$type]->checkExtension($name, false)) {
+					$errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
+					$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+					continue;
+				}
+
+				// check #4 (extension) - when moving to another resource type, double check extension
+				if ($currentResourceTypeConfig->getName() != $type) {
+					if (!$currentResourceTypeConfig->checkExtension($name, false)) {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+				}
+
+				// check #5 (hidden folders)
+				// cache results
+				if (empty($checkedPaths[$path])) {
+					$checkedPaths[$path] = true;
+
+					if ($_resourceTypeConfig[$type]->checkIsHiddenPath($path)) {
+						$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+					}
+				}
+
+				$sourceFilePath = $_resourceTypeConfig[$type]->getDirectory().$path.$name;
+
+				// check #6 (hidden file name)
+				if ($currentResourceTypeConfig->checkIsHiddenFile($name)) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
+
+				// check #7 (Access Control, need file view permission to source files)
+				if (!isset($aclMasks[$type."@".$path])) {
+					$aclMasks[$type."@".$path] = $_aclConfig->getComputedMask($type, $path);
+				}
+
+				$isAuthorized = (($aclMasks[$type."@".$path] & CKFINDER_CONNECTOR_ACL_FILE_VIEW) == CKFINDER_CONNECTOR_ACL_FILE_VIEW);
+				if (!$isAuthorized) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+				}
+
+				// check #8 (invalid file name)
+				if (!file_exists($sourceFilePath) || !is_file($sourceFilePath)) {
+					$errorCode = CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND;
+					$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+					continue;
+				}
+
+				// check #9 (max size)
+				if ($currentResourceTypeConfig->getName() != $type) {
+					$maxSize = $currentResourceTypeConfig->getMaxSize();
+					$fileSize = filesize($sourceFilePath);
+					if ($maxSize && $fileSize>$maxSize) {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+				}
+
+				//$overwrite
+				// finally, no errors so far, we may attempt to copy a file
+				// protection against copying files to itself
+				if ($sourceFilePath == $destinationFilePath) {
+					$errorCode = CKFINDER_CONNECTOR_ERROR_SOURCE_AND_TARGET_PATH_EQUAL;
+					$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+					continue;
+				}
+				// check if file exists if we don't force overwriting
+				else if (file_exists($destinationFilePath) && strpos($options, "overwrite") === false) {
+					if (strpos($options, "autorename") !== false) {
+						$iCounter = 1;
+						while (true)
+						{
+							$fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name) .
+								"(" . $iCounter . ")" . "." .
+								CKFinder_Connector_Utils_FileSystem::getExtension($name);
+
+							$destinationFilePath = $sServerDir.$fileName;
+							if (!file_exists($destinationFilePath)) {
+								break;
+							}
+							else {
+								$iCounter++;
+							}
+						}
+						if (!@copy($sourceFilePath, $destinationFilePath)) {
+							$errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+							$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+							continue;
+						}
+						else {
+							$copied++;
+						}
+					}
+					else {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+				}
+				// copy() overwrites without warning
+				else {
+					if (!@copy($sourceFilePath, $destinationFilePath)) {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+					else {
+						$copied++;
+					}
+				}
+			}
+		}
+
+		$this->_connectorNode->addChild($oCopyFilesNode);
+		if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
+			$this->_connectorNode->addChild($oErrorsNode);
+		}
+		$oCopyFilesNode->addAttribute("copied", $copied);
+		$oCopyFilesNode->addAttribute("copiedTotal", $copiedAll + $copied);
+
+		/**
+		 * Note: actually we could have more than one error.
+		 * This is just a flag for CKFinder interface telling it to check all errors.
+		 */
+		if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_COPY_FAILED);
+		}
+	}
+
+	private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
+	{
+		$oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
+		$oErrorNode->addAttribute("code", $errorCode);
+		$oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
+		$oErrorNode->addAttribute("type", $type);
+		$oErrorNode->addAttribute("folder", $path);
+		$oErrorsNode->addChild($oErrorNode);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 /**
  * Include base XML command handler
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/XmlCommandHandlerBase.php";
 
 /**
  * Handle CopyFiles command
@@ -55,7 +55,7 @@ 
         $clientPath = $this->_currentFolder->getClientPath();
         $sServerDir = $this->_currentFolder->getServerPath();
         $currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         $_aclConfig = $_config->getAccessControlConfig();
         $aclMasks = array();
         $_resourceTypeConfig = array();
@@ -165,7 +165,7 @@ 
                 if ($currentResourceTypeConfig->getName() != $type) {
                     $maxSize = $currentResourceTypeConfig->getMaxSize();
                     $fileSize = filesize($sourceFilePath);
-                    if ($maxSize && $fileSize>$maxSize) {
+                    if ($maxSize && $fileSize > $maxSize) {
                         $errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
                         $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                         continue;
@@ -186,8 +186,8 @@ 
                         $iCounter = 1;
                         while (true)
                         {
-                            $fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name) .
-                                "(" . $iCounter . ")" . "." .
+                            $fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name).
+                                "(".$iCounter.")".".".
                                 CKFinder_Connector_Utils_FileSystem::getExtension($name);
 
                             $destinationFilePath = $sServerDir.$fileName;

Braces +7 added lines, -9 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -193,8 +195,7 @@ 
                             $destinationFilePath = $sServerDir.$fileName;
                             if (!file_exists($destinationFilePath)) {
                                 break;
-                            }
-                            else {
+                            } else {
                                 $iCounter++;
                             }
                         }
@@ -202,12 +203,10 @@ 
                             $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
                             $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                             continue;
-                        }
-                        else {
+                        } else {
                             $copied++;
                         }
-                    }
-                    else {
+                    } else {
                         $errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
                         $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                         continue;
@@ -219,8 +218,7 @@ 
                         $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
                         $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                         continue;
-                    }
-                    else {
+                    } else {
                         $copied++;
                     }
                 }

libs/ckfinder/core/connector/php/php5/CommandHandler/MoveFiles.php

Doc Comments +4 added lines

@@ -259,6 +259,10 @@
         }
     }
 
+    /**
+     * @param integer $errorCode
+     * @param string $path
+     */
     private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
     {
         $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");

Indentation +209 added lines, -209 removed lines

@@ -32,240 +32,240 @@
  */
 class CKFinder_Connector_CommandHandler_MoveFiles extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * Command name
-     *
-     * @access private
-     * @var string
-     */
-    private $command = "MoveFiles";
+	/**
+	 * Command name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	private $command = "MoveFiles";
 
 
-    /**
-     * handle request and build XML
-     * @access protected
-     *
-     */
-    protected function buildXml()
-    {
-        if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
+	/**
+	 * handle request and build XML
+	 * @access protected
+	 *
+	 */
+	protected function buildXml()
+	{
+		if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        $clientPath = $this->_currentFolder->getClientPath();
-        $sServerDir = $this->_currentFolder->getServerPath();
-        $currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $_aclConfig = $_config->getAccessControlConfig();
-        $aclMasks = array();
-        $_resourceTypeConfig = array();
+		$clientPath = $this->_currentFolder->getClientPath();
+		$sServerDir = $this->_currentFolder->getServerPath();
+		$currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$_aclConfig = $_config->getAccessControlConfig();
+		$aclMasks = array();
+		$_resourceTypeConfig = array();
 
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
 
-        // Create the "Errors" node.
-        $oErrorsNode = new CKFinder_Connector_Utils_XmlNode("Errors");
-        $errorCode = CKFINDER_CONNECTOR_ERROR_NONE;
-        $moved = 0;
-        $movedAll = 0;
-        if (!empty($_POST['moved'])) {
-            $movedAll = intval($_POST['moved']);
-        }
-        $checkedPaths = array();
+		// Create the "Errors" node.
+		$oErrorsNode = new CKFinder_Connector_Utils_XmlNode("Errors");
+		$errorCode = CKFINDER_CONNECTOR_ERROR_NONE;
+		$moved = 0;
+		$movedAll = 0;
+		if (!empty($_POST['moved'])) {
+			$movedAll = intval($_POST['moved']);
+		}
+		$checkedPaths = array();
 
-        $oMoveFilesNode = new Ckfinder_Connector_Utils_XmlNode("MoveFiles");
+		$oMoveFilesNode = new Ckfinder_Connector_Utils_XmlNode("MoveFiles");
 
-        if (!empty($_POST['files']) && is_array($_POST['files'])) {
-            foreach ($_POST['files'] as $index => $arr) {
-                if (empty($arr['name'])) {
-                    continue;
-                }
-                if (!isset($arr['name'], $arr['type'], $arr['folder'])) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
+		if (!empty($_POST['files']) && is_array($_POST['files'])) {
+			foreach ($_POST['files'] as $index => $arr) {
+				if (empty($arr['name'])) {
+					continue;
+				}
+				if (!isset($arr['name'], $arr['type'], $arr['folder'])) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
 
-                // file name
-                $name = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['name']);
-                // resource type
-                $type = $arr['type'];
-                // client path
-                $path = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['folder']);
-                // options
-                $options = (!empty($arr['options'])) ? $arr['options'] : '';
+				// file name
+				$name = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['name']);
+				// resource type
+				$type = $arr['type'];
+				// client path
+				$path = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['folder']);
+				// options
+				$options = (!empty($arr['options'])) ? $arr['options'] : '';
 
-                $destinationFilePath = $sServerDir.$name;
+				$destinationFilePath = $sServerDir.$name;
 
-                // check #1 (path)
-                if (!CKFinder_Connector_Utils_FileSystem::checkFileName($name) || preg_match(CKFINDER_REGEX_INVALID_PATH, $path)) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
+				// check #1 (path)
+				if (!CKFinder_Connector_Utils_FileSystem::checkFileName($name) || preg_match(CKFINDER_REGEX_INVALID_PATH, $path)) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
 
-                // get resource type config for current file
-                if (!isset($_resourceTypeConfig[$type])) {
-                    $_resourceTypeConfig[$type] = $_config->getResourceTypeConfig($type);
-                }
+				// get resource type config for current file
+				if (!isset($_resourceTypeConfig[$type])) {
+					$_resourceTypeConfig[$type] = $_config->getResourceTypeConfig($type);
+				}
 
-                // check #2 (resource type)
-                if (is_null($_resourceTypeConfig[$type])) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
+				// check #2 (resource type)
+				if (is_null($_resourceTypeConfig[$type])) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
 
-                // check #3 (extension)
-                if (!$_resourceTypeConfig[$type]->checkExtension($name, false)) {
-                    $errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
-                    $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                    continue;
-                }
+				// check #3 (extension)
+				if (!$_resourceTypeConfig[$type]->checkExtension($name, false)) {
+					$errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
+					$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+					continue;
+				}
 
-                // check #4 (extension) - when moving to another resource type, double check extension
-                if ($currentResourceTypeConfig->getName() != $type) {
-                    if (!$currentResourceTypeConfig->checkExtension($name, false)) {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                }
+				// check #4 (extension) - when moving to another resource type, double check extension
+				if ($currentResourceTypeConfig->getName() != $type) {
+					if (!$currentResourceTypeConfig->checkExtension($name, false)) {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+				}
 
-                // check #5 (hidden folders)
-                // cache results
-                if (empty($checkedPaths[$path])) {
-                    $checkedPaths[$path] = true;
+				// check #5 (hidden folders)
+				// cache results
+				if (empty($checkedPaths[$path])) {
+					$checkedPaths[$path] = true;
 
-                    if ($_resourceTypeConfig[$type]->checkIsHiddenPath($path)) {
-                        $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                    }
-                }
+					if ($_resourceTypeConfig[$type]->checkIsHiddenPath($path)) {
+						$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+					}
+				}
 
-                $sourceFilePath = $_resourceTypeConfig[$type]->getDirectory().$path.$name;
+				$sourceFilePath = $_resourceTypeConfig[$type]->getDirectory().$path.$name;
 
-                // check #6 (hidden file name)
-                if ($currentResourceTypeConfig->checkIsHiddenFile($name)) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
+				// check #6 (hidden file name)
+				if ($currentResourceTypeConfig->checkIsHiddenFile($name)) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
 
-                // check #7 (Access Control, need file view permission to source files)
-                if (!isset($aclMasks[$type."@".$path])) {
-                    $aclMasks[$type."@".$path] = $_aclConfig->getComputedMask($type, $path);
-                }
+				// check #7 (Access Control, need file view permission to source files)
+				if (!isset($aclMasks[$type."@".$path])) {
+					$aclMasks[$type."@".$path] = $_aclConfig->getComputedMask($type, $path);
+				}
 
-                $isAuthorized = (($aclMasks[$type."@".$path] & CKFINDER_CONNECTOR_ACL_FILE_VIEW) == CKFINDER_CONNECTOR_ACL_FILE_VIEW);
-                if (!$isAuthorized) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-                }
+				$isAuthorized = (($aclMasks[$type."@".$path] & CKFINDER_CONNECTOR_ACL_FILE_VIEW) == CKFINDER_CONNECTOR_ACL_FILE_VIEW);
+				if (!$isAuthorized) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+				}
 
-                // check #8 (invalid file name)
-                if (!file_exists($sourceFilePath) || !is_file($sourceFilePath)) {
-                    $errorCode = CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND;
-                    $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                    continue;
-                }
+				// check #8 (invalid file name)
+				if (!file_exists($sourceFilePath) || !is_file($sourceFilePath)) {
+					$errorCode = CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND;
+					$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+					continue;
+				}
 
-                // check #9 (max size)
-                if ($currentResourceTypeConfig->getName() != $type) {
-                    $maxSize = $currentResourceTypeConfig->getMaxSize();
-                    $fileSize = filesize($sourceFilePath);
-                    if ($maxSize && $fileSize>$maxSize) {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                }
+				// check #9 (max size)
+				if ($currentResourceTypeConfig->getName() != $type) {
+					$maxSize = $currentResourceTypeConfig->getMaxSize();
+					$fileSize = filesize($sourceFilePath);
+					if ($maxSize && $fileSize>$maxSize) {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+				}
 
-                //$overwrite
-                // finally, no errors so far, we may attempt to copy a file
-                // protection against copying files to itself
-                if ($sourceFilePath == $destinationFilePath) {
-                    $errorCode = CKFINDER_CONNECTOR_ERROR_SOURCE_AND_TARGET_PATH_EQUAL;
-                    $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                    continue;
-                }
-                // check if file exists if we don't force overwriting
-                else if (file_exists($destinationFilePath)) {
-                    if (strpos($options, "overwrite") !== false) {
-                        if (!@unlink($destinationFilePath)) {
-                            $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                            $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                            continue;
-                        }
-                        else {
-                            if (!@rename($sourceFilePath, $destinationFilePath)) {
-                                $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                                $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                                continue;
-                            }
-                            else {
-                                $moved++;
-                            }
-                        }
-                    }
-                    else if (strpos($options, "autorename") !== false) {
-                        $iCounter = 1;
-                        while (true)
-                        {
-                            $fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name) .
-                                "(" . $iCounter . ")" . "." .
-                                CKFinder_Connector_Utils_FileSystem::getExtension($name);
+				//$overwrite
+				// finally, no errors so far, we may attempt to copy a file
+				// protection against copying files to itself
+				if ($sourceFilePath == $destinationFilePath) {
+					$errorCode = CKFINDER_CONNECTOR_ERROR_SOURCE_AND_TARGET_PATH_EQUAL;
+					$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+					continue;
+				}
+				// check if file exists if we don't force overwriting
+				else if (file_exists($destinationFilePath)) {
+					if (strpos($options, "overwrite") !== false) {
+						if (!@unlink($destinationFilePath)) {
+							$errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+							$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+							continue;
+						}
+						else {
+							if (!@rename($sourceFilePath, $destinationFilePath)) {
+								$errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+								$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+								continue;
+							}
+							else {
+								$moved++;
+							}
+						}
+					}
+					else if (strpos($options, "autorename") !== false) {
+						$iCounter = 1;
+						while (true)
+						{
+							$fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name) .
+								"(" . $iCounter . ")" . "." .
+								CKFinder_Connector_Utils_FileSystem::getExtension($name);
 
-                            $destinationFilePath = $sServerDir.$fileName;
-                            if (!file_exists($destinationFilePath)) {
-                                break;
-                            }
-                            else {
-                                $iCounter++;
-                            }
-                        }
-                        if (!@rename($sourceFilePath, $destinationFilePath)) {
-                            $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                            $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                            continue;
-                        }
-                        else {
-                            $moved++;
-                        }
-                    }
-                    else {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                }
-                else {
-                    if (!@rename($sourceFilePath, $destinationFilePath)) {
-                        $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                        $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-                        continue;
-                    }
-                    else {
-                        $moved++;
-                    }
-                }
-            }
-        }
+							$destinationFilePath = $sServerDir.$fileName;
+							if (!file_exists($destinationFilePath)) {
+								break;
+							}
+							else {
+								$iCounter++;
+							}
+						}
+						if (!@rename($sourceFilePath, $destinationFilePath)) {
+							$errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+							$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+							continue;
+						}
+						else {
+							$moved++;
+						}
+					}
+					else {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+				}
+				else {
+					if (!@rename($sourceFilePath, $destinationFilePath)) {
+						$errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+						$this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+						continue;
+					}
+					else {
+						$moved++;
+					}
+				}
+			}
+		}
 
-        $this->_connectorNode->addChild($oMoveFilesNode);
-        if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
-            $this->_connectorNode->addChild($oErrorsNode);
-        }
-        $oMoveFilesNode->addAttribute("moved", $moved);
-        $oMoveFilesNode->addAttribute("movedTotal", $movedAll + $moved);
+		$this->_connectorNode->addChild($oMoveFilesNode);
+		if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
+			$this->_connectorNode->addChild($oErrorsNode);
+		}
+		$oMoveFilesNode->addAttribute("moved", $moved);
+		$oMoveFilesNode->addAttribute("movedTotal", $movedAll + $moved);
 
-        /**
-         * Note: actually we could have more than one error.
-         * This is just a flag for CKFinder interface telling it to check all errors.
-         */
-        if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_MOVE_FAILED);
-        }
-    }
+		/**
+		 * Note: actually we could have more than one error.
+		 * This is just a flag for CKFinder interface telling it to check all errors.
+		 */
+		if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_MOVE_FAILED);
+		}
+	}
 
-    private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
-    {
-        $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
-        $oErrorNode->addAttribute("code", $errorCode);
-        $oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
-        $oErrorNode->addAttribute("type", $type);
-        $oErrorNode->addAttribute("folder", $path);
-        $oErrorsNode->addChild($oErrorNode);
-    }
+	private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
+	{
+		$oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
+		$oErrorNode->addAttribute("code", $errorCode);
+		$oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
+		$oErrorNode->addAttribute("type", $type);
+		$oErrorNode->addAttribute("folder", $path);
+		$oErrorsNode->addChild($oErrorNode);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 /**
  * Include base XML command handler
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/XmlCommandHandlerBase.php";
 
 /**
  * Handle MoveFiles command
@@ -55,7 +55,7 @@ 
         $clientPath = $this->_currentFolder->getClientPath();
         $sServerDir = $this->_currentFolder->getServerPath();
         $currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         $_aclConfig = $_config->getAccessControlConfig();
         $aclMasks = array();
         $_resourceTypeConfig = array();
@@ -165,7 +165,7 @@ 
                 if ($currentResourceTypeConfig->getName() != $type) {
                     $maxSize = $currentResourceTypeConfig->getMaxSize();
                     $fileSize = filesize($sourceFilePath);
-                    if ($maxSize && $fileSize>$maxSize) {
+                    if ($maxSize && $fileSize > $maxSize) {
                         $errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
                         $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                         continue;
@@ -203,8 +203,8 @@ 
                         $iCounter = 1;
                         while (true)
                         {
-                            $fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name) .
-                                "(" . $iCounter . ")" . "." .
+                            $fileName = CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($name).
+                                "(".$iCounter.")".".".
                                 CKFinder_Connector_Utils_FileSystem::getExtension($name);
 
                             $destinationFilePath = $sServerDir.$fileName;

Braces +11 added lines, -17 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -187,19 +189,16 @@ 
                             $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
                             $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                             continue;
-                        }
-                        else {
+                        } else {
                             if (!@rename($sourceFilePath, $destinationFilePath)) {
                                 $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
                                 $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                                 continue;
-                            }
-                            else {
+                            } else {
                                 $moved++;
                             }
                         }
-                    }
-                    else if (strpos($options, "autorename") !== false) {
+                    } else if (strpos($options, "autorename") !== false) {
                         $iCounter = 1;
                         while (true)
                         {
@@ -210,8 +209,7 @@ 
                             $destinationFilePath = $sServerDir.$fileName;
                             if (!file_exists($destinationFilePath)) {
                                 break;
-                            }
-                            else {
+                            } else {
                                 $iCounter++;
                             }
                         }
@@ -219,24 +217,20 @@ 
                             $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
                             $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                             continue;
-                        }
-                        else {
+                        } else {
                             $moved++;
                         }
-                    }
-                    else {
+                    } else {
                         $errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
                         $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                         continue;
                     }
-                }
-                else {
+                } else {
                     if (!@rename($sourceFilePath, $destinationFilePath)) {
                         $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
                         $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
                         continue;
-                    }
-                    else {
+                    } else {
                         $moved++;
                     }
                 }

libs/ckfinder/core/connector/php/php5/Core/Config.php

Doc Comments +3 added lines, -3 removed lines

@@ -232,7 +232,7 @@ 
 	 * Get "forceAscii" value
 	 *
 	 * @access public
-	 * @return array
+	 * @return boolean
 	 */
     public function forceAscii()
     {
@@ -243,7 +243,7 @@ 
 	 * Get regular expression to hide folders
 	 *
 	 * @access public
-	 * @return array
+	 * @return string
 	 */
     public function getHideFoldersRegex()
     {
@@ -269,7 +269,7 @@ 
 	 * Get regular expression to hide files
 	 *
 	 * @access public
-	 * @return array
+	 * @return string
 	 */
     public function getHideFilesRegex()
     {

Indentation +407 added lines, -407 removed lines

@@ -46,491 +46,491 @@
  */
 class CKFinder_Connector_Core_Config
 {
-    /**
-     * Is CKFinder enabled
-     *
-     * @var boolean
-     * @access private
-     */
-    private $_isEnabled = false;
-    /**
+	/**
+	 * Is CKFinder enabled
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	private $_isEnabled = false;
+	/**
 	 * License Name
 	 *
 	 * @var string
 	 * @access private
 	 */
-    private $_licenseName = "";
-    /**
-     * License Key
-     *
-     * @var string
-     * @access private
-     */
-    private $_licenseKey = "";
-    /**
-     * Role session variable name
-     *
-     * @var string
-     * @access private
-     */
-    private $_roleSessionVar = "CKFinder_UserRole";
-    /**
-     * Access Control Configuration
-     *
-     * @var CKFinder_Connector_Core_AccessControlConfig
-     * @access private
-     */
-    private $_accessControlConfigCache;
-    /**
-     * ResourceType config cache
-     *
-     * @var array
-     * @access private
-     */
-    private $_resourceTypeConfigCache = array();
-    /**
-     * Thumbnails config cache
-     *
-     * @var CKFinder_Connector_Core_ThumbnailsConfig
-     * @access private
-     */
-    private $_thumbnailsConfigCache;
-    /**
-     * Images config cache
-     *
-     * @var CKFinder_Connector_Core_ImagesConfig
-     * @access private
-     */
-    private $_imagesConfigCache;
-    /**
-     * Array with default resource types names
-     *
-     * @access private
-     * @var array
-     */
-    private $_defaultResourceTypes = array();
-    /**
-     * Filesystem encoding
-     *
-     * @var string
-     * @access private
-     */
-    private $_filesystemEncoding;
-    /**
-     * Check double extension
-     *
-     * @var boolean
-     * @access private
-     */
-    private $_checkDoubleExtension = true;
-    /**
-     * If set to true, validate image size
-     *
-     * @var boolean
-     * @access private
-     */
-    private $_secureImageUploads = true;
-    /**
-     * Check file size after scaling images (applies to images only)
-     *
-     * @var boolean
-     */
-    private $_checkSizeAfterScaling = true;
-    /**
-     * For security, HTML is allowed in the first Kb of data for files having the following extensions only
-     *
-     * @var array
-     * @access private
-     */
-    private $_htmlExtensions = array('html', 'htm', 'xml', 'xsd', 'txt', 'js');
-    /**
-     * Chmod files after upload to the following permission
-     *
-     * @var integer
-     * @access private
-     */
-    private $_chmodFiles = 0777;
-    /**
-     * Chmod directories after creation
-     *
-     * @var integer
-     * @access private
-     */
-    private $_chmodFolders = 0755;
-    /**
-     * Hide folders
-     *
-     * @var array
-     * @access private
-     */
-    private $_hideFolders = array(".svn", "CVS");
-    /**
-     * Hide files
-     *
-     * @var integer
-     * @access private
-     */
-    private $_hideFiles = array(".*");
-    /**
-     * If set to true, force ASCII names
-     *
-     * @var boolean
-     * @access private
-     */
-    private $_forceAscii = false;
-
-    function __construct()
-    {
-        $this->loadValues();
-    }
-
-    /**
+	private $_licenseName = "";
+	/**
+	 * License Key
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_licenseKey = "";
+	/**
+	 * Role session variable name
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_roleSessionVar = "CKFinder_UserRole";
+	/**
+	 * Access Control Configuration
+	 *
+	 * @var CKFinder_Connector_Core_AccessControlConfig
+	 * @access private
+	 */
+	private $_accessControlConfigCache;
+	/**
+	 * ResourceType config cache
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_resourceTypeConfigCache = array();
+	/**
+	 * Thumbnails config cache
+	 *
+	 * @var CKFinder_Connector_Core_ThumbnailsConfig
+	 * @access private
+	 */
+	private $_thumbnailsConfigCache;
+	/**
+	 * Images config cache
+	 *
+	 * @var CKFinder_Connector_Core_ImagesConfig
+	 * @access private
+	 */
+	private $_imagesConfigCache;
+	/**
+	 * Array with default resource types names
+	 *
+	 * @access private
+	 * @var array
+	 */
+	private $_defaultResourceTypes = array();
+	/**
+	 * Filesystem encoding
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_filesystemEncoding;
+	/**
+	 * Check double extension
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	private $_checkDoubleExtension = true;
+	/**
+	 * If set to true, validate image size
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	private $_secureImageUploads = true;
+	/**
+	 * Check file size after scaling images (applies to images only)
+	 *
+	 * @var boolean
+	 */
+	private $_checkSizeAfterScaling = true;
+	/**
+	 * For security, HTML is allowed in the first Kb of data for files having the following extensions only
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_htmlExtensions = array('html', 'htm', 'xml', 'xsd', 'txt', 'js');
+	/**
+	 * Chmod files after upload to the following permission
+	 *
+	 * @var integer
+	 * @access private
+	 */
+	private $_chmodFiles = 0777;
+	/**
+	 * Chmod directories after creation
+	 *
+	 * @var integer
+	 * @access private
+	 */
+	private $_chmodFolders = 0755;
+	/**
+	 * Hide folders
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_hideFolders = array(".svn", "CVS");
+	/**
+	 * Hide files
+	 *
+	 * @var integer
+	 * @access private
+	 */
+	private $_hideFiles = array(".*");
+	/**
+	 * If set to true, force ASCII names
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	private $_forceAscii = false;
+
+	function __construct()
+	{
+		$this->loadValues();
+	}
+
+	/**
 	 * Get file system encoding, returns null if encoding is not set
 	 *
 	 * @access public
 	 * @return string
 	 */
-    public function getFilesystemEncoding()
-    {
-        return $this->_filesystemEncoding;
-    }
+	public function getFilesystemEncoding()
+	{
+		return $this->_filesystemEncoding;
+	}
 
-    /**
+	/**
 	 * Get "secureImageUploads" value
 	 *
 	 * @access public
 	 * @return boolean
 	 */
-    public function getSecureImageUploads()
-    {
-        return $this->_secureImageUploads;
-    }
+	public function getSecureImageUploads()
+	{
+		return $this->_secureImageUploads;
+	}
 
-    /**
+	/**
 	 * Get "checkSizeAfterScaling" value
 	 *
 	 * @access public
 	 * @return boolean
 	 */
-    public function checkSizeAfterScaling()
-    {
-        return $this->_checkSizeAfterScaling;
-    }
+	public function checkSizeAfterScaling()
+	{
+		return $this->_checkSizeAfterScaling;
+	}
 
-    /**
+	/**
 	 * Get "htmlExtensions" value
 	 *
 	 * @access public
 	 * @return array
 	 */
-    public function getHtmlExtensions()
-    {
-        return $this->_htmlExtensions;
-    }
+	public function getHtmlExtensions()
+	{
+		return $this->_htmlExtensions;
+	}
 
-    /**
+	/**
 	 * Get "forceAscii" value
 	 *
 	 * @access public
 	 * @return array
 	 */
-    public function forceAscii()
-    {
-        return $this->_forceAscii;
-    }
+	public function forceAscii()
+	{
+		return $this->_forceAscii;
+	}
 
-    /**
+	/**
 	 * Get regular expression to hide folders
 	 *
 	 * @access public
 	 * @return array
 	 */
-    public function getHideFoldersRegex()
-    {
-        static $folderRegex;
-
-        if (!isset($folderRegex)) {
-            if (is_array($this->_hideFolders) && $this->_hideFolders) {
-                $folderRegex = join("|", $this->_hideFolders);
-                $folderRegex = strtr($folderRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
-                $folderRegex = preg_quote($folderRegex, "/");
-                $folderRegex = strtr($folderRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
-                $folderRegex = "/^(?:" . $folderRegex . ")$/uim";
-            }
-            else {
-                $folderRegex = "";
-            }
-        }
-
-        return $folderRegex;
-    }
-
-    /**
+	public function getHideFoldersRegex()
+	{
+		static $folderRegex;
+
+		if (!isset($folderRegex)) {
+			if (is_array($this->_hideFolders) && $this->_hideFolders) {
+				$folderRegex = join("|", $this->_hideFolders);
+				$folderRegex = strtr($folderRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
+				$folderRegex = preg_quote($folderRegex, "/");
+				$folderRegex = strtr($folderRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
+				$folderRegex = "/^(?:" . $folderRegex . ")$/uim";
+			}
+			else {
+				$folderRegex = "";
+			}
+		}
+
+		return $folderRegex;
+	}
+
+	/**
 	 * Get regular expression to hide files
 	 *
 	 * @access public
 	 * @return array
 	 */
-    public function getHideFilesRegex()
-    {
-        static $fileRegex;
-
-        if (!isset($fileRegex)) {
-            if (is_array($this->_hideFiles) && $this->_hideFiles) {
-                $fileRegex = join("|", $this->_hideFiles);
-                $fileRegex = strtr($fileRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
-                $fileRegex = preg_quote($fileRegex, "/");
-                $fileRegex = strtr($fileRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
-                $fileRegex = "/^(?:" . $fileRegex . ")$/uim";
-            }
-            else {
-                $fileRegex = "";
-            }
-        }
-
-        return $fileRegex;
-    }
-
-    /**
+	public function getHideFilesRegex()
+	{
+		static $fileRegex;
+
+		if (!isset($fileRegex)) {
+			if (is_array($this->_hideFiles) && $this->_hideFiles) {
+				$fileRegex = join("|", $this->_hideFiles);
+				$fileRegex = strtr($fileRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
+				$fileRegex = preg_quote($fileRegex, "/");
+				$fileRegex = strtr($fileRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
+				$fileRegex = "/^(?:" . $fileRegex . ")$/uim";
+			}
+			else {
+				$fileRegex = "";
+			}
+		}
+
+		return $fileRegex;
+	}
+
+	/**
 	 * Get "Check double extension" value
 	 *
 	 * @access public
 	 * @return boolean
 	 */
-    public function getCheckDoubleExtension()
-    {
-        return $this->_checkDoubleExtension;
-    }
+	public function getCheckDoubleExtension()
+	{
+		return $this->_checkDoubleExtension;
+	}
 
-    /**
+	/**
 	 * Get default resource types
 	 *
 	 * @access public
 	 * @return array()
 	 */
-    public function getDefaultResourceTypes()
-    {
-        return $this->_defaultResourceTypes;
-    }
+	public function getDefaultResourceTypes()
+	{
+		return $this->_defaultResourceTypes;
+	}
 
-    /**
+	/**
 	 * Is CKFinder enabled
 	 *
 	 * @access public
 	 * @return boolean
 	 */
-    public function getIsEnabled()
-    {
-        return $this->_isEnabled;
-    }
+	public function getIsEnabled()
+	{
+		return $this->_isEnabled;
+	}
 
-    /**
+	/**
 	 * Get license key
 	 *
 	 * @access public
 	 * @return string
 	 */
-    public function getLicenseKey()
-    {
-        return $this->_licenseKey;
-    }
-
-    /**
-	* Get license name
-	*
-	* @access public
-	* @return string
-	*/
-    public function getLicenseName()
-    {
-        return $this->_licenseName;
-    }
-
-    /**
-	* Get chmod settings for uploaded files
-	*
-	* @access public
-	* @return integer
-	*/
-    public function getChmodFiles()
-    {
-        return $this->_chmodFiles;
-    }
-
-    /**
-	* Get chmod settings for created directories
-	*
-	* @access public
-	* @return integer
-	*/
-    public function getChmodFolders()
-    {
-        return $this->_chmodFolders;
-    }
-
-    /**
+	public function getLicenseKey()
+	{
+		return $this->_licenseKey;
+	}
+
+	/**
+	 * Get license name
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function getLicenseName()
+	{
+		return $this->_licenseName;
+	}
+
+	/**
+	 * Get chmod settings for uploaded files
+	 *
+	 * @access public
+	 * @return integer
+	 */
+	public function getChmodFiles()
+	{
+		return $this->_chmodFiles;
+	}
+
+	/**
+	 * Get chmod settings for created directories
+	 *
+	 * @access public
+	 * @return integer
+	 */
+	public function getChmodFolders()
+	{
+		return $this->_chmodFolders;
+	}
+
+	/**
 	 * Get role sesion variable name
 	 *
 	 * @access public
 	 * @return string
 	 */
-    public function getRoleSessionVar()
-    {
-        return $this->_roleSessionVar;
-    }
+	public function getRoleSessionVar()
+	{
+		return $this->_roleSessionVar;
+	}
 
-    /**
+	/**
 	 * Get resourceTypeName config
 	 *
 	 * @param string $resourceTypeName
 	 * @return CKFinder_Connector_Core_ResourceTypeConfig|null
 	 * @access public
 	 */
-    public function &getResourceTypeConfig($resourceTypeName)
-    {
-        $_null = null;
-
-        if (isset($this->_resourceTypeConfigCache[$resourceTypeName])) {
-            return $this->_resourceTypeConfigCache[$resourceTypeName];
-        }
-
-        if (!isset($GLOBALS['config']['ResourceType']) || !is_array($GLOBALS['config']['ResourceType'])) {
-            return $_null;
-        }
-
-        reset($GLOBALS['config']['ResourceType']);
-        while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
-            if ($_resourceTypeNode['name'] === $resourceTypeName) {
-                $this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
-
-                return $this->_resourceTypeConfigCache[$resourceTypeName];
-            }
-        }
-
-        return $_null;
-    }
-
-    /**
-     * Get thumbnails config
-     *
-     * @access public
-     * @return CKFinder_Connector_Core_ThumbnailsConfig
-     */
-    public function &getThumbnailsConfig()
-    {
-        if (!isset($this->_thumbnailsConfigCache)) {
-            $this->_thumbnailsConfigCache = new CKFinder_Connector_Core_ThumbnailsConfig(isset($GLOBALS['config']['Thumbnails']) ? $GLOBALS['config']['Thumbnails'] : array());
-        }
-
-        return $this->_thumbnailsConfigCache;
-    }
-
-    /**
-     * Get images config
-     *
-     * @access public
-     * @return CKFinder_Connector_Core_ImagesConfig
-     */
-    public function &getImagesConfig()
-    {
-        if (!isset($this->_imagesConfigCache)) {
-            $this->_imagesConfigCache = new CKFinder_Connector_Core_ImagesConfig(isset($GLOBALS['config']['Images']) ? $GLOBALS['config']['Images'] : array());
-        }
-
-        return $this->_imagesConfigCache;
-    }
-
-    /**
-     * Get access control config
-     *
-     * @access public
-     * @return CKFinder_Connector_Core_AccessControlConfig
-     */
-    public function &getAccessControlConfig()
-    {
-        if (!isset($this->_accessControlConfigCache)) {
-            $this->_accessControlConfigCache = new CKFinder_Connector_Core_AccessControlConfig(isset($GLOBALS['config']['AccessControl']) ? $GLOBALS['config']['AccessControl'] : array());
-        }
-
-        return $this->_accessControlConfigCache;
-    }
-
-    /**
-     * Load values from config
-     *
-     * @access private
-     */
-    private function loadValues()
-    {
-        if (function_exists('CheckAuthentication')) {
-            $this->_isEnabled = CheckAuthentication();
-        }
-        if (isset($GLOBALS['config']['LicenseName'])) {
-            $this->_licenseName = (string)$GLOBALS['config']['LicenseName'];
-        }
-        if (isset($GLOBALS['config']['LicenseKey'])) {
-            $this->_licenseKey = (string)$GLOBALS['config']['LicenseKey'];
-        }
-        if (isset($GLOBALS['config']['FilesystemEncoding'])) {
-            $this->_filesystemEncoding = (string)$GLOBALS['config']['FilesystemEncoding'];
-        }
-        if (isset($GLOBALS['config']['RoleSessionVar'])) {
-            $this->_roleSessionVar = (string)$GLOBALS['config']['RoleSessionVar'];
-        }
-        if (isset($GLOBALS['config']['CheckDoubleExtension'])) {
-            $this->_checkDoubleExtension = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['CheckDoubleExtension']);
-        }
-        if (isset($GLOBALS['config']['SecureImageUploads'])) {
-            $this->_secureImageUploads = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['SecureImageUploads']);
-        }
-        if (isset($GLOBALS['config']['CheckSizeAfterScaling'])) {
-            $this->_checkSizeAfterScaling = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['CheckSizeAfterScaling']);
-        }
-        if (isset($GLOBALS['config']['ForceAscii'])) {
-            $this->_forceAscii = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['ForceAscii']);
-        }
-        if (isset($GLOBALS['config']['HtmlExtensions'])) {
-            $this->_htmlExtensions = (array)$GLOBALS['config']['HtmlExtensions'];
-        }
-        if (isset($GLOBALS['config']['HideFolders'])) {
-            $this->_hideFolders = (array)$GLOBALS['config']['HideFolders'];
-        }
-        if (isset($GLOBALS['config']['HideFiles'])) {
-            $this->_hideFiles = (array)$GLOBALS['config']['HideFiles'];
-        }
-        if (isset($GLOBALS['config']['ChmodFiles'])) {
-            $this->_chmodFiles = $GLOBALS['config']['ChmodFiles'];
-        }
-        if (isset($GLOBALS['config']['ChmodFolders'])) {
-            $this->_chmodFolders = $GLOBALS['config']['ChmodFolders'];
-        }
-        if (isset($GLOBALS['config']['DefaultResourceTypes'])) {
-            $_defaultResourceTypes = (string)$GLOBALS['config']['DefaultResourceTypes'];
-            if (strlen($_defaultResourceTypes)) {
-                $this->_defaultResourceTypes = explode(",", $_defaultResourceTypes);
-            }
-        }
-    }
-
-    /**
-     * Get all resource type names defined in config
-     *
-     * @return array
-     * @access public
-     */
-    public function getResourceTypeNames()
-    {
-        if (!isset($GLOBALS['config']['ResourceType']) || !is_array($GLOBALS['config']['ResourceType'])) {
-            return array();
-        }
-
-        $_names = array();
-        foreach ($GLOBALS['config']['ResourceType'] as $key => $_resourceType) {
-            if (isset($_resourceType['name'])) {
-                $_names[] = (string)$_resourceType['name'];
-            }
-        }
-
-        return $_names;
-    }
+	public function &getResourceTypeConfig($resourceTypeName)
+	{
+		$_null = null;
+
+		if (isset($this->_resourceTypeConfigCache[$resourceTypeName])) {
+			return $this->_resourceTypeConfigCache[$resourceTypeName];
+		}
+
+		if (!isset($GLOBALS['config']['ResourceType']) || !is_array($GLOBALS['config']['ResourceType'])) {
+			return $_null;
+		}
+
+		reset($GLOBALS['config']['ResourceType']);
+		while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
+			if ($_resourceTypeNode['name'] === $resourceTypeName) {
+				$this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
+
+				return $this->_resourceTypeConfigCache[$resourceTypeName];
+			}
+		}
+
+		return $_null;
+	}
+
+	/**
+	 * Get thumbnails config
+	 *
+	 * @access public
+	 * @return CKFinder_Connector_Core_ThumbnailsConfig
+	 */
+	public function &getThumbnailsConfig()
+	{
+		if (!isset($this->_thumbnailsConfigCache)) {
+			$this->_thumbnailsConfigCache = new CKFinder_Connector_Core_ThumbnailsConfig(isset($GLOBALS['config']['Thumbnails']) ? $GLOBALS['config']['Thumbnails'] : array());
+		}
+
+		return $this->_thumbnailsConfigCache;
+	}
+
+	/**
+	 * Get images config
+	 *
+	 * @access public
+	 * @return CKFinder_Connector_Core_ImagesConfig
+	 */
+	public function &getImagesConfig()
+	{
+		if (!isset($this->_imagesConfigCache)) {
+			$this->_imagesConfigCache = new CKFinder_Connector_Core_ImagesConfig(isset($GLOBALS['config']['Images']) ? $GLOBALS['config']['Images'] : array());
+		}
+
+		return $this->_imagesConfigCache;
+	}
+
+	/**
+	 * Get access control config
+	 *
+	 * @access public
+	 * @return CKFinder_Connector_Core_AccessControlConfig
+	 */
+	public function &getAccessControlConfig()
+	{
+		if (!isset($this->_accessControlConfigCache)) {
+			$this->_accessControlConfigCache = new CKFinder_Connector_Core_AccessControlConfig(isset($GLOBALS['config']['AccessControl']) ? $GLOBALS['config']['AccessControl'] : array());
+		}
+
+		return $this->_accessControlConfigCache;
+	}
+
+	/**
+	 * Load values from config
+	 *
+	 * @access private
+	 */
+	private function loadValues()
+	{
+		if (function_exists('CheckAuthentication')) {
+			$this->_isEnabled = CheckAuthentication();
+		}
+		if (isset($GLOBALS['config']['LicenseName'])) {
+			$this->_licenseName = (string)$GLOBALS['config']['LicenseName'];
+		}
+		if (isset($GLOBALS['config']['LicenseKey'])) {
+			$this->_licenseKey = (string)$GLOBALS['config']['LicenseKey'];
+		}
+		if (isset($GLOBALS['config']['FilesystemEncoding'])) {
+			$this->_filesystemEncoding = (string)$GLOBALS['config']['FilesystemEncoding'];
+		}
+		if (isset($GLOBALS['config']['RoleSessionVar'])) {
+			$this->_roleSessionVar = (string)$GLOBALS['config']['RoleSessionVar'];
+		}
+		if (isset($GLOBALS['config']['CheckDoubleExtension'])) {
+			$this->_checkDoubleExtension = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['CheckDoubleExtension']);
+		}
+		if (isset($GLOBALS['config']['SecureImageUploads'])) {
+			$this->_secureImageUploads = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['SecureImageUploads']);
+		}
+		if (isset($GLOBALS['config']['CheckSizeAfterScaling'])) {
+			$this->_checkSizeAfterScaling = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['CheckSizeAfterScaling']);
+		}
+		if (isset($GLOBALS['config']['ForceAscii'])) {
+			$this->_forceAscii = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['ForceAscii']);
+		}
+		if (isset($GLOBALS['config']['HtmlExtensions'])) {
+			$this->_htmlExtensions = (array)$GLOBALS['config']['HtmlExtensions'];
+		}
+		if (isset($GLOBALS['config']['HideFolders'])) {
+			$this->_hideFolders = (array)$GLOBALS['config']['HideFolders'];
+		}
+		if (isset($GLOBALS['config']['HideFiles'])) {
+			$this->_hideFiles = (array)$GLOBALS['config']['HideFiles'];
+		}
+		if (isset($GLOBALS['config']['ChmodFiles'])) {
+			$this->_chmodFiles = $GLOBALS['config']['ChmodFiles'];
+		}
+		if (isset($GLOBALS['config']['ChmodFolders'])) {
+			$this->_chmodFolders = $GLOBALS['config']['ChmodFolders'];
+		}
+		if (isset($GLOBALS['config']['DefaultResourceTypes'])) {
+			$_defaultResourceTypes = (string)$GLOBALS['config']['DefaultResourceTypes'];
+			if (strlen($_defaultResourceTypes)) {
+				$this->_defaultResourceTypes = explode(",", $_defaultResourceTypes);
+			}
+		}
+	}
+
+	/**
+	 * Get all resource type names defined in config
+	 *
+	 * @return array
+	 * @access public
+	 */
+	public function getResourceTypeNames()
+	{
+		if (!isset($GLOBALS['config']['ResourceType']) || !is_array($GLOBALS['config']['ResourceType'])) {
+			return array();
+		}
+
+		$_names = array();
+		foreach ($GLOBALS['config']['ResourceType'] as $key => $_resourceType) {
+			if (isset($_resourceType['name'])) {
+				$_names[] = (string)$_resourceType['name'];
+			}
+		}
+
+		return $_names;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -21,19 +21,19 @@ 
 /**
  * Include access control config class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/AccessControlConfig.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/AccessControlConfig.php";
 /**
  * Include resource type config class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/ResourceTypeConfig.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/ResourceTypeConfig.php";
 /**
  * Include thumbnails config class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/ThumbnailsConfig.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/ThumbnailsConfig.php";
 /**
  * Include images config class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/ImagesConfig.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/ImagesConfig.php";
 
 /**
  * Main config parser
@@ -255,7 +255,7 @@ 
                 $folderRegex = strtr($folderRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
                 $folderRegex = preg_quote($folderRegex, "/");
                 $folderRegex = strtr($folderRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
-                $folderRegex = "/^(?:" . $folderRegex . ")$/uim";
+                $folderRegex = "/^(?:".$folderRegex.")$/uim";
             }
             else {
                 $folderRegex = "";
@@ -281,7 +281,7 @@ 
                 $fileRegex = strtr($fileRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
                 $fileRegex = preg_quote($fileRegex, "/");
                 $fileRegex = strtr($fileRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
-                $fileRegex = "/^(?:" . $fileRegex . ")$/uim";
+                $fileRegex = "/^(?:".$fileRegex.")$/uim";
             }
             else {
                 $fileRegex = "";
@@ -399,7 +399,7 @@ 
         }
 
         reset($GLOBALS['config']['ResourceType']);
-        while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
+        while (list($_key, $_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
             if ($_resourceTypeNode['name'] === $resourceTypeName) {
                 $this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
 

Braces +5 added lines, -5 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -256,8 +258,7 @@ 
                 $folderRegex = preg_quote($folderRegex, "/");
                 $folderRegex = strtr($folderRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
                 $folderRegex = "/^(?:" . $folderRegex . ")$/uim";
-            }
-            else {
+            } else {
                 $folderRegex = "";
             }
         }
@@ -282,8 +283,7 @@ 
                 $fileRegex = preg_quote($fileRegex, "/");
                 $fileRegex = strtr($fileRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
                 $fileRegex = "/^(?:" . $fileRegex . ")$/uim";
-            }
-            else {
+            } else {
                 $fileRegex = "";
             }
         }

libs/ckfinder/core/connector/php/php5/Core/Hooks.php

Doc Comments -1 removed lines

@@ -24,7 +24,6 @@
      * Run user defined hooks
      *
      * @param string $event
-     * @param object $errorHandler
      * @param array $args
      * @return boolean (true to continue processing, false otherwise)
      */

Indentation +135 added lines, -135 removed lines

@@ -20,153 +20,153 @@
 class CKFinder_Connector_Core_Hooks
 {
 
-    /**
-     * Run user defined hooks
-     *
-     * @param string $event
-     * @param object $errorHandler
-     * @param array $args
-     * @return boolean (true to continue processing, false otherwise)
-     */
-    public static function run($event, $args = array())
-    {
-        $config = $GLOBALS['config'];
-        if (!isset($config['Hooks'])) {
-            return true;
-        }
-        $hooks =& $config['Hooks'];
+	/**
+	 * Run user defined hooks
+	 *
+	 * @param string $event
+	 * @param object $errorHandler
+	 * @param array $args
+	 * @return boolean (true to continue processing, false otherwise)
+	 */
+	public static function run($event, $args = array())
+	{
+		$config = $GLOBALS['config'];
+		if (!isset($config['Hooks'])) {
+			return true;
+		}
+		$hooks =& $config['Hooks'];
 
-        if (!is_array($hooks) || !array_key_exists($event, $hooks) || !is_array($hooks[$event])) {
-            return true;
-        }
+		if (!is_array($hooks) || !array_key_exists($event, $hooks) || !is_array($hooks[$event])) {
+			return true;
+		}
 
-        $errorHandler = $GLOBALS['connector']->getErrorHandler();
+		$errorHandler = $GLOBALS['connector']->getErrorHandler();
 
-        foreach ($hooks[$event] as $i => $hook) {
+		foreach ($hooks[$event] as $i => $hook) {
 
-            $object = NULL;
-            $method = NULL;
-            $function = NULL;
-            $data = NULL;
-            $passData = false;
+			$object = NULL;
+			$method = NULL;
+			$function = NULL;
+			$data = NULL;
+			$passData = false;
 
-            /* $hook can be: a function, an object, an array of $functiontion and $data,
+			/* $hook can be: a function, an object, an array of $functiontion and $data,
             * an array of just a function, an array of object and method, or an
             * array of object, method, and data.
             */
-            //function
-            if (is_string($hook)) {
-                $function = $hook;
-            }
-            //object
-            else if (is_object($hook)) {
-                $object = $hooks[$event][$i];
-                $method = "on" . $event;
-            }
-            //array of...
-            else if (is_array($hook)) {
-                $count = count($hook);
-                if ($count) {
-                    //...object
-                    if (is_object($hook[0])) {
-                        $object = $hooks[$event][$i][0];
-                        if ($count < 2) {
-                            $method = "on" . $event;
-                        } else {
-                            //...object and method
-                            $method = $hook[1];
-                            if (count($hook) > 2) {
-                                //...object, method and data
-                                $passData = true;
-                                $data = $hook[2];
-                            }
-                        }
-                    }
-                    //...function
-                    else if (is_string($hook[0])) {
-                        $function = $hook[0];
-                        if ($count > 1) {
-                            //...function with data
-                            $passData = true;
-                            $data = $hook[1];
-                        }
-                    }
-                }
-            }
+			//function
+			if (is_string($hook)) {
+				$function = $hook;
+			}
+			//object
+			else if (is_object($hook)) {
+				$object = $hooks[$event][$i];
+				$method = "on" . $event;
+			}
+			//array of...
+			else if (is_array($hook)) {
+				$count = count($hook);
+				if ($count) {
+					//...object
+					if (is_object($hook[0])) {
+						$object = $hooks[$event][$i][0];
+						if ($count < 2) {
+							$method = "on" . $event;
+						} else {
+							//...object and method
+							$method = $hook[1];
+							if (count($hook) > 2) {
+								//...object, method and data
+								$passData = true;
+								$data = $hook[2];
+							}
+						}
+					}
+					//...function
+					else if (is_string($hook[0])) {
+						$function = $hook[0];
+						if ($count > 1) {
+							//...function with data
+							$passData = true;
+							$data = $hook[1];
+						}
+					}
+				}
+			}
 
-            /* If defined, add data to the arguments array */
-            if ($passData) {
-                $args = array_merge(array($data), $args);
-            }
+			/* If defined, add data to the arguments array */
+			if ($passData) {
+				$args = array_merge(array($data), $args);
+			}
 
-            if (isset($object)) {
-                $callback = array($object, $method);
-            }
-            else if (false !== ($pos = strpos($function, '::'))) {
-                $callback = array(substr($function, 0, $pos), substr($function, $pos + 2));
-            }
-            else {
-                $callback = $function;
-            }
+			if (isset($object)) {
+				$callback = array($object, $method);
+			}
+			else if (false !== ($pos = strpos($function, '::'))) {
+				$callback = array(substr($function, 0, $pos), substr($function, $pos + 2));
+			}
+			else {
+				$callback = $function;
+			}
 
-            if (is_callable($callback)) {
-                $ret = call_user_func_array($callback, $args);
-            }
-            else {
-                $functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
-                $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
-                "CKFinder failed to call a hook: " . $functionName);
-                return false;
-            }
+			if (is_callable($callback)) {
+				$ret = call_user_func_array($callback, $args);
+			}
+			else {
+				$functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
+				$errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
+				"CKFinder failed to call a hook: " . $functionName);
+				return false;
+			}
 
-            //String return is a custom error
-            if (is_string($ret)) {
-                $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR, $ret);
-                return false;
-            }
-            //hook returned an error code, user error codes start from 50000
-            //error codes are important because this way it is possible to create multilanguage extensions
-            //recomendation: create a function that calculates the error codes starting number
-            //for an extension, a pool of 100 error codes for each extension should be safe enough
-            else if (is_int($ret)) {
-                $errorHandler->throwError($ret);
-                return false;
-            }
-            //no value returned
-            else if( $ret === null ) {
-                $functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
-                $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
-                "CKFinder extension returned an invalid value (null)." .
-                "Hook " . $functionName . " should return a value.");
-                return false;
-            }
-            else if (!$ret) {
-                return false;
-            }
-        }
+			//String return is a custom error
+			if (is_string($ret)) {
+				$errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR, $ret);
+				return false;
+			}
+			//hook returned an error code, user error codes start from 50000
+			//error codes are important because this way it is possible to create multilanguage extensions
+			//recomendation: create a function that calculates the error codes starting number
+			//for an extension, a pool of 100 error codes for each extension should be safe enough
+			else if (is_int($ret)) {
+				$errorHandler->throwError($ret);
+				return false;
+			}
+			//no value returned
+			else if( $ret === null ) {
+				$functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
+				$errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
+				"CKFinder extension returned an invalid value (null)." .
+				"Hook " . $functionName . " should return a value.");
+				return false;
+			}
+			else if (!$ret) {
+				return false;
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Print user friendly name of a callback
-     *
-     * @param mixed $callback
-     * @return string
-     */
-    public static function _printCallback($callback)
-    {
-        if (is_array($callback)) {
-            if (is_object($callback[0])) {
-                $className = get_class($callback[0]);
-            } else {
-                $className = strval($callback[0]);
-            }
-            $functionName = $className . '::' . strval($callback[1]);
-        }
-        else {
-            $functionName = strval($callback);
-        }
-        return $functionName;
-    }
+	/**
+	 * Print user friendly name of a callback
+	 *
+	 * @param mixed $callback
+	 * @return string
+	 */
+	public static function _printCallback($callback)
+	{
+		if (is_array($callback)) {
+			if (is_object($callback[0])) {
+				$className = get_class($callback[0]);
+			} else {
+				$className = strval($callback[0]);
+			}
+			$functionName = $className . '::' . strval($callback[1]);
+		}
+		else {
+			$functionName = strval($callback);
+		}
+		return $functionName;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
         if (!isset($config['Hooks'])) {
             return true;
         }
-        $hooks =& $config['Hooks'];
+        $hooks = & $config['Hooks'];
 
         if (!is_array($hooks) || !array_key_exists($event, $hooks) || !is_array($hooks[$event])) {
             return true;
@@ -61,7 +61,7 @@ 
             //object
             else if (is_object($hook)) {
                 $object = $hooks[$event][$i];
-                $method = "on" . $event;
+                $method = "on".$event;
             }
             //array of...
             else if (is_array($hook)) {
@@ -71,7 +71,7 @@ 
                     if (is_object($hook[0])) {
                         $object = $hooks[$event][$i][0];
                         if ($count < 2) {
-                            $method = "on" . $event;
+                            $method = "on".$event;
                         } else {
                             //...object and method
                             $method = $hook[1];
@@ -115,7 +115,7 @@ 
             else {
                 $functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
                 $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
-                "CKFinder failed to call a hook: " . $functionName);
+                "CKFinder failed to call a hook: ".$functionName);
                 return false;
             }
 
@@ -133,11 +133,11 @@ 
                 return false;
             }
             //no value returned
-            else if( $ret === null ) {
+            else if ($ret === null) {
                 $functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
                 $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
-                "CKFinder extension returned an invalid value (null)." .
-                "Hook " . $functionName . " should return a value.");
+                "CKFinder extension returned an invalid value (null).".
+                "Hook ".$functionName." should return a value.");
                 return false;
             }
             else if (!$ret) {
@@ -162,7 +162,7 @@ 
             } else {
                 $className = strval($callback[0]);
             }
-            $functionName = $className . '::' . strval($callback[1]);
+            $functionName = $className.'::'.strval($callback[1]);
         }
         else {
             $functionName = strval($callback);

Braces +8 added lines, -11 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -101,18 +103,15 @@ 
 
             if (isset($object)) {
                 $callback = array($object, $method);
-            }
-            else if (false !== ($pos = strpos($function, '::'))) {
+            } else if (false !== ($pos = strpos($function, '::'))) {
                 $callback = array(substr($function, 0, $pos), substr($function, $pos + 2));
-            }
-            else {
+            } else {
                 $callback = $function;
             }
 
             if (is_callable($callback)) {
                 $ret = call_user_func_array($callback, $args);
-            }
-            else {
+            } else {
                 $functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
                 $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
                 "CKFinder failed to call a hook: " . $functionName);
@@ -139,8 +138,7 @@ 
                 "CKFinder extension returned an invalid value (null)." .
                 "Hook " . $functionName . " should return a value.");
                 return false;
-            }
-            else if (!$ret) {
+            } else if (!$ret) {
                 return false;
             }
         }
@@ -163,8 +161,7 @@ 
                 $className = strval($callback[0]);
             }
             $functionName = $className . '::' . strval($callback[1]);
-        }
-        else {
+        } else {
             $functionName = strval($callback);
         }
         return $functionName;

libs/ckfinder/core/connector/php/php5/Core/Registry.php

Doc Comments +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
      * Set value
      *
      * @param string $key
-     * @param mixed $obj
+     * @param string $obj
      * @access public
      */
     public function set($key, $obj)
@@ -63,7 +63,7 @@ 
      * Get value
      *
      * @param string $key
-     * @return mixed
+     * @return string
      * @access public
      */
     public function get($key)

Indentation +42 added lines, -42 removed lines

@@ -27,49 +27,49 @@
  */
 class CKFinder_Connector_Core_Registry
 {
-    /**
-     * Arrat that stores all values
-     *
-     * @var array
-     * @access private
-     */
-    private $_store = array();
+	/**
+	 * Arrat that stores all values
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_store = array();
 
-    /**
-     * Chacke if value has been set
-     *
-     * @param string $key
-     * @return boolean
-     * @access private
-     */
-    private function isValid($key)
-    {
-        return array_key_exists($key, $this->_store);
-    }
+	/**
+	 * Chacke if value has been set
+	 *
+	 * @param string $key
+	 * @return boolean
+	 * @access private
+	 */
+	private function isValid($key)
+	{
+		return array_key_exists($key, $this->_store);
+	}
 
-    /**
-     * Set value
-     *
-     * @param string $key
-     * @param mixed $obj
-     * @access public
-     */
-    public function set($key, $obj)
-    {
-        $this->_store[$key] = $obj;
-    }
+	/**
+	 * Set value
+	 *
+	 * @param string $key
+	 * @param mixed $obj
+	 * @access public
+	 */
+	public function set($key, $obj)
+	{
+		$this->_store[$key] = $obj;
+	}
 
-    /**
-     * Get value
-     *
-     * @param string $key
-     * @return mixed
-     * @access public
-     */
-    public function get($key)
-    {
-    	if ($this->isValid($key)) {
-    	    return $this->_store[$key];
-    	}
-    }
+	/**
+	 * Get value
+	 *
+	 * @param string $key
+	 * @return mixed
+	 * @access public
+	 */
+	public function get($key)
+	{
+		if ($this->isValid($key)) {
+			return $this->_store[$key];
+		}
+	}
 }

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder

libs/ckfinder/core/connector/php/php5/Core/ResourceTypeConfig.php

Doc Comments +1 added lines, -2 removed lines

@@ -221,7 +221,6 @@ 
      * If allowed extensions are defined, return false if extension isn't on allowed list.
      *
      * @access public
-     * @param string $extension extension
      * @param boolean $renameIfRequired whether try to rename file or not
      * @return boolean
      */
@@ -314,8 +313,8 @@ 
      * Check given path
      * Return true if path contains folder name that matches hidden folder names list
      *
-     * @param string $folderName
      * @access public
+     * @param string $path
      * @return boolean
      */
     public function checkIsHiddenPath($path)

Indentation +321 added lines, -321 removed lines

@@ -27,325 +27,325 @@
  */
 class CKFinder_Connector_Core_ResourceTypeConfig
 {
-    /**
-     * Resource name
-     *
-     * @var string
-     * @access private
-     */
-    private $_name = "";
-    /**
-     * Resource url
-     *
-     * @var string
-     * @access private
-     */
-    private $_url = "";
-    /**
-     * Directory path on a server
-     *
-     * @var string
-     * @access private
-     */
-    private $_directory = "";
-    /**
-     * Max size
-     *
-     * @var unknown_type
-     * @access private
-     */
-    private $_maxSize = 0;
-    /**
-     * Array with allowed extensions
-     *
-     * @var array[]string
-     * @access private
-     */
-    private $_allowedExtensions = array();
-    /**
-     * Array with denied extensions
-     *
-     * @var array[]string
-     * @access private
-     */
-    private $_deniedExtensions = array();
-    /**
-     * used for CKFinder_Connector_Core_Config object caching
-     *
-     * @var CKFinder_Connector_Core_Config
-     * @access private
-     */
-    private $_config;
-
-    /**
-     * Get ResourceType configuration
-     *
-     * @param string $resourceTypeNode
-     * @return array
-     *
-     */
-    function __construct($resourceTypeNode)
-    {
-        if (isset($resourceTypeNode["name"])) {
-            $this->_name = $resourceTypeNode["name"];
-        }
-
-        if (isset($resourceTypeNode["url"])) {
-            $this->_url = $resourceTypeNode["url"];
-        }
-
-        if (!strlen($this->_url)) {
-            $this->_url = "/";
-        }
-        else if(substr($this->_url,-1,1) != "/") {
-            $this->_url .= "/";
-        }
-
-        if (isset($resourceTypeNode["maxSize"])) {
-            $this->_maxSize = CKFinder_Connector_Utils_Misc::returnBytes((string)$resourceTypeNode["maxSize"]);
-        }
-
-        if (isset($resourceTypeNode["directory"])) {
-            $this->_directory = $resourceTypeNode["directory"];
-        }
-
-        if (!strlen($this->_directory)) {
-            $this->_directory = resolveUrl($this->_url);
-        }
-
-        if (isset($resourceTypeNode["allowedExtensions"])) {
-            if (is_array($resourceTypeNode["allowedExtensions"])) {
-                foreach ($resourceTypeNode["allowedExtensions"] as $e) {
-                    $this->_allowedExtensions[] = strtolower(trim((string)$e));
-                }
-            }
-            else {
-                $resourceTypeNode["allowedExtensions"] = trim((string)$resourceTypeNode["allowedExtensions"]);
-                if (strlen($resourceTypeNode["allowedExtensions"])) {
-                    $extensions = explode(",", $resourceTypeNode["allowedExtensions"]);
-                    foreach ($extensions as $e) {
-                        $this->_allowedExtensions[] = strtolower(trim($e));
-                    }
-                }
-            }
-        }
-
-        if (isset($resourceTypeNode["deniedExtensions"])) {
-            if (is_array($resourceTypeNode["deniedExtensions"])) {
-
-                foreach ($resourceTypeNode["deniedExtensions"] as $extension) {
-                    $this->_deniedExtensions[] = strtolower(trim((string)$e));
-                }
-            }
-            else {
-                $resourceTypeNode["deniedExtensions"] = trim((string)$resourceTypeNode["deniedExtensions"]);
-                if (strlen($resourceTypeNode["deniedExtensions"])) {
-                    $extensions = explode(",", $resourceTypeNode["deniedExtensions"]);
-                    foreach ($extensions as $e) {
-                        $this->_deniedExtensions[] = strtolower(trim($e));
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Get name
-     *
-     * @access public
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Get url
-     *
-     * @access public
-     * @return string
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * Get directory
-     *
-     * @access public
-     * @return string
-     */
-    public function getDirectory()
-    {
-        return $this->_directory;
-    }
-
-    /**
-     * Get max size
-     *
-     * @access public
-     * @return int
-     */
-    public function getMaxSize()
-    {
-        return $this->_maxSize;
-    }
-
-    /**
-     * Get allowed extensions
-     *
-     * @access public
-     * @return array[]string
-     */
-    public function getAllowedExtensions()
-    {
-        return $this->_allowedExtensions;
-    }
-
-    /**
-     * Get denied extensions
-     *
-     * @access public
-     * @return array[]string
-     */
-    public function getDeniedExtensions()
-    {
-        return $this->_deniedExtensions;
-    }
-
-    /**
-     * Check extension, return true if file name is valid.
-     * Return false if extension is on denied list.
-     * If allowed extensions are defined, return false if extension isn't on allowed list.
-     *
-     * @access public
-     * @param string $extension extension
-     * @param boolean $renameIfRequired whether try to rename file or not
-     * @return boolean
-     */
-    public function checkExtension(&$fileName, $renameIfRequired = true)
-    {
-        if (strpos($fileName, '.') === false) {
-            return true;
-        }
-
-        if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        }
-
-        $toCheck = array();
-
-        if ($this->_config->getCheckDoubleExtension()) {
-            $pieces = explode('.', $fileName);
-
-            // First, check the last extension (ex. in file.php.jpg, the "jpg").
-            if ( !$this->checkSingleExtension( $pieces[sizeof($pieces)-1] ) ) {
-                return false;
-            }
-
-            if ($renameIfRequired) {
-                // Check the other extensions, rebuilding the file name. If an extension is
-                // not allowed, replace the dot with an underscore.
-                $fileName = $pieces[0] ;
-                for ($i=1; $i<sizeof($pieces)-1; $i++) {
-                    $fileName .= $this->checkSingleExtension( $pieces[$i] ) ? '.' : '_' ;
-                    $fileName .= $pieces[$i];
-                }
-
-                // Add the last extension to the final name.
-                $fileName .= '.' . $pieces[sizeof($pieces)-1] ;
-            }
-        }
-        else {
-            // Check only the last extension (ex. in file.php.jpg, only "jpg").
-            return $this->checkSingleExtension( substr($fileName, strrpos($fileName,'.')+1) );
-        }
-
-        return true;
-    }
-
-    /**
-     * Check given folder name
-     * Return true if folder name matches hidden folder names list
-     *
-     * @param string $folderName
-     * @access public
-     * @return boolean
-     */
-    public function checkIsHiddenFolder($folderName)
-    {
-        if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        }
-
-        $regex = $this->_config->getHideFoldersRegex();
-        if ($regex) {
-            return preg_match($regex, $folderName);
-        }
-
-        return false;
-    }
-
-    /**
-     * Check given file name
-     * Return true if file name matches hidden file names list
-     *
-     * @param string $fileName
-     * @access public
-     * @return boolean
-     */
-    public function checkIsHiddenFile($fileName)
-    {
-        if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        }
-
-        $regex = $this->_config->getHideFilesRegex();
-        if ($regex) {
-            return preg_match($regex, $fileName);
-        }
-
-        return false;
-    }
-
-    /**
-     * Check given path
-     * Return true if path contains folder name that matches hidden folder names list
-     *
-     * @param string $folderName
-     * @access public
-     * @return boolean
-     */
-    public function checkIsHiddenPath($path)
-    {
-        $_clientPathParts = explode("/", trim($path, "/"));
-        if ($_clientPathParts) {
-            foreach ($_clientPathParts as $_part) {
-                if ($this->checkIsHiddenFolder($_part)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public function checkSingleExtension($extension)
-    {
-        $extension = strtolower(ltrim($extension,'.'));
-
-        if (sizeof($this->_deniedExtensions)) {
-            if (in_array($extension, $this->_deniedExtensions)) {
-                return false;
-            }
-        }
-
-        if (sizeof($this->_allowedExtensions)) {
-            return in_array($extension, $this->_allowedExtensions);
-        }
-
-        return true;
-    }
+	/**
+	 * Resource name
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_name = "";
+	/**
+	 * Resource url
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_url = "";
+	/**
+	 * Directory path on a server
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_directory = "";
+	/**
+	 * Max size
+	 *
+	 * @var unknown_type
+	 * @access private
+	 */
+	private $_maxSize = 0;
+	/**
+	 * Array with allowed extensions
+	 *
+	 * @var array[]string
+	 * @access private
+	 */
+	private $_allowedExtensions = array();
+	/**
+	 * Array with denied extensions
+	 *
+	 * @var array[]string
+	 * @access private
+	 */
+	private $_deniedExtensions = array();
+	/**
+	 * used for CKFinder_Connector_Core_Config object caching
+	 *
+	 * @var CKFinder_Connector_Core_Config
+	 * @access private
+	 */
+	private $_config;
+
+	/**
+	 * Get ResourceType configuration
+	 *
+	 * @param string $resourceTypeNode
+	 * @return array
+	 *
+	 */
+	function __construct($resourceTypeNode)
+	{
+		if (isset($resourceTypeNode["name"])) {
+			$this->_name = $resourceTypeNode["name"];
+		}
+
+		if (isset($resourceTypeNode["url"])) {
+			$this->_url = $resourceTypeNode["url"];
+		}
+
+		if (!strlen($this->_url)) {
+			$this->_url = "/";
+		}
+		else if(substr($this->_url,-1,1) != "/") {
+			$this->_url .= "/";
+		}
+
+		if (isset($resourceTypeNode["maxSize"])) {
+			$this->_maxSize = CKFinder_Connector_Utils_Misc::returnBytes((string)$resourceTypeNode["maxSize"]);
+		}
+
+		if (isset($resourceTypeNode["directory"])) {
+			$this->_directory = $resourceTypeNode["directory"];
+		}
+
+		if (!strlen($this->_directory)) {
+			$this->_directory = resolveUrl($this->_url);
+		}
+
+		if (isset($resourceTypeNode["allowedExtensions"])) {
+			if (is_array($resourceTypeNode["allowedExtensions"])) {
+				foreach ($resourceTypeNode["allowedExtensions"] as $e) {
+					$this->_allowedExtensions[] = strtolower(trim((string)$e));
+				}
+			}
+			else {
+				$resourceTypeNode["allowedExtensions"] = trim((string)$resourceTypeNode["allowedExtensions"]);
+				if (strlen($resourceTypeNode["allowedExtensions"])) {
+					$extensions = explode(",", $resourceTypeNode["allowedExtensions"]);
+					foreach ($extensions as $e) {
+						$this->_allowedExtensions[] = strtolower(trim($e));
+					}
+				}
+			}
+		}
+
+		if (isset($resourceTypeNode["deniedExtensions"])) {
+			if (is_array($resourceTypeNode["deniedExtensions"])) {
+
+				foreach ($resourceTypeNode["deniedExtensions"] as $extension) {
+					$this->_deniedExtensions[] = strtolower(trim((string)$e));
+				}
+			}
+			else {
+				$resourceTypeNode["deniedExtensions"] = trim((string)$resourceTypeNode["deniedExtensions"]);
+				if (strlen($resourceTypeNode["deniedExtensions"])) {
+					$extensions = explode(",", $resourceTypeNode["deniedExtensions"]);
+					foreach ($extensions as $e) {
+						$this->_deniedExtensions[] = strtolower(trim($e));
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get name
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * Get url
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function getUrl()
+	{
+		return $this->_url;
+	}
+
+	/**
+	 * Get directory
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function getDirectory()
+	{
+		return $this->_directory;
+	}
+
+	/**
+	 * Get max size
+	 *
+	 * @access public
+	 * @return int
+	 */
+	public function getMaxSize()
+	{
+		return $this->_maxSize;
+	}
+
+	/**
+	 * Get allowed extensions
+	 *
+	 * @access public
+	 * @return array[]string
+	 */
+	public function getAllowedExtensions()
+	{
+		return $this->_allowedExtensions;
+	}
+
+	/**
+	 * Get denied extensions
+	 *
+	 * @access public
+	 * @return array[]string
+	 */
+	public function getDeniedExtensions()
+	{
+		return $this->_deniedExtensions;
+	}
+
+	/**
+	 * Check extension, return true if file name is valid.
+	 * Return false if extension is on denied list.
+	 * If allowed extensions are defined, return false if extension isn't on allowed list.
+	 *
+	 * @access public
+	 * @param string $extension extension
+	 * @param boolean $renameIfRequired whether try to rename file or not
+	 * @return boolean
+	 */
+	public function checkExtension(&$fileName, $renameIfRequired = true)
+	{
+		if (strpos($fileName, '.') === false) {
+			return true;
+		}
+
+		if (is_null($this->_config)) {
+			$this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		}
+
+		$toCheck = array();
+
+		if ($this->_config->getCheckDoubleExtension()) {
+			$pieces = explode('.', $fileName);
+
+			// First, check the last extension (ex. in file.php.jpg, the "jpg").
+			if ( !$this->checkSingleExtension( $pieces[sizeof($pieces)-1] ) ) {
+				return false;
+			}
+
+			if ($renameIfRequired) {
+				// Check the other extensions, rebuilding the file name. If an extension is
+				// not allowed, replace the dot with an underscore.
+				$fileName = $pieces[0] ;
+				for ($i=1; $i<sizeof($pieces)-1; $i++) {
+					$fileName .= $this->checkSingleExtension( $pieces[$i] ) ? '.' : '_' ;
+					$fileName .= $pieces[$i];
+				}
+
+				// Add the last extension to the final name.
+				$fileName .= '.' . $pieces[sizeof($pieces)-1] ;
+			}
+		}
+		else {
+			// Check only the last extension (ex. in file.php.jpg, only "jpg").
+			return $this->checkSingleExtension( substr($fileName, strrpos($fileName,'.')+1) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check given folder name
+	 * Return true if folder name matches hidden folder names list
+	 *
+	 * @param string $folderName
+	 * @access public
+	 * @return boolean
+	 */
+	public function checkIsHiddenFolder($folderName)
+	{
+		if (is_null($this->_config)) {
+			$this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		}
+
+		$regex = $this->_config->getHideFoldersRegex();
+		if ($regex) {
+			return preg_match($regex, $folderName);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check given file name
+	 * Return true if file name matches hidden file names list
+	 *
+	 * @param string $fileName
+	 * @access public
+	 * @return boolean
+	 */
+	public function checkIsHiddenFile($fileName)
+	{
+		if (is_null($this->_config)) {
+			$this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		}
+
+		$regex = $this->_config->getHideFilesRegex();
+		if ($regex) {
+			return preg_match($regex, $fileName);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check given path
+	 * Return true if path contains folder name that matches hidden folder names list
+	 *
+	 * @param string $folderName
+	 * @access public
+	 * @return boolean
+	 */
+	public function checkIsHiddenPath($path)
+	{
+		$_clientPathParts = explode("/", trim($path, "/"));
+		if ($_clientPathParts) {
+			foreach ($_clientPathParts as $_part) {
+				if ($this->checkIsHiddenFolder($_part)) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	public function checkSingleExtension($extension)
+	{
+		$extension = strtolower(ltrim($extension,'.'));
+
+		if (sizeof($this->_deniedExtensions)) {
+			if (in_array($extension, $this->_deniedExtensions)) {
+				return false;
+			}
+		}
+
+		if (sizeof($this->_allowedExtensions)) {
+			return in_array($extension, $this->_allowedExtensions);
+		}
+
+		return true;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -97,7 +97,7 @@ 
         if (!strlen($this->_url)) {
             $this->_url = "/";
         }
-        else if(substr($this->_url,-1,1) != "/") {
+        else if (substr($this->_url, -1, 1) != "/") {
             $this->_url .= "/";
         }
 
@@ -232,7 +232,7 @@ 
         }
 
         if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+            $this->_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         }
 
         $toCheck = array();
@@ -241,26 +241,26 @@ 
             $pieces = explode('.', $fileName);
 
             // First, check the last extension (ex. in file.php.jpg, the "jpg").
-            if ( !$this->checkSingleExtension( $pieces[sizeof($pieces)-1] ) ) {
+            if (!$this->checkSingleExtension($pieces[sizeof($pieces) - 1])) {
                 return false;
             }
 
             if ($renameIfRequired) {
                 // Check the other extensions, rebuilding the file name. If an extension is
                 // not allowed, replace the dot with an underscore.
-                $fileName = $pieces[0] ;
-                for ($i=1; $i<sizeof($pieces)-1; $i++) {
-                    $fileName .= $this->checkSingleExtension( $pieces[$i] ) ? '.' : '_' ;
+                $fileName = $pieces[0];
+                for ($i = 1; $i < sizeof($pieces) - 1; $i++) {
+                    $fileName .= $this->checkSingleExtension($pieces[$i]) ? '.' : '_';
                     $fileName .= $pieces[$i];
                 }
 
                 // Add the last extension to the final name.
-                $fileName .= '.' . $pieces[sizeof($pieces)-1] ;
+                $fileName .= '.'.$pieces[sizeof($pieces) - 1];
             }
         }
         else {
             // Check only the last extension (ex. in file.php.jpg, only "jpg").
-            return $this->checkSingleExtension( substr($fileName, strrpos($fileName,'.')+1) );
+            return $this->checkSingleExtension(substr($fileName, strrpos($fileName, '.') + 1));
         }
 
         return true;
@@ -277,7 +277,7 @@ 
     public function checkIsHiddenFolder($folderName)
     {
         if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+            $this->_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         }
 
         $regex = $this->_config->getHideFoldersRegex();
@@ -299,7 +299,7 @@ 
     public function checkIsHiddenFile($fileName)
     {
         if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+            $this->_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         }
 
         $regex = $this->_config->getHideFilesRegex();
@@ -334,7 +334,7 @@ 
 
     public function checkSingleExtension($extension)
     {
-        $extension = strtolower(ltrim($extension,'.'));
+        $extension = strtolower(ltrim($extension, '.'));
 
         if (sizeof($this->_deniedExtensions)) {
             if (in_array($extension, $this->_deniedExtensions)) {

Braces +7 added lines, -9 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -96,8 +98,7 @@ 
 
         if (!strlen($this->_url)) {
             $this->_url = "/";
-        }
-        else if(substr($this->_url,-1,1) != "/") {
+        } else if(substr($this->_url,-1,1) != "/") {
             $this->_url .= "/";
         }
 
@@ -118,8 +119,7 @@ 
                 foreach ($resourceTypeNode["allowedExtensions"] as $e) {
                     $this->_allowedExtensions[] = strtolower(trim((string)$e));
                 }
-            }
-            else {
+            } else {
                 $resourceTypeNode["allowedExtensions"] = trim((string)$resourceTypeNode["allowedExtensions"]);
                 if (strlen($resourceTypeNode["allowedExtensions"])) {
                     $extensions = explode(",", $resourceTypeNode["allowedExtensions"]);
@@ -136,8 +136,7 @@ 
                 foreach ($resourceTypeNode["deniedExtensions"] as $extension) {
                     $this->_deniedExtensions[] = strtolower(trim((string)$e));
                 }
-            }
-            else {
+            } else {
                 $resourceTypeNode["deniedExtensions"] = trim((string)$resourceTypeNode["deniedExtensions"]);
                 if (strlen($resourceTypeNode["deniedExtensions"])) {
                     $extensions = explode(",", $resourceTypeNode["deniedExtensions"]);
@@ -257,8 +256,7 @@ 
                 // Add the last extension to the final name.
                 $fileName .= '.' . $pieces[sizeof($pieces)-1] ;
             }
-        }
-        else {
+        } else {
             // Check only the last extension (ex. in file.php.jpg, only "jpg").
             return $this->checkSingleExtension( substr($fileName, strrpos($fileName,'.')+1) );
         }

libs/ckfinder/core/connector/php/php5/ErrorHandler/FileUpload.php

Doc Comments +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
      * Throw file upload error, return true if error has been thrown, false if error has been catched
      *
      * @param int $number
-     * @param string $text
+     * @param string $exit
      * @access public
      */
     public function throwError($number, $uploaded = false, $exit = true) {

Indentation +37 added lines, -37 removed lines

@@ -32,50 +32,50 @@
  * @copyright CKSource - Frederico Knabben
  */
 class CKFinder_Connector_ErrorHandler_FileUpload extends CKFinder_Connector_ErrorHandler_Base {
-    /**
-     * Throw file upload error, return true if error has been thrown, false if error has been catched
-     *
-     * @param int $number
-     * @param string $text
-     * @access public
-     */
-    public function throwError($number, $uploaded = false, $exit = true) {
-        if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
-            return false;
-        }
+	/**
+	 * Throw file upload error, return true if error has been thrown, false if error has been catched
+	 *
+	 * @param int $number
+	 * @param string $text
+	 * @access public
+	 */
+	public function throwError($number, $uploaded = false, $exit = true) {
+		if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
+			return false;
+		}
 
-        $oRegistry = & CKFinder_Connector_Core_Factory :: getInstance("Core_Registry");
-        $sFileName = $oRegistry->get("FileUpload_fileName");
-        $sFileUrl = $oRegistry->get("FileUpload_url");
+		$oRegistry = & CKFinder_Connector_Core_Factory :: getInstance("Core_Registry");
+		$sFileName = $oRegistry->get("FileUpload_fileName");
+		$sFileUrl = $oRegistry->get("FileUpload_url");
 
-        header('Content-Type: text/html; charset=utf-8');
+		header('Content-Type: text/html; charset=utf-8');
 
-        $errorMessage = CKFinder_Connector_Utils_Misc :: getErrorMessage($number, $sFileName);
-        if (!$uploaded) {
-            $sFileName = "";
-        }
+		$errorMessage = CKFinder_Connector_Utils_Misc :: getErrorMessage($number, $sFileName);
+		if (!$uploaded) {
+			$sFileName = "";
+		}
 
-        echo "<script type=\"text/javascript\">";
+		echo "<script type=\"text/javascript\">";
 
-        if (!empty($_GET['CKFinderFuncNum'])) {
-            $errorMessage = CKFinder_Connector_Utils_Misc::getErrorMessage($number, $sFileName);
+		if (!empty($_GET['CKFinderFuncNum'])) {
+			$errorMessage = CKFinder_Connector_Utils_Misc::getErrorMessage($number, $sFileName);
 
-            if (!$uploaded) {
-                $sFileUrl = "";
-                $sFileName = "";
-            }
+			if (!$uploaded) {
+				$sFileUrl = "";
+				$sFileName = "";
+			}
 
-            $funcNum = preg_replace("/[^0-9]/", "", $_GET['CKFinderFuncNum']);
-            echo "window.parent.CKFinder.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
-        }
-        else {
-            echo "window.parent.OnUploadCompleted('" . str_replace("'", "\\'", $sFileName) . "', '" . str_replace("'", "\\'", $errorMessage) . "') ;";
-        }
+			$funcNum = preg_replace("/[^0-9]/", "", $_GET['CKFinderFuncNum']);
+			echo "window.parent.CKFinder.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
+		}
+		else {
+			echo "window.parent.OnUploadCompleted('" . str_replace("'", "\\'", $sFileName) . "', '" . str_replace("'", "\\'", $errorMessage) . "') ;";
+		}
 
-        echo "</script>";
+		echo "</script>";
 
-        if ($exit) {
-            exit;
-        }
-    }
+		if ($exit) {
+			exit;
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 /**
  * Include base error handling class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/ErrorHandler/Base.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/ErrorHandler/Base.php";
 
 /**
  * File upload error handler
@@ -66,10 +66,10 @@ 
             }
 
             $funcNum = preg_replace("/[^0-9]/", "", $_GET['CKFinderFuncNum']);
-            echo "window.parent.CKFinder.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
+            echo "window.parent.CKFinder.tools.callFunction($funcNum, '".str_replace("'", "\\'", $sFileUrl.$sFileName)."', '".str_replace("'", "\\'", $errorMessage)."');";
         }
         else {
-            echo "window.parent.OnUploadCompleted('" . str_replace("'", "\\'", $sFileName) . "', '" . str_replace("'", "\\'", $errorMessage) . "') ;";
+            echo "window.parent.OnUploadCompleted('".str_replace("'", "\\'", $sFileName)."', '".str_replace("'", "\\'", $errorMessage)."') ;";
         }
 
         echo "</script>";

Braces +4 added lines, -3 removed lines

@@ -11,7 +11,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -67,8 +69,7 @@ 
 
             $funcNum = preg_replace("/[^0-9]/", "", $_GET['CKFinderFuncNum']);
             echo "window.parent.CKFinder.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
-        }
-        else {
+        } else {
             echo "window.parent.OnUploadCompleted('" . str_replace("'", "\\'", $sFileName) . "', '" . str_replace("'", "\\'", $errorMessage) . "') ;";
         }