Index: branches/5.3.x/core/ckeditor/ckfinder/core/connector/php/php5/CommandHandler/DeleteFiles.php
===================================================================
diff -u -N -r15908 -r16252
--- branches/5.3.x/core/ckeditor/ckfinder/core/connector/php/php5/CommandHandler/DeleteFiles.php	(.../DeleteFiles.php)	(revision 15908)
+++ branches/5.3.x/core/ckeditor/ckfinder/core/connector/php/php5/CommandHandler/DeleteFiles.php	(.../DeleteFiles.php)	(revision 16252)
@@ -1,162 +1,162 @@
-<?php
-/*
- * CKFinder
-* ========
-* http://cksource.com/ckfinder
-* Copyright (C) 2007-2013, CKSource - Frederico Knabben. All rights reserved.
-*
-* The software, this file and its contents are subject to the CKFinder
-* License. Please read the license.txt file before using, installing, copying,
-* 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;
-
-/**
- * @package CKFinder
- * @subpackage CommandHandlers
- * @copyright CKSource - Frederico Knabben
- */
-
-/**
- * Include base XML command handler
- */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
-
-/**
- * Handle DeleteFiles command
- *
- * @package CKFinder
- * @subpackage CommandHandlers
- * @copyright CKSource - Frederico Knabben
- */
-class CKFinder_Connector_CommandHandler_DeleteFiles extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
-{
-  /**
-   * Command name
-   *
-   * @access private
-   * @var string
-   */
-  private $command = "DeleteFiles";
-
-
-  /**
-   * handle request and build XML
-   * @access protected
-   *
-   */
-  protected function buildXml()
-  {
-    if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-    }
-
-    if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-    }
-
-    $oErrorsNode = new CKFinder_Connector_Utils_XmlNode("Errors");
-    $errorCode = CKFINDER_CONNECTOR_ERROR_NONE;
-    $deleted = 0;
-    $oDeleteFilesNode = new Ckfinder_Connector_Utils_XmlNode("DeleteFiles");
-
-    $currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
-    $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-    $_aclConfig = $_config->getAccessControlConfig();
-    $aclMasks = array();
-    $_resourceTypeConfig = array();
-    $checkedPaths = array();
-
-    if (!empty($_POST['files']) && is_array($_POST['files'])) {
-      foreach ($_POST['files'] as $arr) {
-        if (empty($arr['name'])) {
-          continue;
-        }
-        if (!isset($arr['type'], $arr['folder'])) {
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        // file name
-        $name = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['name']);
-        // resource type
-        $type = $arr['type'];
-        // client path
-        $path = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['folder']);
-
-        if (!isset($_resourceTypeConfig[$type])) {
-          $_resourceTypeConfig[$type] = $_config->getResourceTypeConfig($type);
-        }
-
-        if (is_null($_resourceTypeConfig[$type]) || !CKFinder_Connector_Utils_FileSystem::checkFileName($name) || preg_match(CKFINDER_REGEX_INVALID_PATH, $path)) {
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        if (!$_resourceTypeConfig[$type]->checkExtension($name, false)) {
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        if (empty($checkedPaths[$path])) {
-          $checkedPaths[$path] = true;
-
-          if ($_resourceTypeConfig[$type]->checkIsHiddenPath($path)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-          }
-        }
-
-        if ($currentResourceTypeConfig->checkIsHiddenFile($name)) {
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        if (!isset($aclMasks[$type."@".$path])) {
-          $aclMasks[$type."@".$path] = $_aclConfig->getComputedMask($type, $path);
-        }
-
-        $isAuthorized = (($aclMasks[$type."@".$path] & CKFINDER_CONNECTOR_ACL_FILE_DELETE) == CKFINDER_CONNECTOR_ACL_FILE_DELETE);
-        if (!$isAuthorized) {
-          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
-
-        $filePath = $_resourceTypeConfig[$type]->getDirectory().$path.$name;
-
-        if (!file_exists($filePath) || !is_file($filePath) ) {
-          $errorCode = CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND;
-          $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-          continue;
-        }
-
-        if ( !CKFinder_Connector_Utils_FileSystem::unlink($filePath) ){
-          $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-          $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
-          continue;
-        } else {
-          $deleted++;
-
-          $thumbPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getThumbsServerPath(), $name);
-
-          @unlink($thumbPath);
-        }
-      }
-    }
-
-    $this->_connectorNode->addChild($oDeleteFilesNode);
-    if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
-      $this->_connectorNode->addChild($oErrorsNode);
-    }
-    $oDeleteFilesNode->addAttribute("deleted", $deleted);
-
-    if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
-      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_DELETE_FAILED);
-    }
-  }
-
-  private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
-  {
-    $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
-    $oErrorNode->addAttribute("code", $errorCode);
-    $oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
-    $oErrorNode->addAttribute("type", $type);
-    $oErrorNode->addAttribute("folder", $path);
-    $oErrorsNode->addChild($oErrorNode);
-  }
-}
+<?php
+/*
+ * CKFinder
+* ========
+* http://cksource.com/ckfinder
+* Copyright (C) 2007-2013, CKSource - Frederico Knabben. All rights reserved.
+*
+* The software, this file and its contents are subject to the CKFinder
+* License. Please read the license.txt file before using, installing, copying,
+* 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;
+
+/**
+ * @package CKFinder
+ * @subpackage CommandHandlers
+ * @copyright CKSource - Frederico Knabben
+ */
+
+/**
+ * Include base XML command handler
+ */
+require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+
+/**
+ * Handle DeleteFiles command
+ *
+ * @package CKFinder
+ * @subpackage CommandHandlers
+ * @copyright CKSource - Frederico Knabben
+ */
+class CKFinder_Connector_CommandHandler_DeleteFiles extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
+{
+  /**
+   * Command name
+   *
+   * @access private
+   * @var string
+   */
+  private $command = "DeleteFiles";
+
+
+  /**
+   * handle request and build XML
+   * @access protected
+   *
+   */
+  protected function buildXml()
+  {
+    if (empty($_POST['CKFinderCommand']) || $_POST['CKFinderCommand'] != 'true') {
+      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+    }
+
+    if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_DELETE)) {
+      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+    }
+
+    $oErrorsNode = new CKFinder_Connector_Utils_XmlNode("Errors");
+    $errorCode = CKFINDER_CONNECTOR_ERROR_NONE;
+    $deleted = 0;
+    $oDeleteFilesNode = new Ckfinder_Connector_Utils_XmlNode("DeleteFiles");
+
+    $currentResourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
+    $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+    $_aclConfig = $_config->getAccessControlConfig();
+    $aclMasks = array();
+    $_resourceTypeConfig = array();
+    $checkedPaths = array();
+
+    if (!empty($_POST['files']) && is_array($_POST['files'])) {
+      foreach ($_POST['files'] as $arr) {
+        if (empty($arr['name'])) {
+          continue;
+        }
+        if (!isset($arr['type'], $arr['folder'])) {
+          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+        }
+
+        // file name
+        $name = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['name']);
+        // resource type
+        $type = $arr['type'];
+        // client path
+        $path = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($arr['folder']);
+
+        if (!isset($_resourceTypeConfig[$type])) {
+          $_resourceTypeConfig[$type] = $_config->getResourceTypeConfig($type);
+        }
+
+        if (is_null($_resourceTypeConfig[$type]) || !CKFinder_Connector_Utils_FileSystem::checkFileName($name) || preg_match(CKFINDER_REGEX_INVALID_PATH, $path)) {
+          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+        }
+
+        if (!$_resourceTypeConfig[$type]->checkExtension($name, false)) {
+          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+        }
+
+        if (empty($checkedPaths[$path])) {
+          $checkedPaths[$path] = true;
+
+          if ($_resourceTypeConfig[$type]->checkIsHiddenPath($path)) {
+            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+          }
+        }
+
+        if ($currentResourceTypeConfig->checkIsHiddenFile($name)) {
+          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+        }
+
+        if (!isset($aclMasks[$type."@".$path])) {
+          $aclMasks[$type."@".$path] = $_aclConfig->getComputedMask($type, $path);
+        }
+
+        $isAuthorized = (($aclMasks[$type."@".$path] & CKFINDER_CONNECTOR_ACL_FILE_DELETE) == CKFINDER_CONNECTOR_ACL_FILE_DELETE);
+        if (!$isAuthorized) {
+          $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+        }
+
+        $filePath = $_resourceTypeConfig[$type]->getDirectory().$path.$name;
+
+        if (!file_exists($filePath) || !is_file($filePath) ) {
+          $errorCode = CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND;
+          $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+          continue;
+        }
+
+        if ( !CKFinder_Connector_Utils_FileSystem::unlink($filePath) ){
+          $errorCode = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+          $this->appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path);
+          continue;
+        } else {
+          $deleted++;
+
+          $thumbPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getThumbsServerPath(), $name);
+
+          @unlink($thumbPath);
+        }
+      }
+    }
+
+    $this->_connectorNode->addChild($oDeleteFilesNode);
+    if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
+      $this->_connectorNode->addChild($oErrorsNode);
+    }
+    $oDeleteFilesNode->addAttribute("deleted", $deleted);
+
+    if ($errorCode != CKFINDER_CONNECTOR_ERROR_NONE) {
+      $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_DELETE_FAILED);
+    }
+  }
+
+  private function appendErrorNode($oErrorsNode, $errorCode, $name, $type, $path)
+  {
+    $oErrorNode = new CKFinder_Connector_Utils_XmlNode("Error");
+    $oErrorNode->addAttribute("code", $errorCode);
+    $oErrorNode->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($name));
+    $oErrorNode->addAttribute("type", $type);
+    $oErrorNode->addAttribute("folder", $path);
+    $oErrorsNode->addChild($oErrorNode);
+  }
+}