Piou-piou / Ruined-World

modules/bataille/app/controller/Bataille.php

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 		
 		//-------------------------- GETTER ----------------------------------------------------------------------------//
 		public static function getValues() {
-		    return ["bataille" => self::$values];
+			return ["bataille" => self::$values];
 		}
 
 		//initilisation of all classes of battle

modules/bataille/app/controller/Base.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 
 		//-------------------------- GETTER ----------------------------------------------------------------------------//
 		public function getBatiments(){
-		    return $this->batiments;
+			return $this->batiments;
 		}
 
 		/**

modules/bataille/app/controller/Batiment.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 			return $this->ressource_construire;
 		}
 		public function getInfoBatiment(){
-		    return $this->info_batiment;
+			return $this->info_batiment;
 		}
 
 		public function getNomBatimentConstruction() {

modules/bataille/app/controller/Aide.php

Indentation +7 added lines, -7 removed lines

@@ -87,25 +87,25 @@
 
 		//-------------------------- GETTER ----------------------------------------------------------------------------//
 		public function getNomBatiment(){
-		    return $this->nom_batiment;
+			return $this->nom_batiment;
 		}
 		public function getNomBatimentSql(){
-		    return $this->nom_batiment_sql;
+			return $this->nom_batiment_sql;
 		}
 		public function getNiveauBatiment(){
-		    return $this->niveau_batiment;
+			return $this->niveau_batiment;
 		}
 		public function getTempsConstruction(){
-		    return $this->temps_construction;
+			return $this->temps_construction;
 		}
 		public function getRessourceConstruire(){
-		    return $this->ressource_construire;
+			return $this->ressource_construire;
 		}
 		public function getNomBatimentConstruire(){
-		    return $this->nom_batiment_construire;
+			return $this->nom_batiment_construire;
 		}
 		public function getNiveauBatimentConstruire(){
-		    return $this->niveau_batiment_construire;
+			return $this->niveau_batiment_construire;
 		}
 
 		/**

modules/messagerie/app/controller/Messagerie.php

Indentation +3 added lines, -3 removed lines

@@ -76,10 +76,10 @@ 
 			return $this->message;
 		}
 		public function getDateMessage(){
-		    return $this->date_message;
+			return $this->date_message;
 		}
 		public function getUrl(){
-		    return $this->url;
+			return $this->url;
 		}
 		public function getIdExpediteur() {
 			return $this->id_expediteur;
@@ -94,7 +94,7 @@ 
 			return $this->pseudo_receveur;
 		}
 		public function getValues(){
-		    return ["messagerie" => $this->values];
+			return ["messagerie" => $this->values];
 		}
 
 		/**

libs/ckfinder/config.php

Indentation +53 added lines, -53 removed lines

@@ -21,16 +21,16 @@ 
  */
 function CheckAuthentication()
 {
-    // WARNING : DO NOT simply return "true". By doing so, you are allowing
-    // "anyone" to upload and list the files in your server. You must implement
-    // some kind of session validation here. Even something very simple as...
+	// WARNING : DO NOT simply return "true". By doing so, you are allowing
+	// "anyone" to upload and list the files in your server. You must implement
+	// some kind of session validation here. Even something very simple as...
 
-        return true;
+		return true;
 
 
-    // ... where $_SESSION['IsAuthorized'] is set to "true" as soon as the
-    // user logs in your system. To be able to use session variables don't
-    // forget to add session_start() at the top of this file.
+	// ... where $_SESSION['IsAuthorized'] is set to "true" as soon as the
+	// user logs in your system. To be able to use session variables don't
+	// forget to add session_start() at the top of this file.
 
     
 }
