Piou-piou / ribs-framework

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 thumbnails 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;
             }
 
@@ -134,11 +134,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) {
@@ -163,7 +163,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);
@@ -140,8 +139,7 @@ 
                 "CKFinder extension returned an invalid value (null)." .
                 "Hook " . $functionName . " should return a value.");
                 return false;
-            }
-            else if (!$ret) {
+            } else if (!$ret) {
                 return false;
             }
         }
@@ -164,8 +162,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 @@ 
     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 @@ 
     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 @@ 
 
     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/QuickUpload.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,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

@@ -31,52 +31,52 @@
  * @copyright CKSource - Frederico Knabben
  */
 class CKFinder_Connector_ErrorHandler_QuickUpload 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');
 
 		/**
 		 * echo <script> is not called before CKFinder_Connector_Utils_Misc::getErrorMessage
 		 * because PHP has problems with including files that contain BOM character.
 		 * Having BOM character after <script> tag causes a javascript error.
 		 */
-        echo "<script type=\"text/javascript\">";
-        if (!empty($_GET['CKEditor'])) {
-            $errorMessage = CKFinder_Connector_Utils_Misc::getErrorMessage($number, $sFileName);
+		echo "<script type=\"text/javascript\">";
+		if (!empty($_GET['CKEditor'])) {
+			$errorMessage = CKFinder_Connector_Utils_Misc::getErrorMessage($number, $sFileName);
 
-            if (!$uploaded) {
-                $sFileUrl = "";
-                $sFileName = "";
-            }
+			if (!$uploaded) {
+				$sFileUrl = "";
+				$sFileName = "";
+			}
 
-            $funcNum = preg_replace("/[^0-9]/", "", $_GET['CKEditorFuncNum']);
-            echo "window.parent.CKEDITOR.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
-        }
-        else {
-            if (!$uploaded) {
-                echo "window.parent.OnUploadCompleted(" . $number . ", '', '', '') ;";
-            } else {
-                echo "window.parent.OnUploadCompleted(" . $number . ", '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" . str_replace("'", "\\'", $sFileName) . "', '') ;";
-            }
-        }
-        echo "</script>";
+			$funcNum = preg_replace("/[^0-9]/", "", $_GET['CKEditorFuncNum']);
+			echo "window.parent.CKEDITOR.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
+		}
+		else {
+			if (!$uploaded) {
+				echo "window.parent.OnUploadCompleted(" . $number . ", '', '', '') ;";
+			} else {
+				echo "window.parent.OnUploadCompleted(" . $number . ", '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" . str_replace("'", "\\'", $sFileName) . "', '') ;";
+			}
+		}
+		echo "</script>";
 
-        if ($exit) {
-            exit;
-        }
-    }
+		if ($exit) {
+			exit;
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,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
@@ -65,13 +65,13 @@ 
             }
 
             $funcNum = preg_replace("/[^0-9]/", "", $_GET['CKEditorFuncNum']);
-            echo "window.parent.CKEDITOR.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
+            echo "window.parent.CKEDITOR.tools.callFunction($funcNum, '".str_replace("'", "\\'", $sFileUrl.$sFileName)."', '".str_replace("'", "\\'", $errorMessage)."');";
         }
         else {
             if (!$uploaded) {
-                echo "window.parent.OnUploadCompleted(" . $number . ", '', '', '') ;";
+                echo "window.parent.OnUploadCompleted(".$number.", '', '', '') ;";
             } else {
-                echo "window.parent.OnUploadCompleted(" . $number . ", '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" . str_replace("'", "\\'", $sFileName) . "', '') ;";
+                echo "window.parent.OnUploadCompleted(".$number.", '".str_replace("'", "\\'", $sFileUrl.$sFileName)."', '".str_replace("'", "\\'", $sFileName)."', '') ;";
             }
         }
         echo "</script>";

Braces +4 added lines, -3 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
@@ -66,8 +68,7 @@ 
 
             $funcNum = preg_replace("/[^0-9]/", "", $_GET['CKEditorFuncNum']);
             echo "window.parent.CKEDITOR.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
