Piou-piou / ribs-framework

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

Indentation +37 added lines, -37 removed lines

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

Doc Comments +1 added lines, -1 removed lines

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

Spacing +3 added lines, -3 removed lines

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

Braces +4 added lines, -3 removed lines

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

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

Indentation +34 added lines, -34 removed lines

@@ -32,42 +32,42 @@
  */
 class CKFinder_Connector_ErrorHandler_Http extends CKFinder_Connector_ErrorHandler_Base
 {
-    /**
-     * Throw file upload error, return true if error has been thrown, false if error has been catched
-     *
-     * @param int $number
-     * @param string $text
-     * @access public
-     */
-    public function throwError($number, $text = false, $exit = true)
-    {
-        if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
-            return false;
-        }
+	/**
+	 * Throw file upload error, return true if error has been thrown, false if error has been catched
+	 *
+	 * @param int $number
+	 * @param string $text
+	 * @access public
+	 */
+	public function throwError($number, $text = false, $exit = true)
+	{
+		if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
+			return false;
+		}
 
-        switch ($number)
-        {
-            case CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST:
-            case CKFINDER_CONNECTOR_ERROR_INVALID_NAME:
-            case CKFINDER_CONNECTOR_ERROR_THUMBNAILS_DISABLED:
-            case CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED:
-                header("HTTP/1.0 403 Forbidden");
-                header("X-CKFinder-Error: ". $number);
-                break;
+		switch ($number)
+		{
+			case CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST:
+			case CKFINDER_CONNECTOR_ERROR_INVALID_NAME:
+			case CKFINDER_CONNECTOR_ERROR_THUMBNAILS_DISABLED:
+			case CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED:
+				header("HTTP/1.0 403 Forbidden");
+				header("X-CKFinder-Error: ". $number);
+				break;
 
-            case CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED:
-                header("HTTP/1.0 500 Internal Server Error");
-                header("X-CKFinder-Error: ".$number);
-                break;
+			case CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED:
+				header("HTTP/1.0 500 Internal Server Error");
+				header("X-CKFinder-Error: ".$number);
+				break;
 
-            default:
-                header("HTTP/1.0 404 Not Found");
-                header("X-CKFinder-Error: ". $number);
-                break;
-        }
+			default:
+				header("HTTP/1.0 404 Not Found");
+				header("X-CKFinder-Error: ". $number);
+				break;
+		}
 
-        if ($exit) {
-            exit;
-        }
-    }
+		if ($exit) {
+			exit;
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 /**
  * Include base error handling class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/ErrorHandler/Base.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/ErrorHandler/Base.php";
 
 /**
  * HTTP error handler
@@ -52,7 +52,7 @@ 
             case CKFINDER_CONNECTOR_ERROR_THUMBNAILS_DISABLED:
             case CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED:
                 header("HTTP/1.0 403 Forbidden");
-                header("X-CKFinder-Error: ". $number);
+                header("X-CKFinder-Error: ".$number);
                 break;
 
             case CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED:
@@ -62,7 +62,7 @@ 
 
             default:
                 header("HTTP/1.0 404 Not Found");
-                header("X-CKFinder-Error: ". $number);
+                header("X-CKFinder-Error: ".$number);
                 break;
         }
 

Braces +3 added lines, -1 removed lines

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

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

Indentation +51 added lines, -51 removed lines

@@ -27,60 +27,60 @@
  */
 class CKFinder_Connector_ErrorHandler_Base
 {
-    /**
-     * Try/catch emulation, if set to true, error handler will not throw any error
-     *
-     * @var boolean
-     * @access protected
-     */
-    protected $_catchAllErrors = false;
-    /**
-     * Array with error numbers that should be ignored
-     *
-     * @var array[]int
-     * @access protected
-     */
-    protected $_skipErrorsArray = array();
+	/**
+	 * Try/catch emulation, if set to true, error handler will not throw any error
+	 *
+	 * @var boolean
+	 * @access protected
+	 */
+	protected $_catchAllErrors = false;
+	/**
+	 * Array with error numbers that should be ignored
+	 *
+	 * @var array[]int
+	 * @access protected
+	 */
+	protected $_skipErrorsArray = array();
 
-    /**
-     * Set whether all errors should be ignored
-     *
-     * @param boolean $newValue
-     * @access public
-     */
-    public function setCatchAllErros($newValue)
-    {
-        $this->_catchAllErrors = $newValue ? true : false;
-    }
+	/**
+	 * Set whether all errors should be ignored
+	 *
+	 * @param boolean $newValue
+	 * @access public
+	 */
+	public function setCatchAllErros($newValue)
+	{
+		$this->_catchAllErrors = $newValue ? true : false;
+	}
 
-    /**
-     * Set which errors should be ignored
-     *
-     * @param array $newArray
-     */
-    public function setSkipErrorsArray($newArray)
-    {
-        if (is_array($newArray)) {
-            $this->_skipErrorsArray = $newArray;
-        }
-    }
+	/**
+	 * Set which errors should be ignored
+	 *
+	 * @param array $newArray
+	 */
+	public function setSkipErrorsArray($newArray)
+	{
+		if (is_array($newArray)) {
+			$this->_skipErrorsArray = $newArray;
+		}
+	}
 
-    /**
-     * Throw connector error, return true if error has been thrown, false if error has been catched
-     *
-     * @param int $number
-     * @param string $text
-     * @access public
-     */
-    public function throwError($number, $text = false)
-    {
-        if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
-            return false;
-        }
+	/**
+	 * Throw connector error, return true if error has been thrown, false if error has been catched
+	 *
+	 * @param int $number
+	 * @param string $text
+	 * @access public
+	 */
+	public function throwError($number, $text = false)
+	{
+		if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
+			return false;
+		}
 
-        $_xml =& CKFinder_Connector_Core_Factory::getInstance("Core_Xml");
-        $_xml->raiseError($number,$text);
+		$_xml =& CKFinder_Connector_Core_Factory::getInstance("Core_Xml");
+		$_xml->raiseError($number,$text);
 
-        exit;
-    }
+		exit;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -78,8 +78,8 @@
             return false;
         }
 