@@ -96,23 +96,23 @@ 
 directory, no matter the resource type.
 */
 $config['Thumbnails'] = Array(
-        'url' => $baseUrl . '_thumbs',
-        'directory' => $baseDir . '_thumbs',
-        'enabled' => true,
-        'directAccess' => false,
-        'maxWidth' => 100,
-        'maxHeight' => 100,
-        'bmpSupported' => false,
-        'quality' => 80);
+		'url' => $baseUrl . '_thumbs',
+		'directory' => $baseDir . '_thumbs',
+		'enabled' => true,
+		'directAccess' => false,
+		'maxWidth' => 100,
+		'maxHeight' => 100,
+		'bmpSupported' => false,
+		'quality' => 80);
 
 /*
 Set the maximum size of uploaded images. If an uploaded image is larger, it
 gets scaled down proportionally. Set to 0 to disable this feature.
 */
 $config['Images'] = Array(
-        'maxWidth' => 700,
-        'maxHeight' => 1200,
-        'quality' => 80);
+		'maxWidth' => 700,
+		'maxHeight' => 1200,
+		'quality' => 80);
 
 /*
 RoleSessionVar : the session variable name that CKFinder must use to retrieve
@@ -138,19 +138,19 @@ 
 */
 
 $config['AccessControl'][] = Array(
-        'role' => '*',
-        'resourceType' => '*',
-        'folder' => '/',
+		'role' => '*',
+		'resourceType' => '*',
+		'folder' => '/',
 
-        'folderView' => true,
-        'folderCreate' => true,
-        'folderRename' => true,
-        'folderDelete' => true,
+		'folderView' => true,
+		'folderCreate' => true,
+		'folderRename' => true,
+		'folderDelete' => true,
 
-        'fileView' => true,
-        'fileUpload' => true,
-        'fileRename' => true,
-        'fileDelete' => true);
+		'fileView' => true,
+		'fileUpload' => true,
+		'fileRename' => true,
+		'fileDelete' => true);
 
 /*
 For example, if you want to restrict the upload, rename or delete of files in
@@ -193,36 +193,36 @@ 
 $config['DefaultResourceTypes'] = '';
 
 $config['ResourceType'][] = Array(
-        'name' => 'Files',              // Single quotes not allowed
-        'url' => $baseUrl . '/file/',
-        'directory' => $baseDir .  '/file/',
-        'maxSize' => 0,
-        'allowedExtensions' => '7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip,ai,psd',
-        'deniedExtensions' => '');
+		'name' => 'Files',              // Single quotes not allowed
+		'url' => $baseUrl . '/file/',
+		'directory' => $baseDir .  '/file/',
+		'maxSize' => 0,
+		'allowedExtensions' => '7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip,ai,psd',
+		'deniedExtensions' => '');
 
 $config['ResourceType'][] = Array(
-        'name' => 'Images',
-        'url' => $baseUrl .  '/image/',
-        'directory' => $baseDir .  '/image/',
-        'maxSize' => "16M",
-        'allowedExtensions' => 'bmp,gif,jpeg,jpg,png,',
-        'deniedExtensions' => '');
+		'name' => 'Images',
+		'url' => $baseUrl .  '/image/',
+		'directory' => $baseDir .  '/image/',
+		'maxSize' => "16M",
+		'allowedExtensions' => 'bmp,gif,jpeg,jpg,png,',
+		'deniedExtensions' => '');
 
 $config['ResourceType'][] = Array(
-        'name' => 'Flash',
-        'url' => $baseUrl .  '/flash/',
-        'directory' => $baseDir .  '/flash/',
-        'maxSize' => 0,
-        'allowedExtensions' => 'swf,flv',
-        'deniedExtensions' => '');
+		'name' => 'Flash',
+		'url' => $baseUrl .  '/flash/',
+		'directory' => $baseDir .  '/flash/',
+		'maxSize' => 0,
+		'allowedExtensions' => 'swf,flv',
+		'deniedExtensions' => '');
 
 $config['ResourceType'][] = Array(
-        'name' => 'Media',
-        'url' => $baseUrl .  '/media/',
-        'directory' => $baseDir .  '/media/',
-        'maxSize' => 0,
-        'allowedExtensions' => 'mp3,mp4,swf,flv,avi',
-        'deniedExtensions' => '');
+		'name' => 'Media',
+		'url' => $baseUrl .  '/media/',
+		'directory' => $baseDir .  '/media/',
+		'maxSize' => 0,
+		'allowedExtensions' => 'mp3,mp4,swf,flv,avi',
+		'deniedExtensions' => '');
 
 /*
  Due to security issues with Apache modules, it is recommended to leave the

libs/ckfinder/plugins/watermark/plugin.php

Indentation +153 added lines, -153 removed lines

@@ -15,174 +15,174 @@
 
 class Watermark
 {
-    function onAfterFileUpload($currentFolder, $uploadedFile, $sFilePath)
-    {
-        global $config;
-        $watermarkSettings = $config['Plugin_Watermark'];
+	function onAfterFileUpload($currentFolder, $uploadedFile, $sFilePath)
+	{
+		global $config;
+		$watermarkSettings = $config['Plugin_Watermark'];
 
-        $this->createWatermark($sFilePath, $watermarkSettings['source'], $watermarkSettings['marginRight'],
-            $watermarkSettings['marginBottom'], $watermarkSettings['quality'], $watermarkSettings['transparency']);
+		$this->createWatermark($sFilePath, $watermarkSettings['source'], $watermarkSettings['marginRight'],
+			$watermarkSettings['marginBottom'], $watermarkSettings['quality'], $watermarkSettings['transparency']);
 
-        return true;
-    }
+		return true;
+	}
 
-    function createWatermark($sourceFile, $watermarkFile, $marginLeft = 5, $marginBottom = 5, $quality = 90, $transparency = 100)
-    {
-        if (!file_exists($watermarkFile)) {
-            $watermarkFile = dirname(__FILE__) . "/" . $watermarkFile;
-        }
-        if (!file_exists($watermarkFile)) {
-            return false;
-        }
+	function createWatermark($sourceFile, $watermarkFile, $marginLeft = 5, $marginBottom = 5, $quality = 90, $transparency = 100)
+	{
+		if (!file_exists($watermarkFile)) {
+			$watermarkFile = dirname(__FILE__) . "/" . $watermarkFile;
+		}
+		if (!file_exists($watermarkFile)) {
+			return false;
+		}
 
-        $watermarkImageAttr = @getimagesize($watermarkFile);
-        $sourceImageAttr = @getimagesize($sourceFile);
-        if ($sourceImageAttr === false || $watermarkImageAttr === false) {
-            return false;
-        }
+		$watermarkImageAttr = @getimagesize($watermarkFile);
+		$sourceImageAttr = @getimagesize($sourceFile);
+		if ($sourceImageAttr === false || $watermarkImageAttr === false) {
+			return false;
+		}
 
-        switch ($watermarkImageAttr['mime'])
-        {
-            case 'image/gif':
-                {
-                    if (@imagetypes() & IMG_GIF) {
-                        $oWatermarkImage = @imagecreatefromgif($watermarkFile);
-                    } else {
-                        $ermsg = 'GIF images are not supported';
-                    }
-                }
-                break;
-            case 'image/jpeg':
-                {
-                    if (@imagetypes() & IMG_JPG) {
-                        $oWatermarkImage = @imagecreatefromjpeg($watermarkFile) ;
-                    } else {
-                        $ermsg = 'JPEG images are not supported';
-                    }
-                }
-                break;
-            case 'image/png':
-                {
-                    if (@imagetypes() & IMG_PNG) {
-                        $oWatermarkImage = @imagecreatefrompng($watermarkFile) ;
-                    } else {
-                        $ermsg = 'PNG images are not supported';
-                    }
-                }
-                break;
-            case 'image/wbmp':
-                {
-                    if (@imagetypes() & IMG_WBMP) {
-                        $oWatermarkImage = @imagecreatefromwbmp($watermarkFile);
-                    } else {
-                        $ermsg = 'WBMP images are not supported';
-                    }
-                }
-                break;
-            default:
-                $ermsg = $watermarkImageAttr['mime'].' images are not supported';
-                break;
-        }
+		switch ($watermarkImageAttr['mime'])
+		{
+			case 'image/gif':
+				{
+					if (@imagetypes() & IMG_GIF) {
+						$oWatermarkImage = @imagecreatefromgif($watermarkFile);
+					} else {
+						$ermsg = 'GIF images are not supported';
+					}
+				}
+				break;
+			case 'image/jpeg':
+				{
+					if (@imagetypes() & IMG_JPG) {
+						$oWatermarkImage = @imagecreatefromjpeg($watermarkFile) ;
+					} else {
+						$ermsg = 'JPEG images are not supported';
+					}
+				}
+				break;
+			case 'image/png':
+				{
+					if (@imagetypes() & IMG_PNG) {
+						$oWatermarkImage = @imagecreatefrompng($watermarkFile) ;
+					} else {
+						$ermsg = 'PNG images are not supported';
+					}
+				}
+				break;
+			case 'image/wbmp':
+				{
+					if (@imagetypes() & IMG_WBMP) {
+						$oWatermarkImage = @imagecreatefromwbmp($watermarkFile);
+					} else {
+						$ermsg = 'WBMP images are not supported';
+					}
+				}
+				break;
+			default:
+				$ermsg = $watermarkImageAttr['mime'].' images are not supported';
+				break;
+		}
 
-        switch ($sourceImageAttr['mime'])
-        {
-            case 'image/gif':
-                {
-                    if (@imagetypes() & IMG_GIF) {
-                        $oImage = @imagecreatefromgif($sourceFile);
-                    } else {
-                        $ermsg = 'GIF images are not supported';
-                    }
-                }
-                break;
-            case 'image/jpeg':
-                {
-                    if (@imagetypes() & IMG_JPG) {
-                        $oImage = @imagecreatefromjpeg($sourceFile) ;
-                    } else {
-                        $ermsg = 'JPEG images are not supported';
-                    }
-                }
-                break;
-            case 'image/png':
-                {
-                    if (@imagetypes() & IMG_PNG) {
-                        $oImage = @imagecreatefrompng($sourceFile) ;
-                    } else {
-                        $ermsg = 'PNG images are not supported';
-                    }
-                }
-                break;
-            case 'image/wbmp':
-                {
-                    if (@imagetypes() & IMG_WBMP) {
-                        $oImage = @imagecreatefromwbmp($sourceFile);
-                    } else {
-                        $ermsg = 'WBMP images are not supported';
-                    }
-                }
-                break;
-            default:
-                $ermsg = $sourceImageAttr['mime'].' images are not supported';
-                break;
-        }
+		switch ($sourceImageAttr['mime'])
+		{
+			case 'image/gif':
+				{
+					if (@imagetypes() & IMG_GIF) {
+						$oImage = @imagecreatefromgif($sourceFile);
+					} else {
+						$ermsg = 'GIF images are not supported';
+					}
+				}
+				break;
+			case 'image/jpeg':
+				{
+					if (@imagetypes() & IMG_JPG) {
+						$oImage = @imagecreatefromjpeg($sourceFile) ;
+					} else {
+						$ermsg = 'JPEG images are not supported';
+					}
+				}
+				break;
+			case 'image/png':
+				{
+					if (@imagetypes() & IMG_PNG) {
+						$oImage = @imagecreatefrompng($sourceFile) ;
+					} else {
+						$ermsg = 'PNG images are not supported';
+					}
+				}
+				break;
+			case 'image/wbmp':
+				{
+					if (@imagetypes() & IMG_WBMP) {
+						$oImage = @imagecreatefromwbmp($sourceFile);
+					} else {
+						$ermsg = 'WBMP images are not supported';
+					}
+				}
+				break;
+			default:
+				$ermsg = $sourceImageAttr['mime'].' images are not supported';
+				break;
+		}
 
-        if (isset($ermsg) || false === $oImage || false === $oWatermarkImage) {
-            return false;
-        }
+		if (isset($ermsg) || false === $oImage || false === $oWatermarkImage) {
+			return false;
+		}
 
-        $watermark_width = $watermarkImageAttr[0];
-        $watermark_height = $watermarkImageAttr[1];
-        $dest_x = $sourceImageAttr[0] - $watermark_width - $marginLeft;
-        $dest_y = $sourceImageAttr[1] - $watermark_height - $marginBottom;
+		$watermark_width = $watermarkImageAttr[0];
+		$watermark_height = $watermarkImageAttr[1];
+		$dest_x = $sourceImageAttr[0] - $watermark_width - $marginLeft;
+		$dest_y = $sourceImageAttr[1] - $watermark_height - $marginBottom;
 
-        if ( $sourceImageAttr['mime'] == 'image/png')
-        {
-            if(function_exists('imagesavealpha') && function_exists('imagecolorallocatealpha') )
-            {
-                 $bg = imagecolorallocatealpha($oImage, 255, 255, 255, 127); // (PHP 4 >= 4.3.2, PHP 5)
-                 imagefill($oImage, 0, 0 , $bg);
-                 imagealphablending($oImage, false);
-                 imagesavealpha($oImage, true);  // (PHP 4 >= 4.3.2, PHP 5)
-            }
-        }
-        if ($watermarkImageAttr['mime'] == 'image/png') {
-            imagecopy($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height);
-        }
-        else {
-            imagecopymerge($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height, $transparency);
-        }
+		if ( $sourceImageAttr['mime'] == 'image/png')
+		{
+			if(function_exists('imagesavealpha') && function_exists('imagecolorallocatealpha') )
+			{
+				 $bg = imagecolorallocatealpha($oImage, 255, 255, 255, 127); // (PHP 4 >= 4.3.2, PHP 5)
+				 imagefill($oImage, 0, 0 , $bg);
+				 imagealphablending($oImage, false);
+				 imagesavealpha($oImage, true);  // (PHP 4 >= 4.3.2, PHP 5)
+			}
+		}
+		if ($watermarkImageAttr['mime'] == 'image/png') {
+			imagecopy($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height);
+		}
+		else {
+			imagecopymerge($oImage, $oWatermarkImage, $dest_x, $dest_y, 0, 0, $watermark_width, $watermark_height, $transparency);
+		}
 
-        switch ($sourceImageAttr['mime'])
-        {
-            case 'image/gif':
-                imagegif($oImage, $sourceFile);
-                break;
-            case 'image/jpeg':
-                imagejpeg($oImage, $sourceFile, $quality);
-                break;
-            case 'image/png':
-                imagepng($oImage, $sourceFile);
-                break;
-            case 'image/wbmp':
-                imagewbmp($oImage, $sourceFile);
-                break;
-        }
+		switch ($sourceImageAttr['mime'])
+		{
+			case 'image/gif':
+				imagegif($oImage, $sourceFile);
+				break;
+			case 'image/jpeg':
+				imagejpeg($oImage, $sourceFile, $quality);
+				break;
+			case 'image/png':
+				imagepng($oImage, $sourceFile);
+				break;
+			case 'image/wbmp':
+				imagewbmp($oImage, $sourceFile);
+				break;
+		}
 
-        imageDestroy($oImage);
-        imageDestroy($oWatermarkImage);
-    }
+		imageDestroy($oImage);
+		imageDestroy($oWatermarkImage);
+	}
 }
 
 $watermark = new Watermark();
 $config['Hooks']['AfterFileUpload'][] = array($watermark, 'onAfterFileUpload');
 if (empty($config['Plugin_Watermark']))
 {
-    $config['Plugin_Watermark'] = array(
-        "source" => "logo.gif",
-        "marginRight" => 5,
-        "marginBottom" => 5,
-        "quality" => 90,
-        "transparency" => 80,
-    );
+	$config['Plugin_Watermark'] = array(
+		"source" => "logo.gif",
+		"marginRight" => 5,
+		"marginBottom" => 5,
+		"quality" => 90,
+		"transparency" => 80,
+	);
 }

libs/ckfinder/plugins/fileeditor/plugin.php

Indentation +61 added lines, -61 removed lines

@@ -21,79 +21,79 @@
 
 class CKFinder_Connector_CommandHandler_FileEditor extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * handle request and build XML
-     * @access protected
-     */
-    function buildXml()
-    {
-        if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
+	/**
+	 * handle request and build XML
+	 * @access protected
+	 */
+	function buildXml()
+	{
+		if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        $this->checkConnector();
-        $this->checkRequest();
+		$this->checkConnector();
+		$this->checkRequest();
 
-        // Saving empty file is equal to deleting a file, that's why FILE_DELETE permissions are required
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
+		// Saving empty file is equal to deleting a file, that's why FILE_DELETE permissions are required
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
 
-        if (!isset($_POST["fileName"])) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
-        }
-        if (!isset($_POST["content"])) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
+		if (!isset($_POST["fileName"])) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
+		}
+		if (!isset($_POST["content"])) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        $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);
+		}
 