-        }
-        else {
+        } else {
             if (!$uploaded) {
                 echo "window.parent.OnUploadCompleted(" . $number . ", '', '', '') ;";
             } else {

libs/ckfinder/core/connector/php/php5/Utils/FileSystem.php

Doc Comments +2 added lines, -3 removed lines

@@ -414,7 +414,7 @@ 
      * @static
      * @access public
      * @param string $filePath absolute path to file
-     * @return boolean
+     * @return string
     */
     public static function detectHtml($filePath)
     {
@@ -475,8 +475,7 @@ 
      * @access public
      * @param string $filePath absolute path to file
      * @param string $extension file extension
-     * @param integer $detectionLevel 0 = none, 1 = use getimagesize for images, 2 = use DetectHtml for images
-     * @return boolean
+     * @return string
     */
     public static function isImageValid($filePath, $extension)
     {

Indentation +483 added lines, -483 removed lines

@@ -26,198 +26,198 @@ 
 class CKFinder_Connector_Utils_FileSystem
 {
 
-    /**
-     * This function behaves similar to System.IO.Path.Combine in C#, the only diffrenece is that it also accepts null values and treat them as empty string
-     *
-     * @static
-     * @access public
-     * @param string $path1 first path
-     * @param string $path2 scecond path
-     * @return string
-     */
-    public static function combinePaths($path1, $path2)
-    {
-        if (is_null($path1))  {
-            $path1 = "";
-        }
-        if (is_null($path2))  {
-            $path2 = "";
-        }
-        if (!strlen($path2)) {
-            if (strlen($path1)) {
-                $_lastCharP1 = substr($path1, -1, 1);
-                if ($_lastCharP1 != "/" && $_lastCharP1 != "\\") {
-                    $path1 .= DIRECTORY_SEPARATOR;
-                }
-            }
-        }
-        else {
-            $_firstCharP2 = substr($path2, 0, 1);
-            if (strlen($path1)) {
-                if (strpos($path2, $path1)===0) {
-                    return $path2;
-                }
-                $_lastCharP1 = substr($path1, -1, 1);
-                if ($_lastCharP1 != "/" && $_lastCharP1 != "\\" && $_firstCharP2 != "/" && $_firstCharP2 != "\\") {
-                    $path1 .= DIRECTORY_SEPARATOR;
-                }
-            }
-            else {
-                return $path2;
-            }
-        }
-        return $path1 . $path2;
-    }
-
-    /**
-     * Check whether $fileName is a valid file name, return true on success
-     *
-     * @static
-     * @access public
-     * @param string $fileName
-     * @return boolean
-     */
-    public static function checkFileName($fileName)
-    {
-        if (is_null($fileName) || !strlen($fileName) || substr($fileName,-1,1)=="." || false!==strpos($fileName, "..")) {
-            return false;
-        }
-
-        if (preg_match(CKFINDER_REGEX_INVALID_FILE, $fileName)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Unlink file/folder
-     *
-     * @static
-     * @access public
-     * @param string $path
-     * @return boolean
-     */
-    public static function unlink($path)
-    {
-        /*    make sure the path exists    */
-        if(!file_exists($path)) {
-            return false;
-        }
-
-        /*    If it is a file or link, just delete it    */
-        if(is_file($path) || is_link($path)) {
-            return @unlink($path);
-        }
-
-        /*    Scan the dir and recursively unlink    */
-        $files = scandir($path);
-        if ($files) {
-            foreach($files as $filename)
-            {
-                if ($filename == '.' || $filename == '..') {
-                    continue;
-                }
-                $file = str_replace('//','/',$path.'/'.$filename);
-                CKFinder_Connector_Utils_FileSystem::unlink($file);
-            }
-        }
-
-        /*    Remove the parent dir    */
-        if(!@rmdir($path)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Return file name without extension (without dot & last part after dot)
-     *
-     * @static
-     * @access public
-     * @param string $fileName
-     * @return string
-     */
-    public static function getFileNameWithoutExtension($fileName)
-    {
-        $dotPos = strrpos( $fileName, '.' );
-        if (false === $dotPos) {
-            return $fileName;
-        }
-
-        return substr($fileName, 0, $dotPos);
-    }
-
-    /**
-     * Get file extension (only last part - e.g. extension of file.foo.bar.jpg = jpg)
-     *
-     * @static
-     * @access public
-     * @param string $fileName
-     * @return string
-     */
-    public static function getExtension( $fileName )
-    {
-        $dotPos = strrpos( $fileName, '.' );
-        if (false === $dotPos) {
-            return "";
-        }
-
-        return substr( $fileName, strrpos( $fileName, '.' ) +1 ) ;
-    }
-
-    /**
+	/**
+	 * This function behaves similar to System.IO.Path.Combine in C#, the only diffrenece is that it also accepts null values and treat them as empty string
+	 *
+	 * @static
+	 * @access public
+	 * @param string $path1 first path
+	 * @param string $path2 scecond path
+	 * @return string
+	 */
+	public static function combinePaths($path1, $path2)
+	{
+		if (is_null($path1))  {
+			$path1 = "";
+		}
+		if (is_null($path2))  {
+			$path2 = "";
+		}
+		if (!strlen($path2)) {
+			if (strlen($path1)) {
+				$_lastCharP1 = substr($path1, -1, 1);
+				if ($_lastCharP1 != "/" && $_lastCharP1 != "\\") {
+					$path1 .= DIRECTORY_SEPARATOR;
+				}
+			}
+		}
+		else {
+			$_firstCharP2 = substr($path2, 0, 1);
+			if (strlen($path1)) {
+				if (strpos($path2, $path1)===0) {
+					return $path2;
+				}
+				$_lastCharP1 = substr($path1, -1, 1);
+				if ($_lastCharP1 != "/" && $_lastCharP1 != "\\" && $_firstCharP2 != "/" && $_firstCharP2 != "\\") {
+					$path1 .= DIRECTORY_SEPARATOR;
+				}
+			}
+			else {
+				return $path2;
+			}
+		}
+		return $path1 . $path2;
+	}
+
+	/**
+	 * Check whether $fileName is a valid file name, return true on success
+	 *
+	 * @static
+	 * @access public
+	 * @param string $fileName
+	 * @return boolean
+	 */
+	public static function checkFileName($fileName)
+	{
+		if (is_null($fileName) || !strlen($fileName) || substr($fileName,-1,1)=="." || false!==strpos($fileName, "..")) {
+			return false;
+		}
+
+		if (preg_match(CKFINDER_REGEX_INVALID_FILE, $fileName)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Unlink file/folder
+	 *
+	 * @static
+	 * @access public
+	 * @param string $path
+	 * @return boolean
+	 */
+	public static function unlink($path)
+	{
+		/*    make sure the path exists    */
+		if(!file_exists($path)) {
+			return false;
+		}
+
+		/*    If it is a file or link, just delete it    */
+		if(is_file($path) || is_link($path)) {
+			return @unlink($path);
+		}
+
+		/*    Scan the dir and recursively unlink    */
+		$files = scandir($path);
+		if ($files) {
+			foreach($files as $filename)
+			{
+				if ($filename == '.' || $filename == '..') {
+					continue;
+				}
+				$file = str_replace('//','/',$path.'/'.$filename);
+				CKFinder_Connector_Utils_FileSystem::unlink($file);
+			}
+		}
+
+		/*    Remove the parent dir    */
+		if(!@rmdir($path)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Return file name without extension (without dot & last part after dot)
+	 *
+	 * @static
+	 * @access public
+	 * @param string $fileName
+	 * @return string
+	 */
+	public static function getFileNameWithoutExtension($fileName)
+	{
+		$dotPos = strrpos( $fileName, '.' );
+		if (false === $dotPos) {
+			return $fileName;
+		}
+
+		return substr($fileName, 0, $dotPos);
+	}
+
+	/**
+	 * Get file extension (only last part - e.g. extension of file.foo.bar.jpg = jpg)
+	 *
+	 * @static
+	 * @access public
+	 * @param string $fileName
+	 * @return string
+	 */
+	public static function getExtension( $fileName )
+	{
+		$dotPos = strrpos( $fileName, '.' );
+		if (false === $dotPos) {
+			return "";
+		}
+
+		return substr( $fileName, strrpos( $fileName, '.' ) +1 ) ;
+	}
+
+	/**
 	 * Read file, split it into small chunks and send it to the browser
 	 *
-     * @static
-     * @access public
+	 * @static
+	 * @access public
 	 * @param string $filename
 	 * @return boolean
 	 */
-    public static function readfileChunked($filename)
-    {
-        $chunksize = 1024 * 10; // how many bytes per chunk
-
-        $handle = fopen($filename, 'rb');
-        if ($handle === false) {
-            return false;
-        }
-        while (!feof($handle)) {
-            echo fread($handle, $chunksize);
-            @ob_flush();
-            flush();
-            @set_time_limit(8);
-        }
-        fclose($handle);
-        return true;
-    }
-
-    /**
-    * Replace accented UTF-8 characters by unaccented ASCII-7 "equivalents".
-    * The purpose of this function is to replace characters commonly found in Latin
-    * alphabets with something more or less equivalent from the ASCII range. This can
-    * be useful for converting a UTF-8 to something ready for a filename, for example.
-    * Following the use of this function, you would probably also pass the string
-    * through utf8_strip_non_ascii to clean out any other non-ASCII chars
-    *
-    * For a more complete implementation of transliteration, see the utf8_to_ascii package
-    * available from the phputf8 project downloads:
-    * http://prdownloads.sourceforge.net/phputf8
-    *
-    * @param string UTF-8 string
-    * @param string UTF-8 with accented characters replaced by ASCII chars
-    * @return string accented chars replaced with ascii equivalents
-    * @author Andreas Gohr <andi@splitbrain.org>
-    * @see http://sourceforge.net/projects/phputf8/
-    */
-    public static function convertToAscii($str)
-    {
-        static $UTF8_LOWER_ACCENTS = NULL;
-        static $UTF8_UPPER_ACCENTS = NULL;
-
-        if ( is_null($UTF8_LOWER_ACCENTS) ) {
-            $UTF8_LOWER_ACCENTS = array(
+	public static function readfileChunked($filename)
+	{
+		$chunksize = 1024 * 10; // how many bytes per chunk
+
+		$handle = fopen($filename, 'rb');
+		if ($handle === false) {
+			return false;
+		}
+		while (!feof($handle)) {
+			echo fread($handle, $chunksize);
+			@ob_flush();
+			flush();
+			@set_time_limit(8);
+		}
+		fclose($handle);
+		return true;
+	}
+
+	/**
+	 * Replace accented UTF-8 characters by unaccented ASCII-7 "equivalents".
+	 * The purpose of this function is to replace characters commonly found in Latin
+	 * alphabets with something more or less equivalent from the ASCII range. This can
+	 * be useful for converting a UTF-8 to something ready for a filename, for example.
+	 * Following the use of this function, you would probably also pass the string
+	 * through utf8_strip_non_ascii to clean out any other non-ASCII chars
+	 *
+	 * For a more complete implementation of transliteration, see the utf8_to_ascii package
+	 * available from the phputf8 project downloads:
+	 * http://prdownloads.sourceforge.net/phputf8
+	 *
+	 * @param string UTF-8 string
+	 * @param string UTF-8 with accented characters replaced by ASCII chars
+	 * @return string accented chars replaced with ascii equivalents
+	 * @author Andreas Gohr <andi@splitbrain.org>
+	 * @see http://sourceforge.net/projects/phputf8/
+	 */
+	public static function convertToAscii($str)
+	{
+		static $UTF8_LOWER_ACCENTS = NULL;
+		static $UTF8_UPPER_ACCENTS = NULL;
+
+		if ( is_null($UTF8_LOWER_ACCENTS) ) {
+			$UTF8_LOWER_ACCENTS = array(
   'à' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o',
   'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k',
   'ŝ' => 's', 'ỳ' => 'y', 'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 'ó' => 'o',
@@ -233,17 +233,17 @@ 
   'â' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 'ī' => 'i', 'ã' => 'a', 'ġ' => 'g',
   'ṁ' => 'm', 'ō' => 'o', 'ĩ' => 'i', 'ù' => 'u', 'į' => 'i', 'ź' => 'z', 'á' => 'a',
   'û' => 'u', 'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u', 'ĕ' => 'e',
-            );
-        }
+			);
+		}
 
-        $str = str_replace(
-                array_keys($UTF8_LOWER_ACCENTS),
-                array_values($UTF8_LOWER_ACCENTS),
-                $str
-            );
+		$str = str_replace(
+				array_keys($UTF8_LOWER_ACCENTS),
+				array_values($UTF8_LOWER_ACCENTS),
+				$str
+			);
 
-        if ( is_null($UTF8_UPPER_ACCENTS) ) {
-            $UTF8_UPPER_ACCENTS = array(
+		if ( is_null($UTF8_UPPER_ACCENTS) ) {
+			$UTF8_UPPER_ACCENTS = array(
   'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O',
   'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K',
   'Ŝ' => 'S', 'Ỳ' => 'Y', 'Ņ' => 'N', 'Ĺ' => 'L', 'Ħ' => 'H', 'Ṗ' => 'P', 'Ó' => 'O',
@@ -259,291 +259,291 @@ 
   'Â' => 'A', 'Ľ' => 'L', 'Ẅ' => 'W', 'Ż' => 'Z', 'Ī' => 'I', 'Ã' => 'A', 'Ġ' => 'G',
   'Ṁ' => 'M', 'Ō' => 'O', 'Ĩ' => 'I', 'Ù' => 'U', 'Į' => 'I', 'Ź' => 'Z', 'Á' => 'A',
   'Û' => 'U', 'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae', 'Ĕ' => 'E',
-            );
-        }
-        $str = str_replace(
-                array_keys($UTF8_UPPER_ACCENTS),
-                array_values($UTF8_UPPER_ACCENTS),
-                $str
-            );
-        return $str;
-    }
-
-    /**
-     * Convert file name from UTF-8 to system encoding
-     *
-     * @static
-     * @access public
-     * @param string $fileName
-     * @return string
-     */
-    public static function convertToFilesystemEncoding($fileName)
-    {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $encoding = $_config->getFilesystemEncoding();
-        if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
-            return $fileName;
-        }
-
-        if (!function_exists("iconv")) {
-            if (strcasecmp($encoding, "ISO-8859-1") == 0 || strcasecmp($encoding, "ISO8859-1") == 0 || strcasecmp($encoding, "Latin1") == 0) {
-                return str_replace("\0", "_", utf8_decode($fileName));
-            } else if (function_exists('mb_convert_encoding')) {
-
-                $encoded = @mb_convert_encoding($fileName, $encoding, 'UTF-8');
-                if (@mb_strlen($fileName, "UTF-8") != @mb_strlen($encoded, $encoding)) {
-                    return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
-                }
-                else {
-                    return str_replace("\0", "_", $encoded);
-                }
-            } else {
-                return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
-            }
-        }
-
-        $converted = @iconv("UTF-8", $encoding . "//IGNORE//TRANSLIT", $fileName);
-        if ($converted === false) {
-            return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
-        }
-
-        return $converted;
-    }
-
-    /**
-     * Convert file name from system encoding into UTF-8
-     *
-     * @static
-     * @access public
-     * @param string $fileName
-     * @return string
-     */
-    public static function convertToConnectorEncoding($fileName)
-    {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $encoding = $_config->getFilesystemEncoding();
-        if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
-            return $fileName;
-        }
-
-        if (!function_exists("iconv")) {
-            if (strcasecmp($encoding, "ISO-8859-1") == 0 || strcasecmp($encoding, "ISO8859-1") == 0 || strcasecmp($encoding, "Latin1") == 0) {
-                return utf8_encode($fileName);
-            } else {
-                return $fileName;
-            }
-        }
-
-        $converted = @iconv($encoding, "UTF-8", $fileName);
-
-        if ($converted === false) {
-            return $fileName;
-        }
-
-        return $converted;
-    }
-
-    /**
-     * Find document root
-     *
-     * @return string
-     * @access public
-     */
-    public function getDocumentRootPath()
-    {
-        /**
-         * The absolute pathname of the currently executing script.
-         * Notatka: If a script is executed with the CLI, as a relative path, such as file.php or ../file.php,
-         * $_SERVER['SCRIPT_FILENAME'] will contain the relative path specified by the user.
-         */
-        if (isset($_SERVER['SCRIPT_FILENAME'])) {
-            $sRealPath = dirname($_SERVER['SCRIPT_FILENAME']);
-        }
-        else {
-            /**
-             * realpath — Returns canonicalized absolute pathname
-             */
-            $sRealPath = realpath( './' ) ;
-        }
-
-        /**
-         * The filename of the currently executing script, relative to the document root.
-         * For instance, $_SERVER['PHP_SELF'] in a script at the address http://example.com/test.php/foo.bar
-         * would be /test.php/foo.bar.
-         */
-        $sSelfPath = dirname($_SERVER['PHP_SELF']);
-
-        return substr($sRealPath, 0, strlen($sRealPath) - strlen($sSelfPath));
-    }
-
-    /**
-     * Create directory recursively
-     *
-     * @access public
-     * @static
-     * @param string $dir
-     * @return boolean
-     */
-    public static function createDirectoryRecursively($dir)
-    {
-        if (DIRECTORY_SEPARATOR === "\\") {
-            $dir = str_replace("/", "\\", $dir);
-        }
-        else if (DIRECTORY_SEPARATOR === "/") {
-            $dir = str_replace("\\", "/", $dir);
-        }
-
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        if ($perms = $_config->getChmodFolders()) {
-            $oldUmask = umask(0);
-            $bCreated = @mkdir($dir, $perms, true);
-            umask($oldUmask);
-        }
-        else {
-            $bCreated = @mkdir($dir, 0777, true);
-        }
-
-        return $bCreated;
-    }
-
-    /**
-     * Detect HTML in the first KB to prevent against potential security issue with
-     * IE/Safari/Opera file type auto detection bug.
-     * Returns true if file contain insecure HTML code at the beginning.
-     *
-     * @static
-     * @access public
-     * @param string $filePath absolute path to file
-     * @return boolean
-    */
-    public static function detectHtml($filePath)
-    {
-        $fp = @fopen($filePath, 'rb');
-        if ( $fp === false || !flock( $fp, LOCK_SH ) ) {
-            return -1 ;
-        }
-        $chunk = fread($fp, 1024);
-        flock( $fp, LOCK_UN ) ;
-        fclose($fp);
-
-        $chunk = strtolower($chunk);
-
-        if (!$chunk) {
-            return false;
-        }
-
-        $chunk = trim($chunk);
-
-        if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk)) {
-            return true;
-        }
-
-        $tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
-
-        foreach( $tags as $tag ) {
-            if(false !== strpos($chunk, $tag)) {
-                return true ;
-            }
-        }
-
-        //type = javascript
-        if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk)) {
-            return true ;
-        }
-
-        //href = javascript
-        //src = javascript
-        //data = javascript
-        if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) {
-            return true ;
-        }
-
-        //url(javascript
-        if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
-            return true ;
-        }
-
-        return false ;
-    }
-
-    /**
-     * Check file content.
-     * Currently this function validates only image files.
-     * Returns false if file is invalid.
-     *
-     * @static
-     * @access public
-     * @param string $filePath absolute path to file
-     * @param string $extension file extension
-     * @param integer $detectionLevel 0 = none, 1 = use getimagesize for images, 2 = use DetectHtml for images
-     * @return boolean
-    */
-    public static function isImageValid($filePath, $extension)
-    {
-        if (!@is_readable($filePath)) {
-            return -1;
-        }
-
-        $imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'psd', 'bmp', 'tiff');
-
-        // version_compare is available since PHP4 >= 4.0.7
-        if ( function_exists( 'version_compare' ) ) {
-            $sCurrentVersion = phpversion();
-            if ( version_compare( $sCurrentVersion, "4.2.0" ) >= 0 ) {
-                $imageCheckExtensions[] = "tiff";
-                $imageCheckExtensions[] = "tif";
-            }
-            if ( version_compare( $sCurrentVersion, "4.3.0" ) >= 0 ) {
-                $imageCheckExtensions[] = "swc";
-            }
-            if ( version_compare( $sCurrentVersion, "4.3.2" ) >= 0 ) {
-                $imageCheckExtensions[] = "jpc";
-                $imageCheckExtensions[] = "jp2";
-                $imageCheckExtensions[] = "jpx";
-                $imageCheckExtensions[] = "jb2";
-                $imageCheckExtensions[] = "xbm";
-                $imageCheckExtensions[] = "wbmp";
-            }
-        }
-
-        if ( !in_array( $extension, $imageCheckExtensions ) ) {
-            return true;
-        }
-
-        if ( @getimagesize( $filePath ) === false ) {
-            return false ;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns true if directory is not empty
-     *
-     * @access public
-     * @static
-     * @param string $serverPath
-     * @return boolean
-     */
-    public static function hasChildren($serverPath)
-    {
-        if (!is_dir($serverPath) || (false === $fh = @opendir($serverPath))) {
-            return false;
-        }
-
-        $hasChildren = false;
-        while (false !== ($filename = readdir($fh))) {
-            if ($filename == '.' || $filename == '..') {
-                continue;
-            } else if (is_dir($serverPath . DIRECTORY_SEPARATOR . $filename)) {
-                //we have found valid directory
-                $hasChildren = true;
-                break;
-            }
-        }
-
-        closedir($fh);
-
-        return $hasChildren;
-    }
+			);
+		}
+		$str = str_replace(
+				array_keys($UTF8_UPPER_ACCENTS),
+				array_values($UTF8_UPPER_ACCENTS),
+				$str
+			);
+		return $str;
+	}
+
+	/**
+	 * Convert file name from UTF-8 to system encoding
+	 *
+	 * @static
+	 * @access public
+	 * @param string $fileName
+	 * @return string
+	 */
+	public static function convertToFilesystemEncoding($fileName)
+	{
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$encoding = $_config->getFilesystemEncoding();
+		if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
+			return $fileName;
+		}
+
+		if (!function_exists("iconv")) {
+			if (strcasecmp($encoding, "ISO-8859-1") == 0 || strcasecmp($encoding, "ISO8859-1") == 0 || strcasecmp($encoding, "Latin1") == 0) {
+				return str_replace("\0", "_", utf8_decode($fileName));
+			} else if (function_exists('mb_convert_encoding')) {
+
+				$encoded = @mb_convert_encoding($fileName, $encoding, 'UTF-8');
+				if (@mb_strlen($fileName, "UTF-8") != @mb_strlen($encoded, $encoding)) {
+					return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+				}
+				else {
+					return str_replace("\0", "_", $encoded);
+				}
+			} else {
+				return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+			}
+		}
+
+		$converted = @iconv("UTF-8", $encoding . "//IGNORE//TRANSLIT", $fileName);
+		if ($converted === false) {
+			return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+		}
+
+		return $converted;
+	}
+
+	/**
+	 * Convert file name from system encoding into UTF-8
+	 *
+	 * @static
+	 * @access public
+	 * @param string $fileName
+	 * @return string
+	 */
+	public static function convertToConnectorEncoding($fileName)
+	{
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$encoding = $_config->getFilesystemEncoding();
+		if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
+			return $fileName;
+		}
+
+		if (!function_exists("iconv")) {
+			if (strcasecmp($encoding, "ISO-8859-1") == 0 || strcasecmp($encoding, "ISO8859-1") == 0 || strcasecmp($encoding, "Latin1") == 0) {
+				return utf8_encode($fileName);
+			} else {
+				return $fileName;
+			}
+		}
+
+		$converted = @iconv($encoding, "UTF-8", $fileName);
+
+		if ($converted === false) {
+			return $fileName;
+		}
+
+		return $converted;
+	}
+
+	/**
+	 * Find document root
+	 *
+	 * @return string
+	 * @access public
+	 */
+	public function getDocumentRootPath()
+	{
+		/**
+		 * The absolute pathname of the currently executing script.
+		 * Notatka: If a script is executed with the CLI, as a relative path, such as file.php or ../file.php,
+		 * $_SERVER['SCRIPT_FILENAME'] will contain the relative path specified by the user.
+		 */
+		if (isset($_SERVER['SCRIPT_FILENAME'])) {
+			$sRealPath = dirname($_SERVER['SCRIPT_FILENAME']);
+		}
+		else {
+			/**
+			 * realpath — Returns canonicalized absolute pathname
+			 */
+			$sRealPath = realpath( './' ) ;
+		}
+
+		/**
+		 * The filename of the currently executing script, relative to the document root.
+		 * For instance, $_SERVER['PHP_SELF'] in a script at the address http://example.com/test.php/foo.bar
+		 * would be /test.php/foo.bar.
+		 */
+		$sSelfPath = dirname($_SERVER['PHP_SELF']);
+
+		return substr($sRealPath, 0, strlen($sRealPath) - strlen($sSelfPath));
+	}
+
+	/**
+	 * Create directory recursively
+	 *
+	 * @access public
+	 * @static
+	 * @param string $dir
+	 * @return boolean
+	 */
+	public static function createDirectoryRecursively($dir)
+	{
+		if (DIRECTORY_SEPARATOR === "\\") {
+			$dir = str_replace("/", "\\", $dir);
+		}
+		else if (DIRECTORY_SEPARATOR === "/") {
+			$dir = str_replace("\\", "/", $dir);
+		}
+
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		if ($perms = $_config->getChmodFolders()) {
+			$oldUmask = umask(0);
+			$bCreated = @mkdir($dir, $perms, true);
+			umask($oldUmask);
+		}
+		else {
+			$bCreated = @mkdir($dir, 0777, true);
+		}
+
+		return $bCreated;
+	}
+
+	/**
+	 * Detect HTML in the first KB to prevent against potential security issue with
+	 * IE/Safari/Opera file type auto detection bug.
+	 * Returns true if file contain insecure HTML code at the beginning.
+	 *
+	 * @static
+	 * @access public
+	 * @param string $filePath absolute path to file
+	 * @return boolean
+	 */
+	public static function detectHtml($filePath)
+	{
+		$fp = @fopen($filePath, 'rb');
+		if ( $fp === false || !flock( $fp, LOCK_SH ) ) {
+			return -1 ;
+		}
+		$chunk = fread($fp, 1024);
+		flock( $fp, LOCK_UN ) ;
+		fclose($fp);
+
+		$chunk = strtolower($chunk);
+
+		if (!$chunk) {
+			return false;
+		}
+
+		$chunk = trim($chunk);
+
+		if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk)) {
+			return true;
+		}
+
+		$tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
+
+		foreach( $tags as $tag ) {
+			if(false !== strpos($chunk, $tag)) {
+				return true ;
+			}
+		}
+
+		//type = javascript
+		if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk)) {
+			return true ;
+		}
+
+		//href = javascript
+		//src = javascript
+		//data = javascript
+		if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) {
+			return true ;
+		}
+
+		//url(javascript
+		if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
+			return true ;
+		}
+
+		return false ;
+	}
+
+	/**
+	 * Check file content.
+	 * Currently this function validates only image files.
+	 * Returns false if file is invalid.
+	 *
+	 * @static
+	 * @access public
+	 * @param string $filePath absolute path to file
+	 * @param string $extension file extension
+	 * @param integer $detectionLevel 0 = none, 1 = use getimagesize for images, 2 = use DetectHtml for images
+	 * @return boolean
+	 */
+	public static function isImageValid($filePath, $extension)
+	{
+		if (!@is_readable($filePath)) {
+			return -1;
+		}
+
+		$imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'psd', 'bmp', 'tiff');
+
+		// version_compare is available since PHP4 >= 4.0.7
+		if ( function_exists( 'version_compare' ) ) {
+			$sCurrentVersion = phpversion();
+			if ( version_compare( $sCurrentVersion, "4.2.0" ) >= 0 ) {
+				$imageCheckExtensions[] = "tiff";
+				$imageCheckExtensions[] = "tif";
+			}
+			if ( version_compare( $sCurrentVersion, "4.3.0" ) >= 0 ) {
+				$imageCheckExtensions[] = "swc";
+			}
+			if ( version_compare( $sCurrentVersion, "4.3.2" ) >= 0 ) {
+				$imageCheckExtensions[] = "jpc";
+				$imageCheckExtensions[] = "jp2";
+				$imageCheckExtensions[] = "jpx";
+				$imageCheckExtensions[] = "jb2";
+				$imageCheckExtensions[] = "xbm";
+				$imageCheckExtensions[] = "wbmp";
+			}
+		}
+
+		if ( !in_array( $extension, $imageCheckExtensions ) ) {
+			return true;
+		}
+
+		if ( @getimagesize( $filePath ) === false ) {
+			return false ;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns true if directory is not empty
+	 *
+	 * @access public
+	 * @static
+	 * @param string $serverPath
+	 * @return boolean
+	 */
+	public static function hasChildren($serverPath)
+	{
+		if (!is_dir($serverPath) || (false === $fh = @opendir($serverPath))) {
+			return false;
+		}
+
+		$hasChildren = false;
+		while (false !== ($filename = readdir($fh))) {
+			if ($filename == '.' || $filename == '..') {
+				continue;
+			} else if (is_dir($serverPath . DIRECTORY_SEPARATOR . $filename)) {
+				//we have found valid directory
+				$hasChildren = true;
+				break;
+			}
+		}
+
+		closedir($fh);
+
+		return $hasChildren;
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -37,10 +37,10 @@ 
      */
     public static function combinePaths($path1, $path2)
     {
-        if (is_null($path1))  {
+        if (is_null($path1)) {
             $path1 = "";
         }
-        if (is_null($path2))  {
+        if (is_null($path2)) {
             $path2 = "";
         }
         if (!strlen($path2)) {
@@ -54,7 +54,7 @@ 
         else {
             $_firstCharP2 = substr($path2, 0, 1);
             if (strlen($path1)) {
-                if (strpos($path2, $path1)===0) {
+                if (strpos($path2, $path1) === 0) {
                     return $path2;
                 }
                 $_lastCharP1 = substr($path1, -1, 1);
@@ -66,7 +66,7 @@ 
                 return $path2;
             }
         }
-        return $path1 . $path2;
+        return $path1.$path2;
     }
 
     /**
@@ -79,7 +79,7 @@ 
      */
     public static function checkFileName($fileName)
     {
-        if (is_null($fileName) || !strlen($fileName) || substr($fileName,-1,1)=="." || false!==strpos($fileName, "..")) {
+        if (is_null($fileName) || !strlen($fileName) || substr($fileName, -1, 1) == "." || false !== strpos($fileName, "..")) {
             return false;
         }
 
@@ -101,30 +101,30 @@ 
     public static function unlink($path)
     {
         /*    make sure the path exists    */
-        if(!file_exists($path)) {
+        if (!file_exists($path)) {
             return false;
         }
 
         /*    If it is a file or link, just delete it    */
-        if(is_file($path) || is_link($path)) {
+        if (is_file($path) || is_link($path)) {
             return @unlink($path);
         }
 
         /*    Scan the dir and recursively unlink    */
         $files = scandir($path);
         if ($files) {
-            foreach($files as $filename)
+            foreach ($files as $filename)
             {
                 if ($filename == '.' || $filename == '..') {
                     continue;
                 }
-                $file = str_replace('//','/',$path.'/'.$filename);
+                $file = str_replace('//', '/', $path.'/'.$filename);
                 CKFinder_Connector_Utils_FileSystem::unlink($file);
             }
         }
 
         /*    Remove the parent dir    */
-        if(!@rmdir($path)) {
+        if (!@rmdir($path)) {
             return false;
         }
 
@@ -141,7 +141,7 @@ 
      */
     public static function getFileNameWithoutExtension($fileName)
     {
-        $dotPos = strrpos( $fileName, '.' );
+        $dotPos = strrpos($fileName, '.');
         if (false === $dotPos) {
             return $fileName;
         }
@@ -157,14 +157,14 @@ 
      * @param string $fileName
      * @return string
      */
-    public static function getExtension( $fileName )
+    public static function getExtension($fileName)
     {
-        $dotPos = strrpos( $fileName, '.' );
+        $dotPos = strrpos($fileName, '.');
         if (false === $dotPos) {
             return "";
         }
 
-        return substr( $fileName, strrpos( $fileName, '.' ) +1 ) ;
+        return substr($fileName, strrpos($fileName, '.') + 1);
     }
 
     /**
@@ -216,7 +216,7 @@ 
         static $UTF8_LOWER_ACCENTS = NULL;
         static $UTF8_UPPER_ACCENTS = NULL;
 
-        if ( is_null($UTF8_LOWER_ACCENTS) ) {
+        if (is_null($UTF8_LOWER_ACCENTS)) {
             $UTF8_LOWER_ACCENTS = array(
   'à' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o',
   'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k',
@@ -242,7 +242,7 @@ 
                 $str
             );
 
-        if ( is_null($UTF8_UPPER_ACCENTS) ) {
+        if (is_null($UTF8_UPPER_ACCENTS)) {
             $UTF8_UPPER_ACCENTS = array(
   'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O',
   'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K',
@@ -279,7 +279,7 @@ 
      */
     public static function convertToFilesystemEncoding($fileName)
     {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         $encoding = $_config->getFilesystemEncoding();
         if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
             return $fileName;
@@ -292,19 +292,19 @@ 
 
                 $encoded = @mb_convert_encoding($fileName, $encoding, 'UTF-8');
                 if (@mb_strlen($fileName, "UTF-8") != @mb_strlen($encoded, $encoding)) {
-                    return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+                    return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u", "_", $fileName));
                 }
                 else {
                     return str_replace("\0", "_", $encoded);
                 }
             } else {
-                return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+                return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u", "_", $fileName));
             }
         }
 
-        $converted = @iconv("UTF-8", $encoding . "//IGNORE//TRANSLIT", $fileName);
+        $converted = @iconv("UTF-8", $encoding."//IGNORE//TRANSLIT", $fileName);
         if ($converted === false) {
-            return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+            return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u", "_", $fileName));
         }
 
         return $converted;
@@ -320,7 +320,7 @@ 
      */
     public static function convertToConnectorEncoding($fileName)
     {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         $encoding = $_config->getFilesystemEncoding();
         if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
             return $fileName;
@@ -363,7 +363,7 @@ 
             /**
              * realpath — Returns canonicalized absolute pathname
              */
-            $sRealPath = realpath( './' ) ;
+            $sRealPath = realpath('./');
         }
 
         /**
@@ -393,7 +393,7 @@ 
             $dir = str_replace("\\", "/", $dir);
         }
 
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         if ($perms = $_config->getChmodFolders()) {
             $oldUmask = umask(0);
             $bCreated = @mkdir($dir, $perms, true);
@@ -419,11 +419,11 @@ 
     public static function detectHtml($filePath)
     {
         $fp = @fopen($filePath, 'rb');
-        if ( $fp === false || !flock( $fp, LOCK_SH ) ) {
-            return -1 ;
+        if ($fp === false || !flock($fp, LOCK_SH)) {
+            return -1;
         }
         $chunk = fread($fp, 1024);
-        flock( $fp, LOCK_UN ) ;
+        flock($fp, LOCK_UN);
         fclose($fp);
 
         $chunk = strtolower($chunk);
@@ -440,30 +440,30 @@ 
 
         $tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
 
-        foreach( $tags as $tag ) {
-            if(false !== strpos($chunk, $tag)) {
-                return true ;
+        foreach ($tags as $tag) {
+            if (false !== strpos($chunk, $tag)) {
+                return true;
             }
         }
 
         //type = javascript
         if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk)) {
-            return true ;
+            return true;
         }
 
         //href = javascript
         //src = javascript
         //data = javascript
-        if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) {
-            return true ;
+        if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
+            return true;
         }
 
         //url(javascript
         if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
-            return true ;
+            return true;
         }
 
-        return false ;
+        return false;
     }
 
     /**
@@ -487,16 +487,16 @@ 
         $imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'psd', 'bmp', 'tiff');
 
         // version_compare is available since PHP4 >= 4.0.7
-        if ( function_exists( 'version_compare' ) ) {
+        if (function_exists('version_compare')) {
             $sCurrentVersion = phpversion();
-            if ( version_compare( $sCurrentVersion, "4.2.0" ) >= 0 ) {
+            if (version_compare($sCurrentVersion, "4.2.0") >= 0) {
                 $imageCheckExtensions[] = "tiff";
                 $imageCheckExtensions[] = "tif";
             }
-            if ( version_compare( $sCurrentVersion, "4.3.0" ) >= 0 ) {
+            if (version_compare($sCurrentVersion, "4.3.0") >= 0) {
                 $imageCheckExtensions[] = "swc";
             }
-            if ( version_compare( $sCurrentVersion, "4.3.2" ) >= 0 ) {
+            if (version_compare($sCurrentVersion, "4.3.2") >= 0) {
                 $imageCheckExtensions[] = "jpc";
                 $imageCheckExtensions[] = "jp2";
                 $imageCheckExtensions[] = "jpx";
@@ -506,12 +506,12 @@ 
             }
         }
 
-        if ( !in_array( $extension, $imageCheckExtensions ) ) {
+        if (!in_array($extension, $imageCheckExtensions)) {
             return true;
         }
 
-        if ( @getimagesize( $filePath ) === false ) {
-            return false ;
+        if (@getimagesize($filePath) === false) {
+            return false;
         }
 
         return true;
@@ -535,7 +535,7 @@ 
         while (false !== ($filename = readdir($fh))) {
             if ($filename == '.' || $filename == '..') {
                 continue;
-            } else if (is_dir($serverPath . DIRECTORY_SEPARATOR . $filename)) {
+            } else if (is_dir($serverPath.DIRECTORY_SEPARATOR.$filename)) {
                 //we have found valid directory
                 $hasChildren = true;
                 break;

Braces +9 added lines, -13 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
@@ -50,8 +52,7 @@ 
                     $path1 .= DIRECTORY_SEPARATOR;
                 }
             }
-        }
-        else {
+        } else {
             $_firstCharP2 = substr($path2, 0, 1);
             if (strlen($path1)) {
                 if (strpos($path2, $path1)===0) {
@@ -61,8 +62,7 @@ 
                 if ($_lastCharP1 != "/" && $_lastCharP1 != "\\" && $_firstCharP2 != "/" && $_firstCharP2 != "\\") {
                     $path1 .= DIRECTORY_SEPARATOR;
                 }
-            }
-            else {
+            } else {
                 return $path2;
             }
         }
@@ -293,8 +293,7 @@ 
                 $encoded = @mb_convert_encoding($fileName, $encoding, 'UTF-8');
                 if (@mb_strlen($fileName, "UTF-8") != @mb_strlen($encoded, $encoding)) {
                     return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
-                }
-                else {
+                } else {
                     return str_replace("\0", "_", $encoded);
                 }
             } else {
@@ -358,8 +357,7 @@ 
          */
         if (isset($_SERVER['SCRIPT_FILENAME'])) {
             $sRealPath = dirname($_SERVER['SCRIPT_FILENAME']);
-        }
-        else {
+        } else {
             /**
              * realpath — Returns canonicalized absolute pathname
              */
@@ -388,8 +386,7 @@ 
     {
         if (DIRECTORY_SEPARATOR === "\\") {
             $dir = str_replace("/", "\\", $dir);
-        }
-        else if (DIRECTORY_SEPARATOR === "/") {
+        } else if (DIRECTORY_SEPARATOR === "/") {
             $dir = str_replace("\\", "/", $dir);
         }
 
@@ -398,8 +395,7 @@ 
             $oldUmask = umask(0);
             $bCreated = @mkdir($dir, $perms, true);
             umask($oldUmask);
-        }
-        else {
+        } else {
             $bCreated = @mkdir($dir, 0777, true);
         }
 

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

Doc Comments +3 added lines, -1 removed lines

@@ -25,6 +25,9 @@ 
  */
 class CKFinder_Connector_Utils_Misc
 {
+    /**
+     * @param integer $number
+     */
     public static 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
      */
     public static function setMemoryForImage($imageWidth, $imageHeight, $imageBits, $imageChannels)

Indentation +341 added lines, -341 removed lines

@@ -25,345 +25,345 @@
  */
 class CKFinder_Connector_Utils_Misc
 {
-    public static 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
-     */
-    public static 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
-     */
-    public static 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
-     */
-    public static 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
-     */
-    public static 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
-    */
-    public static 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
-    */
-    public static 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
-    */
-    public static 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;
-    }
+	public static 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
+	 */
+	public static 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
+	 */
+	public static 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
+	 */
+	public static 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
+	 */
+	public static 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
+	 */
+	public static 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
+	 */
+	public static 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
+	 */
+	public static 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 @@ 
     public static 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
      */
-    public static function fastImageCopyResampled (&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 3)
+    public static 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 @@ 
      */
     public static 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/php5/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
      */
     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
-     */
-    private $_attributes = array();
-    /**
-     * Array that stores child nodes
-     *
-     * @access private
-     * @var array
-     */
-    private $_childNodes = array();
-    /**
-     * Node name
-     *
-     * @access private
-     * @var string
-     */
-    private $_name;
-    /**
-     * Node value
-     *
-     * @access private
-     * @var string
-     */
-    private $_value;
-
-    /**
-     * Create new node
-     *
-     * @param string $nodeName node name
-     * @param string $nodeValue node value
-     * @return Ckfinder_Connector_Utils_XmlNode
-     */
-    function __construct($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
-     */
-    public function addAttribute($name, $value)
-    {
-        $this->_attributes[$name] = $value;
-    }
-
-    /**
-     * Get attribute value
-     *
-     * @param string $name
-     * @access public
-     */
-    public function getAttribute($name)
-    {
-        return $this->_attributes[$name];
-    }
-
-    /**
-     * Set element value
-     *
-     * @param string $name
-     * @param string $value
-     * @access public
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-    }
-
-    /**
-     * Get element value
-     *
-     * @param string $name
-     * @param string $value
-     * @access public
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Adds new child at the end of the children
-     *
-     * @param Ckfinder_Connector_Utils_XmlNode $node
-     * @access public
-     */
-    public function addChild(&$node)
-    {
-        $this->_childNodes[] =& $node;
-    }
-
-    /**
-     * Return a well-formed XML string based on Ckfinder_Connector_Utils_XmlNode element
-     *
-     * @return string
-     * @access public
-     */
-    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
+	 */
+	private $_attributes = array();
+	/**
+	 * Array that stores child nodes
+	 *
+	 * @access private
+	 * @var array
+	 */
+	private $_childNodes = array();
+	/**
+	 * Node name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	private $_name;
+	/**
+	 * Node value
+	 *
+	 * @access private
+	 * @var string
+	 */
+	private $_value;
+
+	/**
+	 * Create new node
+	 *
+	 * @param string $nodeName node name
+	 * @param string $nodeValue node value
+	 * @return Ckfinder_Connector_Utils_XmlNode
+	 */
+	function __construct($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
+	 */
+	public function addAttribute($name, $value)
+	{
+		$this->_attributes[$name] = $value;
+	}
+
+	/**
+	 * Get attribute value
+	 *
+	 * @param string $name
+	 * @access public
+	 */
+	public function getAttribute($name)
+	{
+		return $this->_attributes[$name];
+	}
+
+	/**
+	 * Set element value
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @access public
+	 */
+	public function setValue($value)
+	{
+		$this->_value = $value;
+	}
+
+	/**
+	 * Get element value
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @access public
+	 */
+	public function getValue()
+	{
+		return $this->_value;
+	}
+
+	/**
+	 * Adds new child at the end of the children
+	 *
+	 * @param Ckfinder_Connector_Utils_XmlNode $node
+	 * @access public
+	 */
+	public function addChild(&$node)
+	{
+		$this->_childNodes[] =& $node;
+	}
+
+	/**
+	 * Return a well-formed XML string based on Ckfinder_Connector_Utils_XmlNode element
+	 *
+	 * @return string
+	 * @access public
+	 */
+	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/plugins/zip/plugin.php

Doc Comments +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
    *
    * @param object $filePathInfo
    * @param string $originalFileName
-   * @return mixed bool(false) - if security checks fails. Otherwise string - ralative zip archive path with secured filename.
+   * @return false|string bool(false) - if security checks fails. Otherwise string - ralative zip archive path with secured filename.
    */
   protected function checkOneFile($filePathInfo, $originalFileName )
   {
@@ -187,7 +187,7 @@ 
 
   /**
    * Add error node to the list
-   * @param obj $oErrorsNode
+   * @param Ckfinder_Connector_Utils_XmlNode $oErrorsNode
    * @param int $errorCode
    * @param string $name
    * @param string $type

Indentation +735 added lines, -735 removed lines

@@ -30,65 +30,65 @@ 
    */
   protected function buildXml()
   {
-    if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-    }
+	if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+	}
 
-    if (!extension_loaded('zip')) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_COMMAND);
-    }
+	if (!extension_loaded('zip')) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_COMMAND);
+	}
 
-    $this->checkConnector();
-    $this->checkRequest();
+	$this->checkConnector();
+	$this->checkRequest();
 
-    if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-    }
+	if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+	}
 
-    if (!isset($_POST["fileName"])) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
-    }
+	if (!isset($_POST["fileName"])) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
+	}
 
-    $fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST["fileName"]);
-    $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+	$fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST["fileName"]);
+	$resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
 
-    if (!$resourceTypeInfo->checkExtension($fileName)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
-    }
+	if (!$resourceTypeInfo->checkExtension($fileName)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
+	}
 
-    if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) || $resourceTypeInfo->checkIsHiddenFile($fileName)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-    }
+	if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) || $resourceTypeInfo->checkIsHiddenFile($fileName)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+	}
 
-    $filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
+	$filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
 
-    if (!file_exists($filePath) || !is_file($filePath)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
-    }
+	if (!file_exists($filePath) || !is_file($filePath)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
+	}
 
-    if (!is_writable(dirname($filePath))) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-    }
+	if (!is_writable(dirname($filePath))) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+	}
 