-        $_xml =& CKFinder_Connector_Core_Factory::getInstance("Core_Xml");
-        $_xml->raiseError($number,$text);
+        $_xml = & CKFinder_Connector_Core_Factory::getInstance("Core_Xml");
+        $_xml->raiseError($number, $text);
 
         exit;
     }

Braces +3 added lines, -1 removed lines

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

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

Indentation +220 added lines, -220 removed lines

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

Braces +7 added lines, -9 removed lines

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

Doc Comments +4 added lines

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

Spacing +5 added lines, -5 removed lines

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

libs/ckfinder/core/connector/php/php4/CommandHandler/DeleteFolder.php

Indentation +33 added lines, -33 removed lines

@@ -32,44 +32,44 @@
  */
 class CKFinder_Connector_CommandHandler_DeleteFolder extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * Command name
-     *
-     * @access private
-     * @var string
-     */
-    var $command = "DeleteFolder";
+	/**
+	 * Command name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $command = "DeleteFolder";
 
 
-    /**
-     * 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);
+		}
 
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FOLDER_DELETE)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FOLDER_DELETE)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
 
-        // The root folder cannot be deleted.
-        if ($this->_currentFolder->getClientPath() == "/") {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
+		// The root folder cannot be deleted.
+		if ($this->_currentFolder->getClientPath() == "/") {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        $folderServerPath = $this->_currentFolder->getServerPath();
-        if (!file_exists($folderServerPath) || !is_dir($folderServerPath)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
-        }
+		$folderServerPath = $this->_currentFolder->getServerPath();
+		if (!file_exists($folderServerPath) || !is_dir($folderServerPath)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
+		}
 
-        if (!CKFinder_Connector_Utils_FileSystem::unlink($folderServerPath)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-        }
+		if (!CKFinder_Connector_Utils_FileSystem::unlink($folderServerPath)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+		}
 
-        CKFinder_Connector_Utils_FileSystem::unlink($this->_currentFolder->getThumbsServerPath());
-    }
+		CKFinder_Connector_Utils_FileSystem::unlink($this->_currentFolder->getThumbsServerPath());
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 /**
  * Include base XML command handler
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/XmlCommandHandlerBase.php";
 
 /**
  * Handle DeleteFile command

Braces +3 added lines, -1 removed lines

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

libs/ckfinder/core/connector/php/php4/CommandHandler/GetFolders.php

Indentation +60 added lines, -60 removed lines

@@ -32,74 +32,74 @@
  */
 class CKFinder_Connector_CommandHandler_GetFolders extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * Command name
-     *
-     * @access private
-     * @var string
-     */
-    var $command = "GetFolders";
+	/**
+	 * Command name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $command = "GetFolders";
 
-    /**
-     * handle request and build XML
-     * @access protected
-     *
-     */
-    function buildXml()
-    {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FOLDER_VIEW)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
+	/**
+	 * handle request and build XML
+	 * @access protected
+	 *
+	 */
+	function buildXml()
+	{
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FOLDER_VIEW)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
 
-        // Map the virtual path to the local server path.
-        $_sServerDir = $this->_currentFolder->getServerPath();
+		// Map the virtual path to the local server path.
+		$_sServerDir = $this->_currentFolder->getServerPath();
 
-        if (!is_dir($_sServerDir)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
-        }
+		if (!is_dir($_sServerDir)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
+		}
 
-        // Create the "Folders" node.
-        $oFoldersNode = new Ckfinder_Connector_Utils_XmlNode("Folders");
-        $this->_connectorNode->addChild($oFoldersNode);
+		// Create the "Folders" node.
+		$oFoldersNode = new Ckfinder_Connector_Utils_XmlNode("Folders");
+		$this->_connectorNode->addChild($oFoldersNode);
 