-        $fp = @fopen($filePath, 'wb');
-        if ($fp === false || !flock($fp, LOCK_EX)) {
-            $result = false;
-        }
-        else {
-            $result = fwrite($fp, $_POST["content"]);
-            flock($fp, LOCK_UN);
-            fclose($fp);
-        }
-        if ($result === false) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-        }
-    }
+		$fp = @fopen($filePath, 'wb');
+		if ($fp === false || !flock($fp, LOCK_EX)) {
+			$result = false;
+		}
+		else {
+			$result = fwrite($fp, $_POST["content"]);
+			flock($fp, LOCK_UN);
+			fclose($fp);
+		}
+		if ($result === false) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+		}
+	}
 
-    /**
-     * @access public
-     */
-    function onBeforeExecuteCommand( &$command )
-    {
-        if ( $command == 'SaveFile' )
-        {
-            $this->sendResponse();
-            return false;
-        }
+	/**
+	 * @access public
+	 */
+	function onBeforeExecuteCommand( &$command )
+	{
+		if ( $command == 'SaveFile' )
+		{
+			$this->sendResponse();
+			return false;
+		}
 
-        return true ;
-    }
+		return true ;
+	}
 }
 
 $CommandHandler_FileEditor = new CKFinder_Connector_CommandHandler_FileEditor();

libs/ckfinder/plugins/zip/plugin.php

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