-    if ( strtolower(pathinfo($fileName, PATHINFO_EXTENSION)) !== 'zip'){
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
-    }
+	if ( strtolower(pathinfo($fileName, PATHINFO_EXTENSION)) !== 'zip'){
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
+	}
 
-    $zip = new ZipArchive();
-    $result = $zip->open($filePath);
-    if ($result !== TRUE) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNKNOWN);
-    }
-    $this->zip = $zip;
-    $this->filePath = $filePath;
-    $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+	$zip = new ZipArchive();
+	$result = $zip->open($filePath);
+	if ($result !== TRUE) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNKNOWN);
+	}
+	$this->zip = $zip;
+	$this->filePath = $filePath;
+	$this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
 
-    // list of unzipped nodes
-    $this->unzippedNodes = new CKFinder_Connector_Utils_XmlNode("UnzippedFiles");
+	// list of unzipped nodes
+	$this->unzippedNodes = new CKFinder_Connector_Utils_XmlNode("UnzippedFiles");
 
-    // list of files which could not be unzipped
-    $this->skippedFilesNode = new CKFinder_Connector_Utils_XmlNode("Errors");
-    $this->errorCode = CKFINDER_CONNECTOR_ERROR_NONE;
+	// list of files which could not be unzipped
+	$this->skippedFilesNode = new CKFinder_Connector_Utils_XmlNode("Errors");
+	$this->errorCode = CKFINDER_CONNECTOR_ERROR_NONE;
   }
 
   /**
@@ -100,89 +100,89 @@ 
    */
   protected function checkOneFile($filePathInfo, $originalFileName )
   {
-    $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
-
-    // checked if it is a folder
-    $fileStat = $this->zip->statName($originalFileName);
-    if ( empty($filePathInfo['extension']) && empty($fileStat['size']) ){
-      $sNewFolderName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(rtrim($fileStat['name'],'/'));
-      if ($this->_config->forceAscii()) {
-        $sNewFolderName = CKFinder_Connector_Utils_FileSystem::convertToAscii($sNewFolderName);
-      }
-      if (!CKFinder_Connector_Utils_FileSystem::checkFolderPath($sNewFolderName) || $resourceTypeInfo->checkIsHiddenFolder($sNewFolderName)) {
-        $this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_NAME;
-        $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
-        return false;
-      }
-
-      if (!is_writeable($this->_currentFolder->getServerPath())) {
-        $this->errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-        $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
-        return false;
-      }
-
-      return $originalFileName;
-    }
-
-    $fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($filePathInfo['basename']);
-    $sFileName = CKFinder_Connector_Utils_FileSystem::secureFileName($fileName);
-
-    // max file size
-    $maxSize = $resourceTypeInfo->getMaxSize();
-    if ( $maxSize && $fileStat['size'] > $maxSize )
-    {
-      $this->errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
-      $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
-      return false;
-    }
-    // extension
-    if ( !$resourceTypeInfo->checkExtension($sFileName) )
-    {
-      $this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
-      $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
-      return false;
-    }
-    // hidden file
-    if ( !CKFinder_Connector_Utils_FileSystem::checkFileName($sFileName) || $resourceTypeInfo->checkIsHiddenFile($sFileName) ){
-      $this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST;
-      $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
-      return false;
-    }
-
-    // unpack file to tmp dir for detecting html and valid image
-    $dir = CKFinder_Connector_Utils_FileSystem::getTmpDir().'/';
-    if ( file_exists($dir.$sFileName) && !CKFinder_Connector_Utils_FileSystem::unlink($dir.$sFileName) ){
-      $this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST;
-      $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
-      return false;
-    }
-    if ( copy('zip://'.$this->filePath.'#'.$originalFileName, $dir.$sFileName) )
-    {
-      // html extensions
-      $htmlExtensions = $this->_config->getHtmlExtensions();
-      $sExtension = CKFinder_Connector_Utils_FileSystem::getExtension( $dir.$sFileName );
-      if ( $htmlExtensions
-        && !CKFinder_Connector_Utils_Misc::inArrayCaseInsensitive( $sExtension, $htmlExtensions )
-        && CKFinder_Connector_Utils_FileSystem::detectHtml($dir.$sFileName) === true )
-      {
-        $this->errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID;
-        $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
-        return false;
-      }
-
-      // proper image
-      $secureImageUploads = $this->_config->getSecureImageUploads();
-      if ( $secureImageUploads
-        && ( $isImageValid = CKFinder_Connector_Utils_FileSystem::isImageValid($dir.$sFileName, $sExtension) ) === false )
-      {
-        $this->errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID;
-        $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
-        return false;
-      }
-    }
-    $sDirName = ($filePathInfo['dirname'] != '.')? $filePathInfo['dirname'].'/' : '';
-
-    return $sDirName.$sFileName;
+	$resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+
+	// checked if it is a folder
+	$fileStat = $this->zip->statName($originalFileName);
+	if ( empty($filePathInfo['extension']) && empty($fileStat['size']) ){
+	  $sNewFolderName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(rtrim($fileStat['name'],'/'));
+	  if ($this->_config->forceAscii()) {
+		$sNewFolderName = CKFinder_Connector_Utils_FileSystem::convertToAscii($sNewFolderName);
+	  }
+	  if (!CKFinder_Connector_Utils_FileSystem::checkFolderPath($sNewFolderName) || $resourceTypeInfo->checkIsHiddenFolder($sNewFolderName)) {
+		$this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_NAME;
+		$this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
+		return false;
+	  }
+
+	  if (!is_writeable($this->_currentFolder->getServerPath())) {
+		$this->errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+		$this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
+		return false;
+	  }
+
+	  return $originalFileName;
+	}
+
+	$fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($filePathInfo['basename']);
+	$sFileName = CKFinder_Connector_Utils_FileSystem::secureFileName($fileName);
+
+	// max file size
+	$maxSize = $resourceTypeInfo->getMaxSize();
+	if ( $maxSize && $fileStat['size'] > $maxSize )
+	{
+	  $this->errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
+	  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
+	  return false;
+	}
+	// extension
+	if ( !$resourceTypeInfo->checkExtension($sFileName) )
+	{
+	  $this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
+	  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
+	  return false;
+	}
+	// hidden file
+	if ( !CKFinder_Connector_Utils_FileSystem::checkFileName($sFileName) || $resourceTypeInfo->checkIsHiddenFile($sFileName) ){
+	  $this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST;
+	  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
+	  return false;
+	}
+
+	// unpack file to tmp dir for detecting html and valid image
+	$dir = CKFinder_Connector_Utils_FileSystem::getTmpDir().'/';
+	if ( file_exists($dir.$sFileName) && !CKFinder_Connector_Utils_FileSystem::unlink($dir.$sFileName) ){
+	  $this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST;
+	  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
+	  return false;
+	}
+	if ( copy('zip://'.$this->filePath.'#'.$originalFileName, $dir.$sFileName) )
+	{
+	  // html extensions
+	  $htmlExtensions = $this->_config->getHtmlExtensions();
+	  $sExtension = CKFinder_Connector_Utils_FileSystem::getExtension( $dir.$sFileName );
+	  if ( $htmlExtensions
+		&& !CKFinder_Connector_Utils_Misc::inArrayCaseInsensitive( $sExtension, $htmlExtensions )
+		&& CKFinder_Connector_Utils_FileSystem::detectHtml($dir.$sFileName) === true )
+	  {
+		$this->errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID;
+		$this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
+		return false;
+	  }
+
+	  // proper image
+	  $secureImageUploads = $this->_config->getSecureImageUploads();
+	  if ( $secureImageUploads
+		&& ( $isImageValid = CKFinder_Connector_Utils_FileSystem::isImageValid($dir.$sFileName, $sExtension) ) === false )
+	  {
+		$this->errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID;
+		$this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
+		return false;
+	  }
+	}
+	$sDirName = ($filePathInfo['dirname'] != '.')? $filePathInfo['dirname'].'/' : '';
+
+	return $sDirName.$sFileName;
   }
 
   /**
@@ -195,16 +195,16 @@ 
    */
   protected function appendErrorNode($oErrorsNode, $errorCode=0, $name, $type=null, $path=null)
   {
-    $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
-    $oErrorNode->addAttribute("code", $errorCode);
-    $oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
-    if ( $type ){
-      $oErrorNode->addAttribute("type", $type);
-    }
-    if ( $path ){
-      $oErrorNode->addAttribute("folder", $path);
-    }
-    $oErrorsNode->addChild($oErrorNode);
+	$oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
+	$oErrorNode->addAttribute("code", $errorCode);
+	$oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
+	if ( $type ){
+	  $oErrorNode->addAttribute("type", $type);
+	}
+	if ( $path ){
+	  $oErrorNode->addAttribute("folder", $path);
+	}
+	$oErrorsNode->addChild($oErrorNode);
   }
 
   /**
@@ -215,10 +215,10 @@ 
    */
   protected function appendUnzippedNode($oUnzippedNodes, $name, $action='ok')
   {
-    $oUnzippedNode = new CKFinder_Connector_Utils_XmlNode("File");
-    $oUnzippedNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
-    $oUnzippedNode->addAttribute("action", $action );
-    $oUnzippedNodes->addChild($oUnzippedNode);
+	$oUnzippedNode = new CKFinder_Connector_Utils_XmlNode("File");
+	$oUnzippedNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
+	$oUnzippedNode->addAttribute("action", $action );
+	$oUnzippedNodes->addChild($oUnzippedNode);
   }
 
   /**
@@ -232,72 +232,72 @@ 
    */
   protected function extractTo($extractPath, $extractClientPath, $filePathInfo, $sFileName, $originalFileName)
   {
-    $sfilePathInfo = pathinfo($extractPath.$sFileName);
-    $extractClientPathDir = $filePathInfo['dirname'];
-    if ( $filePathInfo['dirname'] == '.' ){
-      $extractClientPathDir = '';
-    }
-    $folderPath = CKFinder_Connector_Utils_FileSystem::combinePaths($extractClientPath,$extractClientPathDir);
-
-    $_aclConfig = $this->_config->getAccessControlConfig();
-    $aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(),$folderPath);
-    $canCreateFolder = (($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) == CKFINDER_CONNECTOR_ACL_FOLDER_CREATE );
-    // create sub-directory of zip archive
-    if ( empty($sfilePathInfo['extension']) )
-    {
-      $fileStat = $this->zip->statName($originalFileName);
-      $isDir = false;
-      if ( $fileStat && empty($fileStat['size']) ){
-        $isDir = true;
-      }
-      if( !empty($sfilePathInfo['dirname']) && !empty($sfilePathInfo['basename']) && !file_exists($sfilePathInfo['dirname'].'/'.$sfilePathInfo['basename']) )
-      {
-        if ( !$canCreateFolder ){
-          return;
-        }
-        if ( $isDir ) {
-          CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively( $sfilePathInfo['dirname'].'/'.$sfilePathInfo['basename'] );
-          return;
-        } else {
-          CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively( $sfilePathInfo['dirname']);
-        }
-      } else {
-        return;
-      }
-    }
-
-    // extract file
-    if ( !file_exists($sfilePathInfo['dirname']) ){
-      if ( !$canCreateFolder ){
-        $this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
-        $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName );
-        return;
-      }
-      CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($sfilePathInfo['dirname']);
-    }
-    $isAuthorized = (($aclMask & CKFINDER_CONNECTOR_ACL_FILE_UPLOAD ) == CKFINDER_CONNECTOR_ACL_FILE_UPLOAD );
-    if ( !$isAuthorized ){
-      $this->errorCode = CKFINDER_CONNECTOR_ERROR_COPY_FAILED;
-      $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
-      return;
-    }
-    if ( copy('zip://'.$this->filePath.'#'.$originalFileName, $extractPath.$sFileName) )
-    {
-      $this->appendUnzippedNode($this->unzippedNodes,$originalFileName);
-      // chmod extracted file
-      if ( is_file($extractPath.$sFileName) && ( $perms = $this->_config->getChmodFiles()) )
-      {
-        $oldumask = umask(0);
-        chmod( $extractPath.$sFileName, $perms );
-        umask( $oldumask );
-      }
-    }
-    // file extraction failed, add to skipped
-    else
-    {
-      $this->errorCode = CKFINDER_CONNECTOR_ERROR_COPY_FAILED;
-      $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
-    }
+	$sfilePathInfo = pathinfo($extractPath.$sFileName);
+	$extractClientPathDir = $filePathInfo['dirname'];
+	if ( $filePathInfo['dirname'] == '.' ){
+	  $extractClientPathDir = '';
+	}
+	$folderPath = CKFinder_Connector_Utils_FileSystem::combinePaths($extractClientPath,$extractClientPathDir);
+
+	$_aclConfig = $this->_config->getAccessControlConfig();
+	$aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(),$folderPath);
+	$canCreateFolder = (($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) == CKFINDER_CONNECTOR_ACL_FOLDER_CREATE );
+	// create sub-directory of zip archive
+	if ( empty($sfilePathInfo['extension']) )
+	{
+	  $fileStat = $this->zip->statName($originalFileName);
+	  $isDir = false;
+	  if ( $fileStat && empty($fileStat['size']) ){
+		$isDir = true;
+	  }
+	  if( !empty($sfilePathInfo['dirname']) && !empty($sfilePathInfo['basename']) && !file_exists($sfilePathInfo['dirname'].'/'.$sfilePathInfo['basename']) )
+	  {
+		if ( !$canCreateFolder ){
+		  return;
+		}
+		if ( $isDir ) {
+		  CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively( $sfilePathInfo['dirname'].'/'.$sfilePathInfo['basename'] );
+		  return;
+		} else {
+		  CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively( $sfilePathInfo['dirname']);
+		}
+	  } else {
+		return;
+	  }
+	}
+
+	// extract file
+	if ( !file_exists($sfilePathInfo['dirname']) ){
+	  if ( !$canCreateFolder ){
+		$this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
+		$this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName );
+		return;
+	  }
+	  CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($sfilePathInfo['dirname']);
+	}
+	$isAuthorized = (($aclMask & CKFINDER_CONNECTOR_ACL_FILE_UPLOAD ) == CKFINDER_CONNECTOR_ACL_FILE_UPLOAD );
+	if ( !$isAuthorized ){
+	  $this->errorCode = CKFINDER_CONNECTOR_ERROR_COPY_FAILED;
+	  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
+	  return;
+	}
+	if ( copy('zip://'.$this->filePath.'#'.$originalFileName, $extractPath.$sFileName) )
+	{
+	  $this->appendUnzippedNode($this->unzippedNodes,$originalFileName);
+	  // chmod extracted file
+	  if ( is_file($extractPath.$sFileName) && ( $perms = $this->_config->getChmodFiles()) )
+	  {
+		$oldumask = umask(0);
+		chmod( $extractPath.$sFileName, $perms );
+		umask( $oldumask );
+	  }
+	}
+	// file extraction failed, add to skipped
+	else
+	{
+	  $this->errorCode = CKFINDER_CONNECTOR_ERROR_COPY_FAILED;
+	  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
+	}
   }
 
 } // end of CKFinder_Connector_CommandHandler_Unzip class