-        $files = array();
-        if ($dh = @opendir($_sServerDir)) {
-            while (($file = readdir($dh)) !== false) {
-                if ($file != "." && $file != ".." && is_dir($_sServerDir . $file)) {
-                    $files[] = $file;
-                }
-            }
-            closedir($dh);
-        } else {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-        }
+		$files = array();
+		if ($dh = @opendir($_sServerDir)) {
+			while (($file = readdir($dh)) !== false) {
+				if ($file != "." && $file != ".." && is_dir($_sServerDir . $file)) {
+					$files[] = $file;
+				}
+			}
+			closedir($dh);
+		} else {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+		}
 
-        $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+		$resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
 
-        if (sizeof($files)>0) {
-            natcasesort($files);
-            $i=0;
-            foreach ($files as $file) {
-                $oAcl = $_config->getAccessControlConfig();
-                $aclMask = $oAcl->getComputedMask($this->_currentFolder->getResourceTypeName(), $this->_currentFolder->getClientPath() . $file . "/");
+		if (sizeof($files)>0) {
+			natcasesort($files);
+			$i=0;
+			foreach ($files as $file) {
+				$oAcl = $_config->getAccessControlConfig();
+				$aclMask = $oAcl->getComputedMask($this->_currentFolder->getResourceTypeName(), $this->_currentFolder->getClientPath() . $file . "/");
 
-                if (($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) != CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) {
-                    continue;
-                }
-                if ($resourceTypeInfo->checkIsHiddenFolder($file)) {
-                    continue;
-                }
+				if (($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) != CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) {
+					continue;
+				}
+				if ($resourceTypeInfo->checkIsHiddenFolder($file)) {
+					continue;
+				}
 
-                // Create the "Folder" node.
-                $oFolderNode[$i] = new Ckfinder_Connector_Utils_XmlNode("Folder");
-                $oFoldersNode->addChild($oFolderNode[$i]);
-                $oFolderNode[$i]->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($file));
-                $oFolderNode[$i]->addAttribute("hasChildren", CKFinder_Connector_Utils_FileSystem::hasChildren($_sServerDir . $file) ? "true" : "false");
-                $oFolderNode[$i]->addAttribute("acl", $aclMask);
+				// Create the "Folder" node.
+				$oFolderNode[$i] = new Ckfinder_Connector_Utils_XmlNode("Folder");
+				$oFoldersNode->addChild($oFolderNode[$i]);
+				$oFolderNode[$i]->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($file));
+				$oFolderNode[$i]->addAttribute("hasChildren", CKFinder_Connector_Utils_FileSystem::hasChildren($_sServerDir . $file) ? "true" : "false");
+				$oFolderNode[$i]->addAttribute("acl", $aclMask);
 
-                $i++;
-            }
-        }
-    }
+				$i++;
+			}
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 /**
  * Include base XML command handler
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/XmlCommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/XmlCommandHandlerBase.php";
 
 /**
  * Handle GetFolders command
@@ -47,7 +47,7 @@ 
      */
     function buildXml()
     {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FOLDER_VIEW)) {
             $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
         }