@@ -309,111 +309,111 @@ 
    */
   protected function buildXml()
   {
-    parent::buildXml();
+	parent::buildXml();
 
    $checkedFiles = array();
    if ( !empty($_POST['files']) && is_array($_POST['files']) ){
-     foreach ( $_POST['files'] as $file){
-       $checkedFiles[$file['name']] = $file;
-     }
+	 foreach ( $_POST['files'] as $file){
+	   $checkedFiles[$file['name']] = $file;
+	 }
    }
 
    for ($i = 0; $i < $this->zip->numFiles; $i++)
-    {
-      $fileName = $this->zip->getNameIndex($i);
-      if ( !empty($checkedFiles[$fileName]) && $checkedFiles[$fileName]['options'] == 'ok' )
-      {
-        // file was sucessfully unzipped before
-        $this->appendUnzippedNode($this->unzippedNodes,$fileName);
-        continue;
-      }
-
-      $filePathInfo = pathinfo($fileName);
-      $fileType = 'File';
-      $fileStat = $this->zip->statName($i);
-      if ( empty($filePathInfo['extension']) && empty($fileStat['size']) ){
-        $fileType = 'Folder';
-        // check if we can create subfolder
-        if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) ){
-          $this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
-          $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
-          continue;
-        }
-      }
-      $extractPath = $this->_currentFolder->getServerPath();
-      $extractClientPath = $this->_currentFolder->getClientPath();
-
-      $sFileName = $this->checkOneFile( $filePathInfo, $fileName );
-      // security test failed, add to skipped
-      if ( false !== $sFileName )
-      {
-        if ( file_exists($extractPath.$sFileName) )
-        {
-          if ( !is_dir($extractPath.$sFileName) )
-          {
-            // file was checked before
-            if ( !empty($checkedFiles[$fileName]['options']) )
-            {
-              if ( $checkedFiles[$fileName]['options'] == 'autorename')
-              {
-                $sFileName = CKFinder_Connector_Utils_FileSystem::autoRename($extractPath,$sFileName);
-                $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
-              }
-              elseif ( $checkedFiles[$fileName]['options'] == 'overwrite')
-              {
-                if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ){
-                  $this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
-                  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
-                  continue;
-                }
-                if (!CKFinder_Connector_Utils_FileSystem::unlink($extractPath.$sFileName))
-                {
-                  $this->errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
-                }
-                else
-                {
-                  $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
-                }
-              }
-              else
-              {
-                // add to skipped files
-                $this->appendUnzippedNode($this->unzippedNodes,$fileName,'skip');
-              }
-            }
-            else
-            {
-              $this->errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
-              $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
-            }
-          }
-        }
-        // file doesn't exist yet
-        else
-        {
-          $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
-        }
-      }
-    }
-    $this->zip->close();
-
-    $this->_connectorNode->addChild($this->unzippedNodes);
-
-    if ($this->errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
-      $this->_connectorNode->addChild($this->skippedFilesNode);
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ZIP_FAILED);
-    }
+	{
+	  $fileName = $this->zip->getNameIndex($i);
+	  if ( !empty($checkedFiles[$fileName]) && $checkedFiles[$fileName]['options'] == 'ok' )
+	  {
+		// file was sucessfully unzipped before
+		$this->appendUnzippedNode($this->unzippedNodes,$fileName);
+		continue;
+	  }
+
+	  $filePathInfo = pathinfo($fileName);
+	  $fileType = 'File';
+	  $fileStat = $this->zip->statName($i);
+	  if ( empty($filePathInfo['extension']) && empty($fileStat['size']) ){
+		$fileType = 'Folder';
+		// check if we can create subfolder
+		if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) ){
+		  $this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
+		  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
+		  continue;
+		}
+	  }
+	  $extractPath = $this->_currentFolder->getServerPath();
+	  $extractClientPath = $this->_currentFolder->getClientPath();
+
+	  $sFileName = $this->checkOneFile( $filePathInfo, $fileName );
+	  // security test failed, add to skipped
+	  if ( false !== $sFileName )
+	  {
+		if ( file_exists($extractPath.$sFileName) )
+		{
+		  if ( !is_dir($extractPath.$sFileName) )
+		  {
+			// file was checked before
+			if ( !empty($checkedFiles[$fileName]['options']) )
+			{
+			  if ( $checkedFiles[$fileName]['options'] == 'autorename')
+			  {
+				$sFileName = CKFinder_Connector_Utils_FileSystem::autoRename($extractPath,$sFileName);
+				$this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
+			  }
+			  elseif ( $checkedFiles[$fileName]['options'] == 'overwrite')
+			  {
+				if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ){
+				  $this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
+				  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
+				  continue;
+				}
+				if (!CKFinder_Connector_Utils_FileSystem::unlink($extractPath.$sFileName))
+				{
+				  $this->errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+				  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
+				}
+				else
+				{
+				  $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
+				}
+			  }
+			  else
+			  {
+				// add to skipped files
+				$this->appendUnzippedNode($this->unzippedNodes,$fileName,'skip');
+			  }
+			}
+			else
+			{
+			  $this->errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
+			  $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
+			}
+		  }
+		}
+		// file doesn't exist yet
+		else
+		{
+		  $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
+		}
+	  }
+	}
+	$this->zip->close();
+
+	$this->_connectorNode->addChild($this->unzippedNodes);
+
+	if ($this->errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
+	  $this->_connectorNode->addChild($this->skippedFilesNode);
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ZIP_FAILED);
+	}
   }
 
   public function onBeforeExecuteCommand( &$command )
   {
-      if ( $command == 'ExtractHere' )
-      {
-          $this->sendResponse();
-          return false;
-      }
-      return true ;
+	  if ( $command == 'ExtractHere' )
+	  {
+		  $this->sendResponse();
+		  return false;
+	  }
+	  return true ;
   }
 
 } // end of CKFinder_Connector_CommandHandler_UnzipHere class
@@ -425,82 +425,82 @@ 
    */
   protected function buildXml()
   {
-    parent::buildXml();
-
-    $extractDir = ( !empty($_POST['extractDir']) ) ? ltrim($_POST['extractDir'],'/') : '';
-    $extractDir = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($extractDir);
-    if ( preg_match(CKFINDER_REGEX_INVALID_PATH, $extractDir) ){
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-    }
-    $extractPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $extractDir.'/');
-    $extractClientPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getClientPath(),$extractDir);
-    // acl for upload dir
-    $_aclConfig = $this->_config->getAccessControlConfig();
-    $aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(),$extractDir);
-
-    if ( !(($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) == CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) ){
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-    }
-    if ( empty( $_POST['force']) && file_exists($extractPath) && is_dir($extractPath) && !CKFinder_Connector_Utils_FileSystem::isEmptyDir($extractPath) )
-    {
-      $dirExists = new CKFinder_Connector_Utils_XmlNode("FolderExists");
-      $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Folder");
-      $oErrorNode->addAttribute("name", $extractDir);
-      $dirExists->addChild($oErrorNode);
-      $this->_connectorNode->addChild($dirExists);
-      return;
-    }
-    elseif ( !empty( $_POST['force']) && $_POST['force'] =='overwrite' )
-    {
-      if ( !(($aclMask &  CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ==  CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ){
-        $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-      }
-      if ( $extractDir && file_exists($extractPath) && is_dir($extractPath) )
-      {
-        if ( !(($aclMask &  CKFINDER_CONNECTOR_ACL_FOLDER_CREATE | CKFINDER_CONNECTOR_ACL_FOLDER_DELETE ) ==  CKFINDER_CONNECTOR_ACL_FOLDER_CREATE | CKFINDER_CONNECTOR_ACL_FOLDER_DELETE ) ){
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
-        if (!CKFinder_Connector_Utils_FileSystem::unlink($extractPath))
-        {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-        }
-      }
-    }
-    else if ( !empty( $_POST['force']) && $_POST['force'] !== 'merge' )
-    {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-    }
-
-    for ($i = 0; $i < $this->zip->numFiles; $i++)
-    {
-      $fileName = $this->zip->getNameIndex($i);
-      $filePathInfo = pathinfo($fileName);
-
-      $sFileName = $this->checkOneFile( $filePathInfo, $fileName );
-      // security test failed, add to skipped
-      if ( $sFileName )
-      {
-        $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
-      }
-    }
-    $this->zip->close();
-
-
-    $this->_connectorNode->addChild($this->unzippedNodes);
-
-    if ($this->errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
-      $this->_connectorNode->addChild($this->skippedFilesNode);
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ZIP_FAILED);
-    }
+	parent::buildXml();
+
+	$extractDir = ( !empty($_POST['extractDir']) ) ? ltrim($_POST['extractDir'],'/') : '';
+	$extractDir = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($extractDir);
+	if ( preg_match(CKFINDER_REGEX_INVALID_PATH, $extractDir) ){
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+	}
+	$extractPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $extractDir.'/');
+	$extractClientPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getClientPath(),$extractDir);
+	// acl for upload dir
+	$_aclConfig = $this->_config->getAccessControlConfig();
+	$aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(),$extractDir);
+
+	if ( !(($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) == CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) ){
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+	}
+	if ( empty( $_POST['force']) && file_exists($extractPath) && is_dir($extractPath) && !CKFinder_Connector_Utils_FileSystem::isEmptyDir($extractPath) )
+	{
+	  $dirExists = new CKFinder_Connector_Utils_XmlNode("FolderExists");
+	  $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Folder");
+	  $oErrorNode->addAttribute("name", $extractDir);
+	  $dirExists->addChild($oErrorNode);
+	  $this->_connectorNode->addChild($dirExists);
+	  return;
+	}
+	elseif ( !empty( $_POST['force']) && $_POST['force'] =='overwrite' )
+	{
+	  if ( !(($aclMask &  CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ==  CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ){
+		$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+	  }
+	  if ( $extractDir && file_exists($extractPath) && is_dir($extractPath) )
+	  {
+		if ( !(($aclMask &  CKFINDER_CONNECTOR_ACL_FOLDER_CREATE | CKFINDER_CONNECTOR_ACL_FOLDER_DELETE ) ==  CKFINDER_CONNECTOR_ACL_FOLDER_CREATE | CKFINDER_CONNECTOR_ACL_FOLDER_DELETE ) ){
+		  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
+		if (!CKFinder_Connector_Utils_FileSystem::unlink($extractPath))
+		{
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+		}
+	  }
+	}
+	else if ( !empty( $_POST['force']) && $_POST['force'] !== 'merge' )
+	{
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+	}
+
+	for ($i = 0; $i < $this->zip->numFiles; $i++)
+	{
+	  $fileName = $this->zip->getNameIndex($i);
+	  $filePathInfo = pathinfo($fileName);
+
+	  $sFileName = $this->checkOneFile( $filePathInfo, $fileName );
+	  // security test failed, add to skipped
+	  if ( $sFileName )
+	  {
+		$this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
+	  }
+	}
+	$this->zip->close();
+
+
+	$this->_connectorNode->addChild($this->unzippedNodes);
+
+	if ($this->errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
+	  $this->_connectorNode->addChild($this->skippedFilesNode);
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ZIP_FAILED);
+	}
   }
 
   public function onBeforeExecuteCommand( &$command )
   {
-    if ( $command == 'ExtractTo'){
-      $this->sendResponse();
-      return false;
-    }
-    return true ;
+	if ( $command == 'ExtractTo'){
+	  $this->sendResponse();
+	  return false;
+	}
+	return true ;
   }
 
 } // end of CKFinder_Connector_CommandHandler_UnzipTo class