@@ -66,7 +66,7 @@ 
         $files = array();
         if ($dh = @opendir($_sServerDir)) {
             while (($file = readdir($dh)) !== false) {
-                if ($file != "." && $file != ".." && is_dir($_sServerDir . $file)) {
+                if ($file != "." && $file != ".." && is_dir($_sServerDir.$file)) {
                     $files[] = $file;
                 }
             }
@@ -77,12 +77,12 @@ 
 
         $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
 
-        if (sizeof($files)>0) {
+        if (sizeof($files) > 0) {
             natcasesort($files);
-            $i=0;
+            $i = 0;
             foreach ($files as $file) {
                 $oAcl = $_config->getAccessControlConfig();
-                $aclMask = $oAcl->getComputedMask($this->_currentFolder->getResourceTypeName(), $this->_currentFolder->getClientPath() . $file . "/");
+                $aclMask = $oAcl->getComputedMask($this->_currentFolder->getResourceTypeName(), $this->_currentFolder->getClientPath().$file."/");
 
                 if (($aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) != CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) {
                     continue;
@@ -95,7 +95,7 @@ 
                 $oFolderNode[$i] = new Ckfinder_Connector_Utils_XmlNode("Folder");
                 $oFoldersNode->addChild($oFolderNode[$i]);
                 $oFolderNode[$i]->addAttribute("name", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($file));
-                $oFolderNode[$i]->addAttribute("hasChildren", CKFinder_Connector_Utils_FileSystem::hasChildren($_sServerDir . $file) ? "true" : "false");
+                $oFolderNode[$i]->addAttribute("hasChildren", CKFinder_Connector_Utils_FileSystem::hasChildren($_sServerDir.$file) ? "true" : "false");
                 $oFolderNode[$i]->addAttribute("acl", $aclMask);
 
                 $i++;

Braces +3 added lines, -1 removed lines

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

libs/ckfinder/core/connector/php/php4/CommandHandler/XmlCommandHandlerBase.php

Indentation +81 added lines, -81 removed lines

@@ -38,85 +38,85 @@
  */
 class CKFinder_Connector_CommandHandler_XmlCommandHandlerBase extends CKFinder_Connector_CommandHandler_CommandHandlerBase
 {
-    /**
-     * Connector node - Ckfinder_Connector_Utils_XmlNode object
-     *
-     * @var Ckfinder_Connector_Utils_XmlNode
-     * @access protected
-     */
-    var $_connectorNode;
-
-    /**
-     * send response
-     * @access public
-     *
-     */
-    function sendResponse()
-    {
-        $xml =& CKFinder_Connector_Core_Factory::getInstance("Core_Xml");
-        $this->_connectorNode =& $xml->getConnectorNode();
-
-        $this->checkConnector();
-        if ($this->mustCheckRequest()) {
-            $this->checkRequest();
-        }
-
-        $resourceTypeName = $this->_currentFolder->getResourceTypeName();
-        if (!empty($resourceTypeName)) {
-            $this->_connectorNode->addAttribute("resourceType", $this->_currentFolder->getResourceTypeName());
-        }
-
-        if ($this->mustAddCurrentFolderNode()) {
-            $_currentFolder = new Ckfinder_Connector_Utils_XmlNode("CurrentFolder");
-            $this->_connectorNode->addChild($_currentFolder);
-            $_currentFolder->addAttribute("path", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($this->_currentFolder->getClientPath()));
-
-            $this->_errorHandler->setCatchAllErros(true);
-            $_url = $this->_currentFolder->getUrl();
-            $_currentFolder->addAttribute("url", is_null($_url) ? "" : CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($_url));
-            $this->_errorHandler->setCatchAllErros(false);
-
-            $_currentFolder->addAttribute("acl", $this->_currentFolder->getAclMask());
-        }
-
-        $this->buildXml();
-
-        $_oErrorNode =& $xml->getErrorNode();
-        $_oErrorNode->addAttribute("number", "0");
-
-        echo $this->_connectorNode->asXML();
-        exit;
-    }
-
-    /**
-     * Must check request?
-     *
-     * @return boolean
-     * @access protected
-     */
-    function mustCheckRequest()
-    {
-        return true;
-    }
-
-    /**
-     * Must add CurrentFolder node?
-     *
-     * @return boolean
-     * @access protected
-     */
-    function mustAddCurrentFolderNode()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     * @abstract
-     * @return void
-     */
-    function buildXml()
-    {
-
-    }
+	/**
+	 * Connector node - Ckfinder_Connector_Utils_XmlNode object
+	 *
+	 * @var Ckfinder_Connector_Utils_XmlNode
+	 * @access protected
+	 */
+	var $_connectorNode;
+
+	/**
+	 * send response
+	 * @access public
+	 *
+	 */
+	function sendResponse()
+	{
+		$xml =& CKFinder_Connector_Core_Factory::getInstance("Core_Xml");
+		$this->_connectorNode =& $xml->getConnectorNode();
+
+		$this->checkConnector();
+		if ($this->mustCheckRequest()) {
+			$this->checkRequest();
+		}
+
+		$resourceTypeName = $this->_currentFolder->getResourceTypeName();
+		if (!empty($resourceTypeName)) {
+			$this->_connectorNode->addAttribute("resourceType", $this->_currentFolder->getResourceTypeName());
+		}
+
+		if ($this->mustAddCurrentFolderNode()) {
+			$_currentFolder = new Ckfinder_Connector_Utils_XmlNode("CurrentFolder");
+			$this->_connectorNode->addChild($_currentFolder);
+			$_currentFolder->addAttribute("path", CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($this->_currentFolder->getClientPath()));
+
+			$this->_errorHandler->setCatchAllErros(true);
+			$_url = $this->_currentFolder->getUrl();
+			$_currentFolder->addAttribute("url", is_null($_url) ? "" : CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($_url));
+			$this->_errorHandler->setCatchAllErros(false);
+
+			$_currentFolder->addAttribute("acl", $this->_currentFolder->getAclMask());
+		}
+
+		$this->buildXml();
+
+		$_oErrorNode =& $xml->getErrorNode();
+		$_oErrorNode->addAttribute("number", "0");
+
+		echo $this->_connectorNode->asXML();
+		exit;
+	}
+
+	/**
+	 * Must check request?
+	 *
+	 * @return boolean
+	 * @access protected
+	 */
+	function mustCheckRequest()
+	{
+		return true;
+	}
+
+	/**
+	 * Must add CurrentFolder node?
+	 *
+	 * @return boolean
+	 * @access protected
+	 */
+	function mustAddCurrentFolderNode()
+	{
+		return true;
+	}
+
+	/**
+	 * @access protected
+	 * @abstract
+	 * @return void
+	 */
+	function buildXml()
+	{
+
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -21,11 +21,11 @@ 
 /**
  * Include base command handler
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/CommandHandlerBase.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/CommandHandlerBase.php";
 /**
  * Include xml utils
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/Xml.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/Xml.php";
 
 /**
  * Base XML commands handler
@@ -53,8 +53,8 @@ 
      */
     function sendResponse()
     {
-        $xml =& CKFinder_Connector_Core_Factory::getInstance("Core_Xml");
-        $this->_connectorNode =& $xml->getConnectorNode();
+        $xml = & CKFinder_Connector_Core_Factory::getInstance("Core_Xml");
+        $this->_connectorNode = & $xml->getConnectorNode();
 
         $this->checkConnector();
         if ($this->mustCheckRequest()) {
@@ -81,7 +81,7 @@ 
 
         $this->buildXml();
 
-        $_oErrorNode =& $xml->getErrorNode();
+        $_oErrorNode = & $xml->getErrorNode();
         $_oErrorNode->addAttribute("number", "0");
 
         echo $this->_connectorNode->asXML();

Braces +3 added lines, -1 removed lines

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

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

Indentation +209 added lines, -209 removed lines

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

Spacing +5 added lines, -5 removed lines

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

Braces +11 added lines, -17 removed lines

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

Doc Comments +4 added lines

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

libs/ckfinder/core/connector/php/php4/CommandHandler/FileUpload.php

Indentation +183 added lines, -183 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /**
- * CKFinder
- * ========
- * http://ckfinder.com
- * Copyright (C) 2007-2010, 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.
- */
+	 * CKFinder
+	 * ========
+	 * http://ckfinder.com
+	 * Copyright (C) 2007-2010, 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;
 
 /**
@@ -27,177 +27,177 @@ 
  */
 class CKFinder_Connector_CommandHandler_FileUpload extends CKFinder_Connector_CommandHandler_CommandHandlerBase
 {
-    /**
-     * Command name
-     *
-     * @access protected
-     * @var string
-     */
-    var $command = "FileUpload";
-
-    /**
-     * send response (save uploaded file, resize if required)
-     * @access public
-     *
-     */
-    function sendResponse()
-    {
-        $iErrorNumber = CKFINDER_CONNECTOR_ERROR_NONE;
-
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $oRegistry =& CKFinder_Connector_Core_Factory::getInstance("Core_Registry");
-        $oRegistry->set("FileUpload_fileName", "unknown file");
-
-        $uploadedFile = array_shift($_FILES);
-
-        if (!isset($uploadedFile['name'])) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID);
-        }
-
-        $sUnsafeFileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(CKFinder_Connector_Utils_Misc::mbBasename($uploadedFile['name']));
-        $sFileName = str_replace(array(":", "*", "?", "|", "/"), "_", $sUnsafeFileName);
-        if ($_config->forceAscii()) {
-            $sFileName = CKFinder_Connector_Utils_FileSystem::convertToAscii($sFileName);
-        }
-        if ($sFileName != $sUnsafeFileName) {
-          $iErrorNumber = CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID_NAME_RENAMED;
-        }
-        $oRegistry->set("FileUpload_fileName", $sFileName);
-        $oRegistry->set("FileUpload_url", $this->_currentFolder->getUrl());
-
-        $this->checkConnector();
-        $this->checkRequest();
-
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
-
-        $_resourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
-        if (!CKFinder_Connector_Utils_FileSystem::checkFileName($sFileName) || $_resourceTypeConfig->checkIsHiddenFile($sFileName)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
-        }
-
-        $resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
-        if (!$resourceTypeInfo->checkExtension($sFileName)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
-        }
-
-        $sFileNameOrginal = $sFileName;
-        $oRegistry->set("FileUpload_fileName", $sFileName);
-
-        $maxSize = $resourceTypeInfo->getMaxSize();
-        if (!$_config->checkSizeAfterScaling() && $maxSize && $uploadedFile['size']>$maxSize) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG);
-        }
-
-        $htmlExtensions = $_config->getHtmlExtensions();
-        $sExtension = CKFinder_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
-
-        if ($htmlExtensions
-        && !CKFinder_Connector_Utils_Misc::inArrayCaseInsensitive($sExtension, $htmlExtensions)
-        && ($detectHtml = CKFinder_Connector_Utils_FileSystem::detectHtml($uploadedFile['tmp_name'])) === true ) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE);
-        }
-
-        $sExtension = CKFinder_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
-        $secureImageUploads = $_config->getSecureImageUploads();
-        if ($secureImageUploads
-        && ($isImageValid = CKFinder_Connector_Utils_FileSystem::isImageValid($uploadedFile['tmp_name'], $sExtension)) === false ) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_CORRUPT);
-        }
-
-        switch ($uploadedFile['error']) {
-            case UPLOAD_ERR_OK:
-                break;
-
-            case UPLOAD_ERR_INI_SIZE:
-            case UPLOAD_ERR_FORM_SIZE:
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG);
-                break;
-
-            case UPLOAD_ERR_PARTIAL:
-            case UPLOAD_ERR_NO_FILE:
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_CORRUPT);
-                break;
-
-            case UPLOAD_ERR_NO_TMP_DIR:
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_NO_TMP_DIR);
-                break;
-
-            case UPLOAD_ERR_CANT_WRITE:
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-                break;
-
-            case UPLOAD_ERR_EXTENSION:
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-                break;
-        }
-
-        $sServerDir = $this->_currentFolder->getServerPath();
-        $iCounter = 0;
-
-        while (true)
-        {
-            $sFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($sServerDir, $sFileName);
-
-
-            if (file_exists($sFilePath)) {
-
-                $iCounter++;
-                $sFileName =
-                CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($sFileNameOrginal) .
-                "(" . $iCounter . ")" . "." .
-                CKFinder_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
-                $oRegistry->set("FileUpload_fileName", $sFileName);
-
-                $iErrorNumber = CKFINDER_CONNECTOR_ERROR_UPLOADED_FILE_RENAMED;
-            } else {
-                if (false === move_uploaded_file($uploadedFile['tmp_name'], $sFilePath)) {
-                    $iErrorNumber = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                }
-                else {
-                    if (isset($detectHtml) && $detectHtml === -1 && CKFinder_Connector_Utils_FileSystem::detectHtml($sFilePath) === true) {
-                        @unlink($sFilePath);
-                        $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE);
-                    }
-                    else if (isset($isImageValid) && $isImageValid === -1 && CKFinder_Connector_Utils_FileSystem::isImageValid($sFilePath, $sExtension) === false) {
-                        @unlink($sFilePath);
-                        $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_CORRUPT);
-                    }
-                }
-                if (is_file($sFilePath) && ($perms = $_config->getChmodFiles())) {
-                    $oldumask = umask(0);
-                    chmod($sFilePath, $perms);
-                    umask($oldumask);
-                }
-                break;
-            }
-        }
-
-        if (!$_config->checkSizeAfterScaling()) {
-            $this->_errorHandler->throwError($iErrorNumber, true, false);
-        }
-
-        //resize image if required
-        require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/Thumbnail.php";
-        $_imagesConfig = $_config->getImagesConfig();
-
-        if ($_imagesConfig->getMaxWidth()>0 && $_imagesConfig->getMaxHeight()>0 && $_imagesConfig->getQuality()>0) {
-            CKFinder_Connector_CommandHandler_Thumbnail::createThumb($sFilePath, $sFilePath, $_imagesConfig->getMaxWidth(), $_imagesConfig->getMaxHeight(), $_imagesConfig->getQuality(), true) ;
-        }
-
-        if ($_config->checkSizeAfterScaling()) {
-            //check file size after scaling, attempt to delete if too big
-            clearstatcache();
-            if ($maxSize && filesize($sFilePath)>$maxSize) {
-                @unlink($sFilePath);
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG);
-            }
-            else {
-                $this->_errorHandler->throwError($iErrorNumber, true, false);
-            }
-        }
-
-        CKFinder_Connector_Core_Hooks::run('AfterFileUpload', array(&$this->_currentFolder, &$uploadedFile, &$sFilePath));
-    }
+	/**
+	 * Command name
+	 *
+	 * @access protected
+	 * @var string
+	 */
+	var $command = "FileUpload";
+
+	/**
+	 * send response (save uploaded file, resize if required)
+	 * @access public
+	 *
+	 */
+	function sendResponse()
+	{
+		$iErrorNumber = CKFINDER_CONNECTOR_ERROR_NONE;
+
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$oRegistry =& CKFinder_Connector_Core_Factory::getInstance("Core_Registry");
+		$oRegistry->set("FileUpload_fileName", "unknown file");
+
+		$uploadedFile = array_shift($_FILES);
+
+		if (!isset($uploadedFile['name'])) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID);
+		}
+
+		$sUnsafeFileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(CKFinder_Connector_Utils_Misc::mbBasename($uploadedFile['name']));
+		$sFileName = str_replace(array(":", "*", "?", "|", "/"), "_", $sUnsafeFileName);
+		if ($_config->forceAscii()) {
+			$sFileName = CKFinder_Connector_Utils_FileSystem::convertToAscii($sFileName);
+		}
+		if ($sFileName != $sUnsafeFileName) {
+		  $iErrorNumber = CKFINDER_CONNECTOR_ERROR_UPLOADED_INVALID_NAME_RENAMED;
+		}
+		$oRegistry->set("FileUpload_fileName", $sFileName);
+		$oRegistry->set("FileUpload_url", $this->_currentFolder->getUrl());
+
+		$this->checkConnector();
+		$this->checkRequest();
+
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_UPLOAD)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
+
+		$_resourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
+		if (!CKFinder_Connector_Utils_FileSystem::checkFileName($sFileName) || $_resourceTypeConfig->checkIsHiddenFile($sFileName)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
+		}
+
+		$resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+		if (!$resourceTypeInfo->checkExtension($sFileName)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_EXTENSION);
+		}
+
+		$sFileNameOrginal = $sFileName;
+		$oRegistry->set("FileUpload_fileName", $sFileName);
+
+		$maxSize = $resourceTypeInfo->getMaxSize();
+		if (!$_config->checkSizeAfterScaling() && $maxSize && $uploadedFile['size']>$maxSize) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG);
+		}
+
+		$htmlExtensions = $_config->getHtmlExtensions();
+		$sExtension = CKFinder_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
+
+		if ($htmlExtensions
+		&& !CKFinder_Connector_Utils_Misc::inArrayCaseInsensitive($sExtension, $htmlExtensions)
+		&& ($detectHtml = CKFinder_Connector_Utils_FileSystem::detectHtml($uploadedFile['tmp_name'])) === true ) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE);
+		}
+
+		$sExtension = CKFinder_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
+		$secureImageUploads = $_config->getSecureImageUploads();
+		if ($secureImageUploads
+		&& ($isImageValid = CKFinder_Connector_Utils_FileSystem::isImageValid($uploadedFile['tmp_name'], $sExtension)) === false ) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_CORRUPT);
+		}
+
+		switch ($uploadedFile['error']) {
+			case UPLOAD_ERR_OK:
+				break;
+
+			case UPLOAD_ERR_INI_SIZE:
+			case UPLOAD_ERR_FORM_SIZE:
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG);
+				break;
+
+			case UPLOAD_ERR_PARTIAL:
+			case UPLOAD_ERR_NO_FILE:
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_CORRUPT);
+				break;
+
+			case UPLOAD_ERR_NO_TMP_DIR:
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_NO_TMP_DIR);
+				break;
+
+			case UPLOAD_ERR_CANT_WRITE:
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+				break;
+
+			case UPLOAD_ERR_EXTENSION:
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+				break;
+		}
+
+		$sServerDir = $this->_currentFolder->getServerPath();
+		$iCounter = 0;
+
+		while (true)
+		{
+			$sFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($sServerDir, $sFileName);
+
+
+			if (file_exists($sFilePath)) {
+
+				$iCounter++;
+				$sFileName =
+				CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($sFileNameOrginal) .
+				"(" . $iCounter . ")" . "." .
+				CKFinder_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
+				$oRegistry->set("FileUpload_fileName", $sFileName);
+
+				$iErrorNumber = CKFINDER_CONNECTOR_ERROR_UPLOADED_FILE_RENAMED;
+			} else {
+				if (false === move_uploaded_file($uploadedFile['tmp_name'], $sFilePath)) {
+					$iErrorNumber = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
+				}
+				else {
+					if (isset($detectHtml) && $detectHtml === -1 && CKFinder_Connector_Utils_FileSystem::detectHtml($sFilePath) === true) {
+						@unlink($sFilePath);
+						$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE);
+					}
+					else if (isset($isImageValid) && $isImageValid === -1 && CKFinder_Connector_Utils_FileSystem::isImageValid($sFilePath, $sExtension) === false) {
+						@unlink($sFilePath);
+						$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_CORRUPT);
+					}
+				}
+				if (is_file($sFilePath) && ($perms = $_config->getChmodFiles())) {
+					$oldumask = umask(0);
+					chmod($sFilePath, $perms);
+					umask($oldumask);
+				}
+				break;
+			}
+		}
+
+		if (!$_config->checkSizeAfterScaling()) {
+			$this->_errorHandler->throwError($iErrorNumber, true, false);
+		}
+
+		//resize image if required
+		require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/Thumbnail.php";
+		$_imagesConfig = $_config->getImagesConfig();
+
+		if ($_imagesConfig->getMaxWidth()>0 && $_imagesConfig->getMaxHeight()>0 && $_imagesConfig->getQuality()>0) {
+			CKFinder_Connector_CommandHandler_Thumbnail::createThumb($sFilePath, $sFilePath, $_imagesConfig->getMaxWidth(), $_imagesConfig->getMaxHeight(), $_imagesConfig->getQuality(), true) ;
+		}
+
+		if ($_config->checkSizeAfterScaling()) {
+			//check file size after scaling, attempt to delete if too big
+			clearstatcache();
+			if ($maxSize && filesize($sFilePath)>$maxSize) {
+				@unlink($sFilePath);
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG);
+			}
+			else {
+				$this->_errorHandler->throwError($iErrorNumber, true, false);
+			}
+		}
+
+		CKFinder_Connector_Core_Hooks::run('AfterFileUpload', array(&$this->_currentFolder, &$uploadedFile, &$sFilePath));
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -44,8 +44,8 @@ 
     {
         $iErrorNumber = CKFINDER_CONNECTOR_ERROR_NONE;
 
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $oRegistry =& CKFinder_Connector_Core_Factory::getInstance("Core_Registry");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $oRegistry = & CKFinder_Connector_Core_Factory::getInstance("Core_Registry");
         $oRegistry->set("FileUpload_fileName", "unknown file");
 
         $uploadedFile = array_shift($_FILES);
@@ -86,7 +86,7 @@ 
         $oRegistry->set("FileUpload_fileName", $sFileName);
 
         $maxSize = $resourceTypeInfo->getMaxSize();
-        if (!$_config->checkSizeAfterScaling() && $maxSize && $uploadedFile['size']>$maxSize) {
+        if (!$_config->checkSizeAfterScaling() && $maxSize && $uploadedFile['size'] > $maxSize) {
             $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG);
         }
 
@@ -95,14 +95,14 @@ 
 
         if ($htmlExtensions
         && !CKFinder_Connector_Utils_Misc::inArrayCaseInsensitive($sExtension, $htmlExtensions)
-        && ($detectHtml = CKFinder_Connector_Utils_FileSystem::detectHtml($uploadedFile['tmp_name'])) === true ) {
+        && ($detectHtml = CKFinder_Connector_Utils_FileSystem::detectHtml($uploadedFile['tmp_name'])) === true) {
             $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE);
         }
 
         $sExtension = CKFinder_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
         $secureImageUploads = $_config->getSecureImageUploads();
         if ($secureImageUploads
-        && ($isImageValid = CKFinder_Connector_Utils_FileSystem::isImageValid($uploadedFile['tmp_name'], $sExtension)) === false ) {
+        && ($isImageValid = CKFinder_Connector_Utils_FileSystem::isImageValid($uploadedFile['tmp_name'], $sExtension)) === false) {
             $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_CORRUPT);
         }
 