@@ -517,14 +517,14 @@ 
    * @return array
    */
   protected function getConfig(){
-    $config = array();
+	$config = array();
 
-    $config['zipMaxSize'] = 'default';
-    if (isset($GLOBALS['config']['ZipMaxSize']) && (string)$GLOBALS['config']['ZipMaxSize']!='default' ){
-      $config['zipMaxSize'] = CKFinder_Connector_Utils_Misc::returnBytes((string)$GLOBALS['config']['ZipMaxSize']);
-    }
+	$config['zipMaxSize'] = 'default';
+	if (isset($GLOBALS['config']['ZipMaxSize']) && (string)$GLOBALS['config']['ZipMaxSize']!='default' ){
+	  $config['zipMaxSize'] = CKFinder_Connector_Utils_Misc::returnBytes((string)$GLOBALS['config']['ZipMaxSize']);
+	}
 
-    return $config;
+	return $config;
   }
 
   /**
@@ -536,44 +536,44 @@ 
    */
   protected function checkOneFile($file)
   {
-    $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
-    $_aclConfig = $this->_config->getAccessControlConfig();
-    $directory = str_replace('\\','/', $resourceTypeInfo->getDirectory());
-    $fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($file->getFilename());
-
-    if ($this->_config->forceAscii()) {
-      $fileName = CKFinder_Connector_Utils_FileSystem::convertToAscii($fileName);
-    }
-    $pathName = str_replace('\\','/', pathinfo($file->getPathname(), PATHINFO_DIRNAME) );
-    $pathName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($pathName);
-
-    // acl
-    $aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(), str_ireplace($directory,'',$pathName));
-    $isAuthorized = (($aclMask & CKFINDER_CONNECTOR_ACL_FILE_VIEW) == CKFINDER_CONNECTOR_ACL_FILE_VIEW);
-    if ( !$isAuthorized ){
-      return false;
-    }
-
-    // if it is a folder fileName represents the dir
-    if ( $file->isDir() && ( !CKFinder_Connector_Utils_FileSystem::checkFolderPath($fileName) || $resourceTypeInfo->checkIsHiddenPath($fileName) ) ){
-      return false;
-    }
-    // folder name
-    if ( !CKFinder_Connector_Utils_FileSystem::checkFolderPath($pathName) ){
-      return false;
-    }
-
-    // is hidden
-    if ( $resourceTypeInfo->checkIsHiddenPath($pathName) || $resourceTypeInfo->checkIsHiddenFile($fileName) ){
-      return false;
-    }
-
-    // extension
-    if ( !$resourceTypeInfo->checkExtension($fileName) || !CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) ){
-      return false;
-    }
-
-    return true;
+	$resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+	$_aclConfig = $this->_config->getAccessControlConfig();
+	$directory = str_replace('\\','/', $resourceTypeInfo->getDirectory());
+	$fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($file->getFilename());
+
+	if ($this->_config->forceAscii()) {
+	  $fileName = CKFinder_Connector_Utils_FileSystem::convertToAscii($fileName);
+	}
+	$pathName = str_replace('\\','/', pathinfo($file->getPathname(), PATHINFO_DIRNAME) );
+	$pathName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($pathName);
+
+	// acl
+	$aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(), str_ireplace($directory,'',$pathName));
+	$isAuthorized = (($aclMask & CKFINDER_CONNECTOR_ACL_FILE_VIEW) == CKFINDER_CONNECTOR_ACL_FILE_VIEW);
+	if ( !$isAuthorized ){
+	  return false;
+	}
+
+	// if it is a folder fileName represents the dir
+	if ( $file->isDir() && ( !CKFinder_Connector_Utils_FileSystem::checkFolderPath($fileName) || $resourceTypeInfo->checkIsHiddenPath($fileName) ) ){
+	  return false;
+	}
+	// folder name
+	if ( !CKFinder_Connector_Utils_FileSystem::checkFolderPath($pathName) ){
+	  return false;
+	}
+
+	// is hidden
+	if ( $resourceTypeInfo->checkIsHiddenPath($pathName) || $resourceTypeInfo->checkIsHiddenFile($fileName) ){
+	  return false;
+	}
+
+	// extension
+	if ( !$resourceTypeInfo->checkExtension($fileName) || !CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) ){
+	  return false;
+	}
+
+	return true;
   }
 
   /**
@@ -585,36 +585,36 @@ 
    */
   protected function getFilesRecursively( $directory, $zipMaxSize )
   {
-    $allFiles = array();
-    $_zipFilesSize = 0;
-    $serverPath = str_replace('\\','/',$directory);
-
-    foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory), RecursiveIteratorIterator::CHILD_FIRST) as $file ) {
-      if ( !$this->checkOneFile($file) ){
-        continue;
-      }
-      if ( !empty($zipMaxSize) ){
-        clearstatcache();
-        $_zipFilesSize += $file->getSize();
-        if ( $_zipFilesSize > $zipMaxSize ) {
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CREATED_FILE_TOO_BIG);
-        }
-      }
-      $pathName = str_replace('\\','/',$file->getPathname());
-      if ( $file->isDir() ){
-        // skip dot folders on unix systems ( do not try to use isDot() as $file is not a  DirectoryIterator obj )
-        if ( in_array($file->getFilename(),array('..','.')) ){
-          continue;
-        }
-        if ($pathName != rtrim($serverPath,'/')){
-          $allFiles[ ltrim(str_ireplace(rtrim($serverPath,'/'),'',$pathName),'/') ] = '';
-        }
-      } else {
-        $allFiles[$pathName] = str_ireplace($serverPath,'',$pathName);
-      }
-    }
-
-    return $allFiles;
+	$allFiles = array();
+	$_zipFilesSize = 0;
+	$serverPath = str_replace('\\','/',$directory);
+
+	foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory), RecursiveIteratorIterator::CHILD_FIRST) as $file ) {
+	  if ( !$this->checkOneFile($file) ){
+		continue;
+	  }
+	  if ( !empty($zipMaxSize) ){
+		clearstatcache();
+		$_zipFilesSize += $file->getSize();
+		if ( $_zipFilesSize > $zipMaxSize ) {
+		  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CREATED_FILE_TOO_BIG);
+		}
+	  }
+	  $pathName = str_replace('\\','/',$file->getPathname());
+	  if ( $file->isDir() ){
+		// skip dot folders on unix systems ( do not try to use isDot() as $file is not a  DirectoryIterator obj )
+		if ( in_array($file->getFilename(),array('..','.')) ){
+		  continue;
+		}
+		if ($pathName != rtrim($serverPath,'/')){
+		  $allFiles[ ltrim(str_ireplace(rtrim($serverPath,'/'),'',$pathName),'/') ] = '';
+		}
+	  } else {
+		$allFiles[$pathName] = str_ireplace($serverPath,'',$pathName);
+	  }
+	}
+
+	return $allFiles;
   }
 
   /**
@@ -622,229 +622,229 @@ 
    */
   public function buildXml()
   {
-    if (!extension_loaded('zip')) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_COMMAND);
-    }
-
-    $this->checkConnector();
-    $this->checkRequest();
-
-    if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-    }
-
-    $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-    $currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
-    $_sServerDir = $this->_currentFolder->getServerPath();
-
-    $files = array();
-
-    $_zipFilesSize = 0;
-    $config = $this->getConfig();
-    $zipMaxSize = $config['zipMaxSize'];
-    if ( !empty($zipMaxSize) && $zipMaxSize == 'default' ){
-      $zipMaxSize = $currentResourceTypeConfig->getMaxSize();
-    }
-
-    $_isBasket = ( isset($_POST['basket']) && $_POST['basket'] == 'true' )? true : false;
-
-    if ( !empty($_POST['files']))
-    {
-
-      $_aclConfig = $this->_config->getAccessControlConfig();
-      $aclMasks = array();
-      $_resourceTypeConfig = array();
-
-      foreach ( $_POST['files'] as $arr ){
-        if ( empty($arr['name']) || empty($arr['type']) || empty($arr['folder']) ) {
-          continue;
-        }
-        // 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']);
-
-        // check #1 (path)
-        if (!CKFinder_Connector_Utils_FileSystem::checkFileName($name) || preg_match(CKFINDER_REGEX_INVALID_PATH, $path)) {
-          continue;
-        }
-
-        // get resource type config for current file
-        if (!isset($_resourceTypeConfig[$type])) {
-          $_resourceTypeConfig[$type] = $this->_config->getResourceTypeConfig($type);
-        }
-
-        // check #2 (resource type)
-        if (is_null($_resourceTypeConfig[$type])) {
-          continue;
-        }
-
-        // check #3 (extension)
-        if (!$_resourceTypeConfig[$type]->checkExtension($name, false)) {
-          continue;
-        }
-
-        // check #4 (extension) - when moving to another resource type, double check extension
-        if ($currentResourceTypeConfig->getName() != $type && !$currentResourceTypeConfig->checkExtension($name, false)) {
-          continue;
-        }
-
-        // check #5 (hidden folders)
-        // cache results
-        if (empty($checkedPaths[$path])) {
-          $checkedPaths[$path] = true;
-
-          if ($_resourceTypeConfig[$type]->checkIsHiddenPath($path)) {
-            continue;
-          }
-        }
-
-        // check #6 (hidden file name)
-        if ($currentResourceTypeConfig->checkIsHiddenFile($name)) {
-          continue;
-        }
-
-        // 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) {
-          continue;
-        }
-
-        $sourceFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($_resourceTypeConfig[$type]->getDirectory().$path,$name);
-        // check #8 (invalid file name)
-        if (!file_exists($sourceFilePath) || !is_file($sourceFilePath)) {
-          continue;
-        }
-
-        // check #9 - max file size
-        if ( !empty($zipMaxSize) ){
-          clearstatcache();
-          $_zipFilesSize += filesize($sourceFilePath);
-          if ( $_zipFilesSize > $zipMaxSize ) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CREATED_FILE_TOO_BIG);
-          }
-        }
-
-        $zipPathPart = ( $_isBasket ) ? CKFinder_Connector_Utils_FileSystem::combinePaths($type,$path) : '';
-
-        $files[$sourceFilePath] = $zipPathPart.pathinfo($sourceFilePath,PATHINFO_BASENAME);
-      }
-    }
-    else
-    {
-      if (!is_dir($_sServerDir)) {
-        $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
-      }
-      $files = $this->getFilesRecursively($_sServerDir,$zipMaxSize);
-    }
-    if ( sizeof($files)<1) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
-    }
-    // default destination dir - temp
-    $dest_dir = CKFinder_Connector_Utils_FileSystem::getTmpDir();
-    $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
-
-    // default file name - hash
-    $zip_filename = substr(md5(serialize($files)), 0, 16).$resourceTypeInfo->getHash().'.zip';
-
-    // compress files - do not download them
-    // change destination and name
-    if ( isset($_POST['download']) && $_POST['download'] == 'false'){
-      $dest_dir = $_sServerDir;
-      if ( isset($_POST['zipName']) && !empty($_POST['zipName'])){
-        $zip_filename = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST['zipName']);
-        if (!$resourceTypeInfo->checkExtension($zip_filename)) {
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
-        }
-      }
-    }
-    if (!CKFinder_Connector_Utils_FileSystem::checkFileName($zip_filename) || $resourceTypeInfo->checkIsHiddenFile($zip_filename)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
-    }
-    if ($this->_config->forceAscii()) {
-      $zip_filename = CKFinder_Connector_Utils_FileSystem::convertToAscii($zip_filename);
-    }
-
-    $zipFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir, $zip_filename);
-
-    if (!is_writable(dirname($zipFilePath))) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-    }
-
-    // usually we would need to create zip?
-    $createZip = true;
-
-    // only if file already exists and we want download it
-    // do not create new one - because hash of previously created is the same - existing archive is ok
-    if ( file_exists($zipFilePath) && isset($_POST['download']) && $_POST['download'] == 'true' ){
-      $createZip = false;
-    }
-    // if we only want to create archive
-    else
-    {
-      if ( file_exists($zipFilePath) && ( !isset($_POST['fileExistsAction']) || !in_array($_POST['fileExistsAction'], array('autorename','overwrite')) ) ){
-        $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST);
-      }
-
-      if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FILE_UPLOAD )) {
-        $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-      }
-      // check how to deal with existing file
-      if ( isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'autorename' )
-      {
-        if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_RENAME )) {
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
-        $zip_filename = CKFinder_Connector_Utils_FileSystem::autoRename($dest_dir, $zip_filename);
-        $zipFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir, $zip_filename);
-      }
-      elseif ( isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'overwrite' )
-      {
-        if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
-        if (!CKFinder_Connector_Utils_FileSystem::unlink($zipFilePath)){
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-        }
-      }
-    }
-
-    if ( $createZip ){
-      $zip = new ZipArchive();
-      $result = $zip->open( $zipFilePath, ZIPARCHIVE::CREATE);
-      if ( $result !== TRUE ) {
-        $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNKNOWN);
-      }
-      foreach ( $files as $pathname => $filename ){
-        if ( !empty($filename) ){
-          if ( file_exists($pathname) && is_readable($pathname) ){
-            $zip->addFile( $pathname, $filename );
-          }
-        } else {
-          $zip->addEmptyDir( $pathname );
-        }
-      }
-      $zip->close();
-    }
-
-    $file = new CKFinder_Connector_Utils_XmlNode("ZipFile");
-    $file->addAttribute("name", $zip_filename);
-    $this->_connectorNode->addChild($file);
+	if (!extension_loaded('zip')) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_COMMAND);
+	}
+
+	$this->checkConnector();
+	$this->checkRequest();
+
+	if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+	}
+
+	$this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+	$currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
+	$_sServerDir = $this->_currentFolder->getServerPath();
+
+	$files = array();
+
+	$_zipFilesSize = 0;
+	$config = $this->getConfig();
+	$zipMaxSize = $config['zipMaxSize'];
+	if ( !empty($zipMaxSize) && $zipMaxSize == 'default' ){
+	  $zipMaxSize = $currentResourceTypeConfig->getMaxSize();
+	}
+
+	$_isBasket = ( isset($_POST['basket']) && $_POST['basket'] == 'true' )? true : false;
+
+	if ( !empty($_POST['files']))
+	{
+
+	  $_aclConfig = $this->_config->getAccessControlConfig();
+	  $aclMasks = array();
+	  $_resourceTypeConfig = array();
+
+	  foreach ( $_POST['files'] as $arr ){
+		if ( empty($arr['name']) || empty($arr['type']) || empty($arr['folder']) ) {
+		  continue;
+		}
+		// 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']);
+
+		// check #1 (path)
+		if (!CKFinder_Connector_Utils_FileSystem::checkFileName($name) || preg_match(CKFINDER_REGEX_INVALID_PATH, $path)) {
+		  continue;
+		}
+
+		// get resource type config for current file
+		if (!isset($_resourceTypeConfig[$type])) {
+		  $_resourceTypeConfig[$type] = $this->_config->getResourceTypeConfig($type);
+		}
+
+		// check #2 (resource type)
+		if (is_null($_resourceTypeConfig[$type])) {
+		  continue;
+		}
+
+		// check #3 (extension)
+		if (!$_resourceTypeConfig[$type]->checkExtension($name, false)) {
+		  continue;
+		}
+
+		// check #4 (extension) - when moving to another resource type, double check extension
+		if ($currentResourceTypeConfig->getName() != $type && !$currentResourceTypeConfig->checkExtension($name, false)) {
+		  continue;
+		}
+
+		// check #5 (hidden folders)
+		// cache results
+		if (empty($checkedPaths[$path])) {
+		  $checkedPaths[$path] = true;
+
+		  if ($_resourceTypeConfig[$type]->checkIsHiddenPath($path)) {
+			continue;
+		  }
+		}
+
+		// check #6 (hidden file name)
+		if ($currentResourceTypeConfig->checkIsHiddenFile($name)) {
+		  continue;
+		}
+
+		// 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) {
+		  continue;
+		}
+
+		$sourceFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($_resourceTypeConfig[$type]->getDirectory().$path,$name);
+		// check #8 (invalid file name)
+		if (!file_exists($sourceFilePath) || !is_file($sourceFilePath)) {
+		  continue;
+		}
+
+		// check #9 - max file size
+		if ( !empty($zipMaxSize) ){
+		  clearstatcache();
+		  $_zipFilesSize += filesize($sourceFilePath);
+		  if ( $_zipFilesSize > $zipMaxSize ) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CREATED_FILE_TOO_BIG);
+		  }
+		}
+
+		$zipPathPart = ( $_isBasket ) ? CKFinder_Connector_Utils_FileSystem::combinePaths($type,$path) : '';
+
+		$files[$sourceFilePath] = $zipPathPart.pathinfo($sourceFilePath,PATHINFO_BASENAME);
+	  }
+	}
+	else
+	{
+	  if (!is_dir($_sServerDir)) {
+		$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
+	  }
+	  $files = $this->getFilesRecursively($_sServerDir,$zipMaxSize);
+	}
+	if ( sizeof($files)<1) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
+	}
+	// default destination dir - temp
+	$dest_dir = CKFinder_Connector_Utils_FileSystem::getTmpDir();
+	$resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+
+	// default file name - hash
+	$zip_filename = substr(md5(serialize($files)), 0, 16).$resourceTypeInfo->getHash().'.zip';
+
+	// compress files - do not download them
+	// change destination and name
+	if ( isset($_POST['download']) && $_POST['download'] == 'false'){
+	  $dest_dir = $_sServerDir;
+	  if ( isset($_POST['zipName']) && !empty($_POST['zipName'])){
+		$zip_filename = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST['zipName']);
+		if (!$resourceTypeInfo->checkExtension($zip_filename)) {
+		  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
+		}
+	  }
+	}
+	if (!CKFinder_Connector_Utils_FileSystem::checkFileName($zip_filename) || $resourceTypeInfo->checkIsHiddenFile($zip_filename)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
+	}
+	if ($this->_config->forceAscii()) {
+	  $zip_filename = CKFinder_Connector_Utils_FileSystem::convertToAscii($zip_filename);
+	}
+
+	$zipFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir, $zip_filename);
+
+	if (!is_writable(dirname($zipFilePath))) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+	}
+
+	// usually we would need to create zip?
+	$createZip = true;
+
+	// only if file already exists and we want download it
+	// do not create new one - because hash of previously created is the same - existing archive is ok
+	if ( file_exists($zipFilePath) && isset($_POST['download']) && $_POST['download'] == 'true' ){
+	  $createZip = false;
+	}
+	// if we only want to create archive
+	else
+	{
+	  if ( file_exists($zipFilePath) && ( !isset($_POST['fileExistsAction']) || !in_array($_POST['fileExistsAction'], array('autorename','overwrite')) ) ){
+		$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST);
+	  }
+
+	  if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FILE_UPLOAD )) {
+		$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+	  }
+	  // check how to deal with existing file
+	  if ( isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'autorename' )
+	  {
+		if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_RENAME )) {
+		  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
+		$zip_filename = CKFinder_Connector_Utils_FileSystem::autoRename($dest_dir, $zip_filename);
+		$zipFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir, $zip_filename);
+	  }
+	  elseif ( isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'overwrite' )
+	  {
+		if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
+		  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
+		if (!CKFinder_Connector_Utils_FileSystem::unlink($zipFilePath)){
+		  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+		}
+	  }
+	}
+
+	if ( $createZip ){
+	  $zip = new ZipArchive();
+	  $result = $zip->open( $zipFilePath, ZIPARCHIVE::CREATE);
+	  if ( $result !== TRUE ) {
+		$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNKNOWN);
+	  }
+	  foreach ( $files as $pathname => $filename ){
+		if ( !empty($filename) ){
+		  if ( file_exists($pathname) && is_readable($pathname) ){
+			$zip->addFile( $pathname, $filename );
+		  }
+		} else {
+		  $zip->addEmptyDir( $pathname );
+		}
+	  }
+	  $zip->close();
+	}
+
+	$file = new CKFinder_Connector_Utils_XmlNode("ZipFile");
+	$file->addAttribute("name", $zip_filename);
+	$this->_connectorNode->addChild($file);
   }
 
   public function onBeforeExecuteCommand( &$command )
   {
-    if ( $command == 'CreateZip'){
-      $this->sendResponse();
-      return false;
-    }
-    return true ;
+	if ( $command == 'CreateZip'){
+	  $this->sendResponse();
+	  return false;
+	}
+	return true ;
   }
 
 } // end of CKFinder_Connector_CommandHandler_DownloadZip class
@@ -856,77 +856,77 @@ 
    */
   protected function sendZipFile()
   {
-    if (!function_exists('ob_list_handlers') || ob_list_handlers()) {
-      @ob_end_clean();
-    }
-    header("Content-Encoding: none");
-
-    $this->checkConnector();
-    $this->checkRequest();
-
-    // empty wystarczy
-    if ( empty($_GET['FileName']) ){
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
-    }
-
-    $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
-    $hash = $resourceTypeInfo->getHash();
-    if ( $hash !== $_GET['hash'] || $hash !== substr($_GET['FileName'],16,16) ){
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-    }
-
-    if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_VIEW)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-    }
-
-    $fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(trim($_GET['FileName']));
-
-    if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-    }
-
-    if ( strtolower(pathinfo($fileName, PATHINFO_EXTENSION)) !== 'zip'){
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
-    }
-
-    $dest_dir = CKFinder_Connector_Utils_FileSystem::getTmpDir();
-    $filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir,$fileName);
-    if ( !file_exists($filePath) || !is_file($filePath)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
-    }
-    if (!is_readable($filePath)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-    }
-
-    $zipFileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(trim($_GET['ZipName']));
-    if (!CKFinder_Connector_Utils_FileSystem::checkFileName($zipFileName)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-    }
-    $fileFilename = pathinfo($zipFileName,PATHINFO_BASENAME );
-
-    header("Content-Encoding: none");
-    header("Cache-Control: cache, must-revalidate");
-    header("Pragma: public");
-    header("Expires: 0");
-    $user_agent = !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
-    $encodedName = str_replace("\"", "\\\"", $fileFilename);
-    if (strpos($user_agent, "MSIE") !== false) {
-      $encodedName = str_replace(array("+", "%2E"), array(" ", "."), urlencode($encodedName));
-    }
-    header("Content-type: application/octet-stream; name=\"" . $fileFilename . "\"");
-    header("Content-Disposition: attachment; filename=\"" . $encodedName. "\"");
-    header("Content-Length: " . filesize($filePath));
-    CKFinder_Connector_Utils_FileSystem::sendFile($filePath);
-    exit;
+	if (!function_exists('ob_list_handlers') || ob_list_handlers()) {
+	  @ob_end_clean();
+	}
+	header("Content-Encoding: none");
+
+	$this->checkConnector();
+	$this->checkRequest();
+
+	// empty wystarczy
+	if ( empty($_GET['FileName']) ){
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
+	}
+
+	$resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+	$hash = $resourceTypeInfo->getHash();
+	if ( $hash !== $_GET['hash'] || $hash !== substr($_GET['FileName'],16,16) ){
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+	}
+
+	if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_VIEW)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+	}
+
+	$fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(trim($_GET['FileName']));
+
+	if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+	}
+
+	if ( strtolower(pathinfo($fileName, PATHINFO_EXTENSION)) !== 'zip'){
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
+	}
+
+	$dest_dir = CKFinder_Connector_Utils_FileSystem::getTmpDir();
+	$filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir,$fileName);
+	if ( !file_exists($filePath) || !is_file($filePath)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
+	}
+	if (!is_readable($filePath)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+	}
+
+	$zipFileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(trim($_GET['ZipName']));
+	if (!CKFinder_Connector_Utils_FileSystem::checkFileName($zipFileName)) {
+	  $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+	}
+	$fileFilename = pathinfo($zipFileName,PATHINFO_BASENAME );
+
+	header("Content-Encoding: none");
+	header("Cache-Control: cache, must-revalidate");
+	header("Pragma: public");
+	header("Expires: 0");
+	$user_agent = !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
+	$encodedName = str_replace("\"", "\\\"", $fileFilename);
+	if (strpos($user_agent, "MSIE") !== false) {
+	  $encodedName = str_replace(array("+", "%2E"), array(" ", "."), urlencode($encodedName));
+	}
+	header("Content-type: application/octet-stream; name=\"" . $fileFilename . "\"");
+	header("Content-Disposition: attachment; filename=\"" . $encodedName. "\"");
+	header("Content-Length: " . filesize($filePath));
+	CKFinder_Connector_Utils_FileSystem::sendFile($filePath);
+	exit;
   }
 
   public function onBeforeExecuteCommand( &$command )
   {
-    if ( $command == 'DownloadZip'){
-      $this->sendZipFile();
-      return false;
-    }
-    return true ;
+	if ( $command == 'DownloadZip'){
+	  $this->sendZipFile();
+	  return false;
+	}
+	return true ;
   }
 
 } // end of CKFinder_Connector_CommandHandler_DownloadZip

Spacing +153 added lines, -153 removed lines

@@ -17,7 +17,7 @@ 
 /**
  * Include base XML command handler
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/XmlCommandHandlerBase.php";
 
 class CKFinder_Connector_CommandHandler_Unzip extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
@@ -41,7 +41,7 @@ 
     $this->checkConnector();
     $this->checkRequest();
 
-    if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
+    if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
     }
 
@@ -70,7 +70,7 @@ 
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
     }
 
-    if ( strtolower(pathinfo($fileName, PATHINFO_EXTENSION)) !== 'zip'){
+    if (strtolower(pathinfo($fileName, PATHINFO_EXTENSION)) !== 'zip') {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
     }
 
@@ -81,7 +81,7 @@ 
     }
     $this->zip = $zip;
     $this->filePath = $filePath;
-    $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+    $this->_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
 
     // list of unzipped nodes
     $this->unzippedNodes = new CKFinder_Connector_Utils_XmlNode("UnzippedFiles");
@@ -98,14 +98,14 @@ 
    * @param string $originalFileName
    * @return mixed bool(false) - if security checks fails. Otherwise string - ralative zip archive path with secured filename.
    */