@@ -145,8 +145,8 @@ 
 
                 $iCounter++;
                 $sFileName =
-                CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($sFileNameOrginal) .
-                "(" . $iCounter . ")" . "." .
+                CKFinder_Connector_Utils_FileSystem::getFileNameWithoutExtension($sFileNameOrginal).
+                "(".$iCounter.")".".".
                 CKFinder_Connector_Utils_FileSystem::getExtension($sFileNameOrginal);
                 $oRegistry->set("FileUpload_fileName", $sFileName);
 
@@ -179,17 +179,17 @@ 
         }
 
         //resize image if required
-        require_once CKFINDER_CONNECTOR_LIB_DIR . "/CommandHandler/Thumbnail.php";
+        require_once CKFINDER_CONNECTOR_LIB_DIR."/CommandHandler/Thumbnail.php";
         $_imagesConfig = $_config->getImagesConfig();
 
-        if ($_imagesConfig->getMaxWidth()>0 && $_imagesConfig->getMaxHeight()>0 && $_imagesConfig->getQuality()>0) {
-            CKFinder_Connector_CommandHandler_Thumbnail::createThumb($sFilePath, $sFilePath, $_imagesConfig->getMaxWidth(), $_imagesConfig->getMaxHeight(), $_imagesConfig->getQuality(), true) ;
+        if ($_imagesConfig->getMaxWidth() > 0 && $_imagesConfig->getMaxHeight() > 0 && $_imagesConfig->getQuality() > 0) {
+            CKFinder_Connector_CommandHandler_Thumbnail::createThumb($sFilePath, $sFilePath, $_imagesConfig->getMaxWidth(), $_imagesConfig->getMaxHeight(), $_imagesConfig->getQuality(), true);
         }
 
         if ($_config->checkSizeAfterScaling()) {
             //check file size after scaling, attempt to delete if too big
             clearstatcache();
-            if ($maxSize && filesize($sFilePath)>$maxSize) {
+            if ($maxSize && filesize($sFilePath) > $maxSize) {
                 @unlink($sFilePath);
                 $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG);
             }

Braces +6 added lines, -7 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -154,13 +156,11 @@ 
             } else {
                 if (false === move_uploaded_file($uploadedFile['tmp_name'], $sFilePath)) {
                     $iErrorNumber = CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED;
-                }
-                else {
+                } else {
                     if (isset($detectHtml) && $detectHtml === -1 && CKFinder_Connector_Utils_FileSystem::detectHtml($sFilePath) === true) {
                         @unlink($sFilePath);
                         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_WRONG_HTML_FILE);
-                    }
-                    else if (isset($isImageValid) && $isImageValid === -1 && CKFinder_Connector_Utils_FileSystem::isImageValid($sFilePath, $sExtension) === false) {
+                    } else if (isset($isImageValid) && $isImageValid === -1 && CKFinder_Connector_Utils_FileSystem::isImageValid($sFilePath, $sExtension) === false) {
                         @unlink($sFilePath);
                         $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_CORRUPT);
                     }
@@ -192,8 +192,7 @@ 
             if ($maxSize && filesize($sFilePath)>$maxSize) {
                 @unlink($sFilePath);
                 $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UPLOADED_TOO_BIG);
-            }
-            else {
+            } else {
                 $this->_errorHandler->throwError($iErrorNumber, true, false);
             }
         }