-  protected function checkOneFile($filePathInfo, $originalFileName )
+  protected function checkOneFile($filePathInfo, $originalFileName)
   {
     $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
 
     // checked if it is a folder
     $fileStat = $this->zip->statName($originalFileName);
-    if ( empty($filePathInfo['extension']) && empty($fileStat['size']) ){
-      $sNewFolderName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(rtrim($fileStat['name'],'/'));
+    if (empty($filePathInfo['extension']) && empty($fileStat['size'])) {
+      $sNewFolderName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(rtrim($fileStat['name'], '/'));
       if ($this->_config->forceAscii()) {
         $sNewFolderName = CKFinder_Connector_Utils_FileSystem::convertToAscii($sNewFolderName);
       }
@@ -129,21 +129,21 @@ 
 
     // max file size
     $maxSize = $resourceTypeInfo->getMaxSize();
-    if ( $maxSize && $fileStat['size'] > $maxSize )
+    if ($maxSize && $fileStat['size'] > $maxSize)
     {
       $this->errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG;
       $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
       return false;
     }
     // extension
-    if ( !$resourceTypeInfo->checkExtension($sFileName) )
+    if (!$resourceTypeInfo->checkExtension($sFileName))
     {
       $this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION;
       $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
       return false;
     }
     // hidden file
-    if ( !CKFinder_Connector_Utils_FileSystem::checkFileName($sFileName) || $resourceTypeInfo->checkIsHiddenFile($sFileName) ){
+    if (!CKFinder_Connector_Utils_FileSystem::checkFileName($sFileName) || $resourceTypeInfo->checkIsHiddenFile($sFileName)) {
       $this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST;
       $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
       return false;
@@ -151,19 +151,19 @@ 
 
     // unpack file to tmp dir for detecting html and valid image
     $dir = CKFinder_Connector_Utils_FileSystem::getTmpDir().'/';
-    if ( file_exists($dir.$sFileName) && !CKFinder_Connector_Utils_FileSystem::unlink($dir.$sFileName) ){
+    if (file_exists($dir.$sFileName) && !CKFinder_Connector_Utils_FileSystem::unlink($dir.$sFileName)) {
       $this->errorCode = CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST;
       $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
       return false;
     }
-    if ( copy('zip://'.$this->filePath.'#'.$originalFileName, $dir.$sFileName) )
+    if (copy('zip://'.$this->filePath.'#'.$originalFileName, $dir.$sFileName))
     {
       // html extensions
       $htmlExtensions = $this->_config->getHtmlExtensions();
-      $sExtension = CKFinder_Connector_Utils_FileSystem::getExtension( $dir.$sFileName );
-      if ( $htmlExtensions
-        && !CKFinder_Connector_Utils_Misc::inArrayCaseInsensitive( $sExtension, $htmlExtensions )
-        && CKFinder_Connector_Utils_FileSystem::detectHtml($dir.$sFileName) === true )
+      $sExtension = CKFinder_Connector_Utils_FileSystem::getExtension($dir.$sFileName);
+      if ($htmlExtensions
+        && !CKFinder_Connector_Utils_Misc::inArrayCaseInsensitive($sExtension, $htmlExtensions)
+        && CKFinder_Connector_Utils_FileSystem::detectHtml($dir.$sFileName) === true)
       {
         $this->errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID;
         $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
@@ -172,15 +172,15 @@ 
 
       // proper image
       $secureImageUploads = $this->_config->getSecureImageUploads();
-      if ( $secureImageUploads
-        && ( $isImageValid = CKFinder_Connector_Utils_FileSystem::isImageValid($dir.$sFileName, $sExtension) ) === false )
+      if ($secureImageUploads
+        && ($isImageValid = CKFinder_Connector_Utils_FileSystem::isImageValid($dir.$sFileName, $sExtension)) === false)
       {
         $this->errorCode = CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID;
         $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
         return false;
       }
     }
-    $sDirName = ($filePathInfo['dirname'] != '.')? $filePathInfo['dirname'].'/' : '';
+    $sDirName = ($filePathInfo['dirname'] != '.') ? $filePathInfo['dirname'].'/' : '';
 
     return $sDirName.$sFileName;
   }
@@ -193,15 +193,15 @@ 
    * @param string $type
    * @param string $path
    */
-  protected function appendErrorNode($oErrorsNode, $errorCode=0, $name, $type=null, $path=null)
+  protected function appendErrorNode($oErrorsNode, $errorCode = 0, $name, $type = null, $path = null)
   {
     $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
     $oErrorNode->addAttribute("code", $errorCode);
     $oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
-    if ( $type ){
+    if ($type) {
       $oErrorNode->addAttribute("type", $type);
     }
-    if ( $path ){
+    if ($path) {
       $oErrorNode->addAttribute("folder", $path);
     }
     $oErrorsNode->addChild($oErrorNode);
@@ -213,11 +213,11 @@ 
    * @param string $name
    * @param string $action
    */
-  protected function appendUnzippedNode($oUnzippedNodes, $name, $action='ok')
+  protected function appendUnzippedNode($oUnzippedNodes, $name, $action = 'ok')
   {
     $oUnzippedNode = new CKFinder_Connector_Utils_XmlNode("File");
     $oUnzippedNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
-    $oUnzippedNode->addAttribute("action", $action );
+    $oUnzippedNode->addAttribute("action", $action);
     $oUnzippedNodes->addChild($oUnzippedNode);
   }
 
@@ -234,32 +234,32 @@ 
   {
     $sfilePathInfo = pathinfo($extractPath.$sFileName);
     $extractClientPathDir = $filePathInfo['dirname'];
-    if ( $filePathInfo['dirname'] == '.' ){
+    if ($filePathInfo['dirname'] == '.') {
       $extractClientPathDir = '';
     }
-    $folderPath = CKFinder_Connector_Utils_FileSystem::combinePaths($extractClientPath,$extractClientPathDir);
+    $folderPath = CKFinder_Connector_Utils_FileSystem::combinePaths($extractClientPath, $extractClientPathDir);
 
     $_aclConfig = $this->_config->getAccessControlConfig();
-    $aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(),$folderPath);
-    $canCreateFolder = (($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) == CKFINDER_CONNECTOR_ACL_FOLDER_CREATE );
+    $aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(), $folderPath);
+    $canCreateFolder = (($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_CREATE) == CKFINDER_CONNECTOR_ACL_FOLDER_CREATE);
     // create sub-directory of zip archive
-    if ( empty($sfilePathInfo['extension']) )
+    if (empty($sfilePathInfo['extension']))
     {
       $fileStat = $this->zip->statName($originalFileName);
       $isDir = false;
-      if ( $fileStat && empty($fileStat['size']) ){
+      if ($fileStat && empty($fileStat['size'])) {
         $isDir = true;
       }
-      if( !empty($sfilePathInfo['dirname']) && !empty($sfilePathInfo['basename']) && !file_exists($sfilePathInfo['dirname'].'/'.$sfilePathInfo['basename']) )
+      if (!empty($sfilePathInfo['dirname']) && !empty($sfilePathInfo['basename']) && !file_exists($sfilePathInfo['dirname'].'/'.$sfilePathInfo['basename']))
       {
-        if ( !$canCreateFolder ){
+        if (!$canCreateFolder) {
           return;
         }
-        if ( $isDir ) {
-          CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively( $sfilePathInfo['dirname'].'/'.$sfilePathInfo['basename'] );
+        if ($isDir) {
+          CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($sfilePathInfo['dirname'].'/'.$sfilePathInfo['basename']);
           return;
         } else {
-          CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively( $sfilePathInfo['dirname']);
+          CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($sfilePathInfo['dirname']);
         }
       } else {
         return;
@@ -267,29 +267,29 @@ 
     }
 
     // extract file
-    if ( !file_exists($sfilePathInfo['dirname']) ){
-      if ( !$canCreateFolder ){
+    if (!file_exists($sfilePathInfo['dirname'])) {
+      if (!$canCreateFolder) {
         $this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
-        $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName );
+        $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
         return;
       }
       CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($sfilePathInfo['dirname']);
     }
-    $isAuthorized = (($aclMask & CKFINDER_CONNECTOR_ACL_FILE_UPLOAD ) == CKFINDER_CONNECTOR_ACL_FILE_UPLOAD );
-    if ( !$isAuthorized ){
+    $isAuthorized = (($aclMask & CKFINDER_CONNECTOR_ACL_FILE_UPLOAD) == CKFINDER_CONNECTOR_ACL_FILE_UPLOAD);
+    if (!$isAuthorized) {
       $this->errorCode = CKFINDER_CONNECTOR_ERROR_COPY_FAILED;
       $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $originalFileName);
       return;
     }
-    if ( copy('zip://'.$this->filePath.'#'.$originalFileName, $extractPath.$sFileName) )
+    if (copy('zip://'.$this->filePath.'#'.$originalFileName, $extractPath.$sFileName))
     {
-      $this->appendUnzippedNode($this->unzippedNodes,$originalFileName);
+      $this->appendUnzippedNode($this->unzippedNodes, $originalFileName);
       // chmod extracted file
-      if ( is_file($extractPath.$sFileName) && ( $perms = $this->_config->getChmodFiles()) )
+      if (is_file($extractPath.$sFileName) && ($perms = $this->_config->getChmodFiles()))
       {
         $oldumask = umask(0);
-        chmod( $extractPath.$sFileName, $perms );
-        umask( $oldumask );
+        chmod($extractPath.$sFileName, $perms);
+        umask($oldumask);
       }
     }
     // file extraction failed, add to skipped
@@ -312,8 +312,8 @@ 
     parent::buildXml();
 
    $checkedFiles = array();
-   if ( !empty($_POST['files']) && is_array($_POST['files']) ){
-     foreach ( $_POST['files'] as $file){
+   if (!empty($_POST['files']) && is_array($_POST['files'])) {
+     foreach ($_POST['files'] as $file) {
        $checkedFiles[$file['name']] = $file;
      }
    }
@@ -321,20 +321,20 @@ 
    for ($i = 0; $i < $this->zip->numFiles; $i++)
     {
       $fileName = $this->zip->getNameIndex($i);
-      if ( !empty($checkedFiles[$fileName]) && $checkedFiles[$fileName]['options'] == 'ok' )
+      if (!empty($checkedFiles[$fileName]) && $checkedFiles[$fileName]['options'] == 'ok')
       {
         // file was sucessfully unzipped before
-        $this->appendUnzippedNode($this->unzippedNodes,$fileName);
+        $this->appendUnzippedNode($this->unzippedNodes, $fileName);
         continue;
       }
 
       $filePathInfo = pathinfo($fileName);
       $fileType = 'File';
       $fileStat = $this->zip->statName($i);
-      if ( empty($filePathInfo['extension']) && empty($fileStat['size']) ){
+      if (empty($filePathInfo['extension']) && empty($fileStat['size'])) {
         $fileType = 'Folder';
         // check if we can create subfolder
-        if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) ){
+        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FOLDER_CREATE)) {
           $this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
           $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
           continue;
@@ -343,25 +343,25 @@ 
       $extractPath = $this->_currentFolder->getServerPath();
       $extractClientPath = $this->_currentFolder->getClientPath();
 
-      $sFileName = $this->checkOneFile( $filePathInfo, $fileName );
+      $sFileName = $this->checkOneFile($filePathInfo, $fileName);
       // security test failed, add to skipped
-      if ( false !== $sFileName )
+      if (false !== $sFileName)
       {
-        if ( file_exists($extractPath.$sFileName) )
+        if (file_exists($extractPath.$sFileName))
         {
-          if ( !is_dir($extractPath.$sFileName) )
+          if (!is_dir($extractPath.$sFileName))
           {
             // file was checked before
-            if ( !empty($checkedFiles[$fileName]['options']) )
+            if (!empty($checkedFiles[$fileName]['options']))
             {
-              if ( $checkedFiles[$fileName]['options'] == 'autorename')
+              if ($checkedFiles[$fileName]['options'] == 'autorename')
               {
-                $sFileName = CKFinder_Connector_Utils_FileSystem::autoRename($extractPath,$sFileName);
-                $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
+                $sFileName = CKFinder_Connector_Utils_FileSystem::autoRename($extractPath, $sFileName);
+                $this->extractTo($extractPath, $extractClientPath, $filePathInfo, $sFileName, $fileName);
               }
-              elseif ( $checkedFiles[$fileName]['options'] == 'overwrite')
+              elseif ($checkedFiles[$fileName]['options'] == 'overwrite')
               {
-                if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ){
+                if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
                   $this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
                   $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
                   continue;
@@ -373,13 +373,13 @@ 
                 }
                 else
                 {
-                  $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
+                  $this->extractTo($extractPath, $extractClientPath, $filePathInfo, $sFileName, $fileName);
                 }
               }
               else
               {
                 // add to skipped files
-                $this->appendUnzippedNode($this->unzippedNodes,$fileName,'skip');
+                $this->appendUnzippedNode($this->unzippedNodes, $fileName, 'skip');
               }
             }
             else
@@ -392,7 +392,7 @@ 
         // file doesn't exist yet
         else
         {
-          $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
+          $this->extractTo($extractPath, $extractClientPath, $filePathInfo, $sFileName, $fileName);
         }
       }
     }
@@ -406,14 +406,14 @@ 
     }
   }
 
-  public function onBeforeExecuteCommand( &$command )
+  public function onBeforeExecuteCommand(&$command)
   {
-      if ( $command == 'ExtractHere' )
+      if ($command == 'ExtractHere')
       {
           $this->sendResponse();
           return false;
       }
-      return true ;
+      return true;
   }
 
 } // end of CKFinder_Connector_CommandHandler_UnzipHere class
@@ -427,21 +427,21 @@ 
   {
     parent::buildXml();
 
-    $extractDir = ( !empty($_POST['extractDir']) ) ? ltrim($_POST['extractDir'],'/') : '';
+    $extractDir = (!empty($_POST['extractDir'])) ? ltrim($_POST['extractDir'], '/') : '';
     $extractDir = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($extractDir);
-    if ( preg_match(CKFINDER_REGEX_INVALID_PATH, $extractDir) ){
+    if (preg_match(CKFINDER_REGEX_INVALID_PATH, $extractDir)) {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
     }
     $extractPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $extractDir.'/');
-    $extractClientPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getClientPath(),$extractDir);
+    $extractClientPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getClientPath(), $extractDir);
     // acl for upload dir
     $_aclConfig = $this->_config->getAccessControlConfig();
-    $aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(),$extractDir);
+    $aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(), $extractDir);
 
-    if ( !(($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) == CKFINDER_CONNECTOR_ACL_FOLDER_CREATE ) ){
+    if (!(($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_CREATE) == CKFINDER_CONNECTOR_ACL_FOLDER_CREATE)) {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
     }
-    if ( empty( $_POST['force']) && file_exists($extractPath) && is_dir($extractPath) && !CKFinder_Connector_Utils_FileSystem::isEmptyDir($extractPath) )
+    if (empty($_POST['force']) && file_exists($extractPath) && is_dir($extractPath) && !CKFinder_Connector_Utils_FileSystem::isEmptyDir($extractPath))
     {
       $dirExists = new CKFinder_Connector_Utils_XmlNode("FolderExists");
       $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Folder");
@@ -450,14 +450,14 @@ 
       $this->_connectorNode->addChild($dirExists);
       return;
     }
-    elseif ( !empty( $_POST['force']) && $_POST['force'] =='overwrite' )
+    elseif (!empty($_POST['force']) && $_POST['force'] == 'overwrite')
     {
-      if ( !(($aclMask &  CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ==  CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ){
+      if (!(($aclMask & CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE) == CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
       }
-      if ( $extractDir && file_exists($extractPath) && is_dir($extractPath) )
+      if ($extractDir && file_exists($extractPath) && is_dir($extractPath))
       {
-        if ( !(($aclMask &  CKFINDER_CONNECTOR_ACL_FOLDER_CREATE | CKFINDER_CONNECTOR_ACL_FOLDER_DELETE ) ==  CKFINDER_CONNECTOR_ACL_FOLDER_CREATE | CKFINDER_CONNECTOR_ACL_FOLDER_DELETE ) ){
+        if (!(($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_CREATE | CKFINDER_CONNECTOR_ACL_FOLDER_DELETE) == CKFINDER_CONNECTOR_ACL_FOLDER_CREATE | CKFINDER_CONNECTOR_ACL_FOLDER_DELETE)) {
           $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
         }
         if (!CKFinder_Connector_Utils_FileSystem::unlink($extractPath))
@@ -466,7 +466,7 @@ 
         }
       }
     }
-    else if ( !empty( $_POST['force']) && $_POST['force'] !== 'merge' )
+    else if (!empty($_POST['force']) && $_POST['force'] !== 'merge')
     {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
     }
@@ -476,11 +476,11 @@ 
       $fileName = $this->zip->getNameIndex($i);
       $filePathInfo = pathinfo($fileName);
 
-      $sFileName = $this->checkOneFile( $filePathInfo, $fileName );
+      $sFileName = $this->checkOneFile($filePathInfo, $fileName);
       // security test failed, add to skipped
-      if ( $sFileName )
+      if ($sFileName)
       {
-        $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
+        $this->extractTo($extractPath, $extractClientPath, $filePathInfo, $sFileName, $fileName);
       }
     }
     $this->zip->close();
@@ -494,13 +494,13 @@ 
     }
   }
 
-  public function onBeforeExecuteCommand( &$command )
+  public function onBeforeExecuteCommand(&$command)
   {
-    if ( $command == 'ExtractTo'){
+    if ($command == 'ExtractTo') {
       $this->sendResponse();
       return false;
     }
-    return true ;
+    return true;
   }
 
 } // end of CKFinder_Connector_CommandHandler_UnzipTo class
@@ -516,11 +516,11 @@ 
    * @access protected
    * @return array
    */
-  protected function getConfig(){
+  protected function getConfig() {
     $config = array();
 
     $config['zipMaxSize'] = 'default';
-    if (isset($GLOBALS['config']['ZipMaxSize']) && (string)$GLOBALS['config']['ZipMaxSize']!='default' ){
+    if (isset($GLOBALS['config']['ZipMaxSize']) && (string)$GLOBALS['config']['ZipMaxSize'] != 'default') {
       $config['zipMaxSize'] = CKFinder_Connector_Utils_Misc::returnBytes((string)$GLOBALS['config']['ZipMaxSize']);
     }
 
@@ -538,38 +538,38 @@ 
   {
     $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
     $_aclConfig = $this->_config->getAccessControlConfig();
-    $directory = str_replace('\\','/', $resourceTypeInfo->getDirectory());
+    $directory = str_replace('\\', '/', $resourceTypeInfo->getDirectory());
     $fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($file->getFilename());
 
     if ($this->_config->forceAscii()) {
       $fileName = CKFinder_Connector_Utils_FileSystem::convertToAscii($fileName);
     }
-    $pathName = str_replace('\\','/', pathinfo($file->getPathname(), PATHINFO_DIRNAME) );
+    $pathName = str_replace('\\', '/', pathinfo($file->getPathname(), PATHINFO_DIRNAME));
     $pathName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($pathName);
 
     // acl
-    $aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(), str_ireplace($directory,'',$pathName));
+    $aclMask = $_aclConfig->getComputedMask($this->_currentFolder->getResourceTypeName(), str_ireplace($directory, '', $pathName));
     $isAuthorized = (($aclMask & CKFINDER_CONNECTOR_ACL_FILE_VIEW) == CKFINDER_CONNECTOR_ACL_FILE_VIEW);
-    if ( !$isAuthorized ){
+    if (!$isAuthorized) {
       return false;
     }
 
     // if it is a folder fileName represents the dir
-    if ( $file->isDir() && ( !CKFinder_Connector_Utils_FileSystem::checkFolderPath($fileName) || $resourceTypeInfo->checkIsHiddenPath($fileName) ) ){
+    if ($file->isDir() && (!CKFinder_Connector_Utils_FileSystem::checkFolderPath($fileName) || $resourceTypeInfo->checkIsHiddenPath($fileName))) {
       return false;
     }
     // folder name
-    if ( !CKFinder_Connector_Utils_FileSystem::checkFolderPath($pathName) ){
+    if (!CKFinder_Connector_Utils_FileSystem::checkFolderPath($pathName)) {
       return false;
     }
 
     // is hidden
-    if ( $resourceTypeInfo->checkIsHiddenPath($pathName) || $resourceTypeInfo->checkIsHiddenFile($fileName) ){
+    if ($resourceTypeInfo->checkIsHiddenPath($pathName) || $resourceTypeInfo->checkIsHiddenFile($fileName)) {
       return false;
     }
 
     // extension
-    if ( !$resourceTypeInfo->checkExtension($fileName) || !CKFinder_Connector_Utils_FileSystem::checkFileName($fileName) ){
+    if (!$resourceTypeInfo->checkExtension($fileName) || !CKFinder_Connector_Utils_FileSystem::checkFileName($fileName)) {
       return false;
     }
 
@@ -583,34 +583,34 @@ 
    * @param int $zipMaxSize Maximum zip file size
    * @return array $allFiles
    */
-  protected function getFilesRecursively( $directory, $zipMaxSize )
+  protected function getFilesRecursively($directory, $zipMaxSize)
   {
     $allFiles = array();
     $_zipFilesSize = 0;
-    $serverPath = str_replace('\\','/',$directory);
+    $serverPath = str_replace('\\', '/', $directory);
 
-    foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory), RecursiveIteratorIterator::CHILD_FIRST) as $file ) {
-      if ( !$this->checkOneFile($file) ){
+    foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory), RecursiveIteratorIterator::CHILD_FIRST) as $file) {
+      if (!$this->checkOneFile($file)) {
         continue;
       }
-      if ( !empty($zipMaxSize) ){
+      if (!empty($zipMaxSize)) {
         clearstatcache();
         $_zipFilesSize += $file->getSize();
-        if ( $_zipFilesSize > $zipMaxSize ) {
+        if ($_zipFilesSize > $zipMaxSize) {
           $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CREATED_FILE_TOO_BIG);
         }
       }
-      $pathName = str_replace('\\','/',$file->getPathname());
-      if ( $file->isDir() ){
+      $pathName = str_replace('\\', '/', $file->getPathname());
+      if ($file->isDir()) {
         // skip dot folders on unix systems ( do not try to use isDot() as $file is not a  DirectoryIterator obj )
-        if ( in_array($file->getFilename(),array('..','.')) ){
+        if (in_array($file->getFilename(), array('..', '.'))) {
           continue;
         }
-        if ($pathName != rtrim($serverPath,'/')){
-          $allFiles[ ltrim(str_ireplace(rtrim($serverPath,'/'),'',$pathName),'/') ] = '';
+        if ($pathName != rtrim($serverPath, '/')) {
+          $allFiles[ltrim(str_ireplace(rtrim($serverPath, '/'), '', $pathName), '/')] = '';
         }
       } else {
-        $allFiles[$pathName] = str_ireplace($serverPath,'',$pathName);
+        $allFiles[$pathName] = str_ireplace($serverPath, '', $pathName);
       }
     }
 
@@ -629,11 +629,11 @@ 
     $this->checkConnector();
     $this->checkRequest();
 
-    if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
+    if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
     }
 
-    $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+    $this->_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
     $currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
     $_sServerDir = $this->_currentFolder->getServerPath();
 
@@ -642,21 +642,21 @@ 
     $_zipFilesSize = 0;
     $config = $this->getConfig();
     $zipMaxSize = $config['zipMaxSize'];
-    if ( !empty($zipMaxSize) && $zipMaxSize == 'default' ){
+    if (!empty($zipMaxSize) && $zipMaxSize == 'default') {
       $zipMaxSize = $currentResourceTypeConfig->getMaxSize();
     }
 
-    $_isBasket = ( isset($_POST['basket']) && $_POST['basket'] == 'true' )? true : false;
+    $_isBasket = (isset($_POST['basket']) && $_POST['basket'] == 'true') ? true : false;
 
-    if ( !empty($_POST['files']))
+    if (!empty($_POST['files']))
     {
 
       $_aclConfig = $this->_config->getAccessControlConfig();
       $aclMasks = array();
       $_resourceTypeConfig = array();
 
-      foreach ( $_POST['files'] as $arr ){
-        if ( empty($arr['name']) || empty($arr['type']) || empty($arr['folder']) ) {
+      foreach ($_POST['files'] as $arr) {
+        if (empty($arr['name']) || empty($arr['type']) || empty($arr['folder'])) {
           continue;
         }
         // file name
@@ -716,24 +716,24 @@ 
           continue;
         }
 
-        $sourceFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($_resourceTypeConfig[$type]->getDirectory().$path,$name);
+        $sourceFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($_resourceTypeConfig[$type]->getDirectory().$path, $name);
         // check #8 (invalid file name)
         if (!file_exists($sourceFilePath) || !is_file($sourceFilePath)) {
           continue;
         }
 
         // check #9 - max file size
-        if ( !empty($zipMaxSize) ){
+        if (!empty($zipMaxSize)) {
           clearstatcache();
           $_zipFilesSize += filesize($sourceFilePath);
-          if ( $_zipFilesSize > $zipMaxSize ) {
+          if ($_zipFilesSize > $zipMaxSize) {
             $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CREATED_FILE_TOO_BIG);
           }
         }
 
-        $zipPathPart = ( $_isBasket ) ? CKFinder_Connector_Utils_FileSystem::combinePaths($type,$path) : '';
+        $zipPathPart = ($_isBasket) ? CKFinder_Connector_Utils_FileSystem::combinePaths($type, $path) : '';
 
-        $files[$sourceFilePath] = $zipPathPart.pathinfo($sourceFilePath,PATHINFO_BASENAME);
+        $files[$sourceFilePath] = $zipPathPart.pathinfo($sourceFilePath, PATHINFO_BASENAME);
       }
     }
     else
@@ -741,9 +741,9 @@ 
       if (!is_dir($_sServerDir)) {
         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
       }
-      $files = $this->getFilesRecursively($_sServerDir,$zipMaxSize);
+      $files = $this->getFilesRecursively($_sServerDir, $zipMaxSize);
     }
-    if ( sizeof($files)<1) {
+    if (sizeof($files) < 1) {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
     }
     // default destination dir - temp
@@ -755,9 +755,9 @@ 
 
     // compress files - do not download them
     // change destination and name
-    if ( isset($_POST['download']) && $_POST['download'] == 'false'){
+    if (isset($_POST['download']) && $_POST['download'] == 'false') {
       $dest_dir = $_sServerDir;
-      if ( isset($_POST['zipName']) && !empty($_POST['zipName'])){
+      if (isset($_POST['zipName']) && !empty($_POST['zipName'])) {
         $zip_filename = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_POST['zipName']);
         if (!$resourceTypeInfo->checkExtension($zip_filename)) {
           $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
@@ -782,52 +782,52 @@ 
 
     // only if file already exists and we want download it
     // do not create new one - because hash of previously created is the same - existing archive is ok
-    if ( file_exists($zipFilePath) && isset($_POST['download']) && $_POST['download'] == 'true' ){
+    if (file_exists($zipFilePath) && isset($_POST['download']) && $_POST['download'] == 'true') {
       $createZip = false;
     }
     // if we only want to create archive
     else
     {
-      if ( file_exists($zipFilePath) && ( !isset($_POST['fileExistsAction']) || !in_array($_POST['fileExistsAction'], array('autorename','overwrite')) ) ){
+      if (file_exists($zipFilePath) && (!isset($_POST['fileExistsAction']) || !in_array($_POST['fileExistsAction'], array('autorename', 'overwrite')))) {
         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST);
       }
 
-      if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FILE_UPLOAD )) {
+      if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
       }
       // check how to deal with existing file
-      if ( isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'autorename' )
+      if (isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'autorename')
       {
-        if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_RENAME )) {
+        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_RENAME)) {
           $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
         }
         $zip_filename = CKFinder_Connector_Utils_FileSystem::autoRename($dest_dir, $zip_filename);
         $zipFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir, $zip_filename);
       }
-      elseif ( isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'overwrite' )
+      elseif (isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'overwrite')
       {
-        if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
+        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
           $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
         }
-        if (!CKFinder_Connector_Utils_FileSystem::unlink($zipFilePath)){
+        if (!CKFinder_Connector_Utils_FileSystem::unlink($zipFilePath)) {
           $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
         }
       }
     }
 
-    if ( $createZip ){
+    if ($createZip) {
       $zip = new ZipArchive();
-      $result = $zip->open( $zipFilePath, ZIPARCHIVE::CREATE);
-      if ( $result !== TRUE ) {
+      $result = $zip->open($zipFilePath, ZIPARCHIVE::CREATE);
+      if ($result !== TRUE) {
         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNKNOWN);
       }
-      foreach ( $files as $pathname => $filename ){
-        if ( !empty($filename) ){
-          if ( file_exists($pathname) && is_readable($pathname) ){
-            $zip->addFile( $pathname, $filename );
+      foreach ($files as $pathname => $filename) {
+        if (!empty($filename)) {
+          if (file_exists($pathname) && is_readable($pathname)) {
+            $zip->addFile($pathname, $filename);
           }
         } else {
-          $zip->addEmptyDir( $pathname );
+          $zip->addEmptyDir($pathname);
         }
       }
       $zip->close();
@@ -838,13 +838,13 @@ 
     $this->_connectorNode->addChild($file);
   }
 
-  public function onBeforeExecuteCommand( &$command )
+  public function onBeforeExecuteCommand(&$command)
   {
-    if ( $command == 'CreateZip'){
+    if ($command == 'CreateZip') {
       $this->sendResponse();
       return false;
     }
-    return true ;
+    return true;
   }
 
 } // end of CKFinder_Connector_CommandHandler_DownloadZip class
@@ -865,13 +865,13 @@ 
     $this->checkRequest();
 
     // empty wystarczy
-    if ( empty($_GET['FileName']) ){
+    if (empty($_GET['FileName'])) {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
     }
 
     $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
     $hash = $resourceTypeInfo->getHash();
-    if ( $hash !== $_GET['hash'] || $hash !== substr($_GET['FileName'],16,16) ){
+    if ($hash !== $_GET['hash'] || $hash !== substr($_GET['FileName'], 16, 16)) {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
     }
 
@@ -885,13 +885,13 @@ 
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
     }
 
-    if ( strtolower(pathinfo($fileName, PATHINFO_EXTENSION)) !== 'zip'){
+    if (strtolower(pathinfo($fileName, PATHINFO_EXTENSION)) !== 'zip') {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
     }
 
     $dest_dir = CKFinder_Connector_Utils_FileSystem::getTmpDir();
-    $filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir,$fileName);
-    if ( !file_exists($filePath) || !is_file($filePath)) {
+    $filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir, $fileName);
+    if (!file_exists($filePath) || !is_file($filePath)) {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
     }
     if (!is_readable($filePath)) {
@@ -902,7 +902,7 @@ 
     if (!CKFinder_Connector_Utils_FileSystem::checkFileName($zipFileName)) {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
     }
-    $fileFilename = pathinfo($zipFileName,PATHINFO_BASENAME );
+    $fileFilename = pathinfo($zipFileName, PATHINFO_BASENAME);
 
     header("Content-Encoding: none");
     header("Cache-Control: cache, must-revalidate");
@@ -913,20 +913,20 @@ 
     if (strpos($user_agent, "MSIE") !== false) {
       $encodedName = str_replace(array("+", "%2E"), array(" ", "."), urlencode($encodedName));
     }
-    header("Content-type: application/octet-stream; name=\"" . $fileFilename . "\"");
-    header("Content-Disposition: attachment; filename=\"" . $encodedName. "\"");
-    header("Content-Length: " . filesize($filePath));
+    header("Content-type: application/octet-stream; name=\"".$fileFilename."\"");
+    header("Content-Disposition: attachment; filename=\"".$encodedName."\"");
+    header("Content-Length: ".filesize($filePath));
     CKFinder_Connector_Utils_FileSystem::sendFile($filePath);
     exit;
   }
 
-  public function onBeforeExecuteCommand( &$command )
+  public function onBeforeExecuteCommand(&$command)
   {
-    if ( $command == 'DownloadZip'){
+    if ($command == 'DownloadZip') {
       $this->sendZipFile();
       return false;
     }
-    return true ;
+    return true;
   }
 
 } // end of CKFinder_Connector_CommandHandler_DownloadZip

Braces +11 added lines, -17 removed lines

@@ -12,7 +12,9 @@ 
 *
 * CKFinder extension: provides commands to add files into a zip archive, or extract contents from a zip.
 */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * Include base XML command handler
@@ -358,8 +360,7 @@ 
               {
                 $sFileName = CKFinder_Connector_Utils_FileSystem::autoRename($extractPath,$sFileName);
                 $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
-              }
-              elseif ( $checkedFiles[$fileName]['options'] == 'overwrite')
+              } elseif ( $checkedFiles[$fileName]['options'] == 'overwrite')
               {
                 if ( !$this->_currentFolder->checkAcl( CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ){
                   $this->errorCode = CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED;
@@ -370,19 +371,16 @@ 
                 {
                   $this->errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
                   $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
-                }
-                else
+                } else
                 {
                   $this->extractTo($extractPath,$extractClientPath,$filePathInfo,$sFileName,$fileName);
                 }
-              }
-              else
+              } else
               {
                 // add to skipped files
                 $this->appendUnzippedNode($this->unzippedNodes,$fileName,'skip');
               }
-            }
-            else
+            } else
             {
               $this->errorCode = CKFINDER_CONNECTOR_ERROR_ALREADY_EXIST;
               $this->appendErrorNode($this->skippedFilesNode, $this->errorCode, $fileName, $fileType);
@@ -449,8 +447,7 @@ 
       $dirExists->addChild($oErrorNode);
       $this->_connectorNode->addChild($dirExists);
       return;
-    }
-    elseif ( !empty( $_POST['force']) && $_POST['force'] =='overwrite' )
+    } elseif ( !empty( $_POST['force']) && $_POST['force'] =='overwrite' )
     {
       if ( !(($aclMask &  CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ==  CKFINDER_CONNECTOR_ACL_FILE_UPLOAD | CKFINDER_CONNECTOR_ACL_FILE_DELETE ) ){
         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
@@ -465,8 +462,7 @@ 
             $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
         }
       }
-    }
-    else if ( !empty( $_POST['force']) && $_POST['force'] !== 'merge' )
+    } else if ( !empty( $_POST['force']) && $_POST['force'] !== 'merge' )
     {
       $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
     }
@@ -735,8 +731,7 @@ 
 
         $files[$sourceFilePath] = $zipPathPart.pathinfo($sourceFilePath,PATHINFO_BASENAME);
       }
-    }
-    else
+    } else
     {
       if (!is_dir($_sServerDir)) {
         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
@@ -803,8 +798,7 @@ 
         }
         $zip_filename = CKFinder_Connector_Utils_FileSystem::autoRename($dest_dir, $zip_filename);
         $zipFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($dest_dir, $zip_filename);
-      }
-      elseif ( isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'overwrite' )
+      } elseif ( isset($_POST['fileExistsAction']) && $_POST['fileExistsAction'] == 'overwrite' )
       {
         if ( !$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_RENAME | CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
           $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);