Piou-piou / Ruined-World

libs/ckfinder/core/connector/php/php4/Core/Factory.php

Indentation +32 added lines, -32 removed lines

@@ -27,41 +27,41 @@
  */
 class CKFinder_Connector_Core_Factory
 {
-    /**
-     * Initiate factory
-     * @static
-     */
-    function initFactory()
-    {
-        $GLOBALS['CKFinder_Connector_Factory']=array();
-    }
+	/**
+	 * Initiate factory
+	 * @static
+	 */
+	function initFactory()
+	{
+		$GLOBALS['CKFinder_Connector_Factory']=array();
+	}
 
-    /**
-     * Get instance of specified class
-     * Short and Long class names are possible
-     * <code>
-     * $obj1 =& CKFinder_Connector_Core_Factory::getInstance("Ckfinder_Connector_Core_Xml");
-     * $obj2 =& CKFinder_Connector_Core_Factory::getInstance("Core_Xml");
-     * </code>
-     *
-     * @param string $className class name
-     * @static
-     * @access public
-     * @return object
-     */
-    function &getInstance($className)
-    {
-        $namespace = "CKFinder_Connector_";
+	/**
+	 * Get instance of specified class
+	 * Short and Long class names are possible
+	 * <code>
+	 * $obj1 =& CKFinder_Connector_Core_Factory::getInstance("Ckfinder_Connector_Core_Xml");
+	 * $obj2 =& CKFinder_Connector_Core_Factory::getInstance("Core_Xml");
+	 * </code>
+	 *
+	 * @param string $className class name
+	 * @static
+	 * @access public
+	 * @return object
+	 */
+	function &getInstance($className)
+	{
+		$namespace = "CKFinder_Connector_";
 
-        $baseName = str_replace($namespace,"",$className);
+		$baseName = str_replace($namespace,"",$className);
 
-        $className = $namespace.$baseName;
+		$className = $namespace.$baseName;
 
-        if (!isset($GLOBALS['CKFinder_Connector_Factory'][$className])) {
-            require_once CKFINDER_CONNECTOR_LIB_DIR . "/" . str_replace("_","/",$baseName).".php";
-            $GLOBALS['CKFinder_Connector_Factory'][$className] =& new $className;
-        }
+		if (!isset($GLOBALS['CKFinder_Connector_Factory'][$className])) {
+			require_once CKFINDER_CONNECTOR_LIB_DIR . "/" . str_replace("_","/",$baseName).".php";
+			$GLOBALS['CKFinder_Connector_Factory'][$className] =& new $className;
+		}
 
-        return $GLOBALS['CKFinder_Connector_Factory'][$className];
-    }
+		return $GLOBALS['CKFinder_Connector_Factory'][$className];
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
      */
     function initFactory()
     {
-        $GLOBALS['CKFinder_Connector_Factory']=array();
+        $GLOBALS['CKFinder_Connector_Factory'] = array();
     }
 
     /**
@@ -53,13 +53,13 @@ 
     {
         $namespace = "CKFinder_Connector_";
 
-        $baseName = str_replace($namespace,"",$className);
+        $baseName = str_replace($namespace, "", $className);
 
         $className = $namespace.$baseName;
 
         if (!isset($GLOBALS['CKFinder_Connector_Factory'][$className])) {
-            require_once CKFINDER_CONNECTOR_LIB_DIR . "/" . str_replace("_","/",$baseName).".php";
-            $GLOBALS['CKFinder_Connector_Factory'][$className] =& new $className;
+            require_once CKFINDER_CONNECTOR_LIB_DIR."/".str_replace("_", "/", $baseName).".php";
+            $GLOBALS['CKFinder_Connector_Factory'][$className] = & new $className;
         }
 
         return $GLOBALS['CKFinder_Connector_Factory'][$className];

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/Core/Xml.php

Indentation +87 added lines, -87 removed lines

@@ -32,99 +32,99 @@
  */
 class CKFinder_Connector_Core_Xml
 {
-    /**
-     * Connector node (root)
-     *
-     * @var Ckfinder_Connector_Utils_XmlNode
-     * @access private
-     */
-    var $_connectorNode;
-    /**
-     * Error node
-     *
-     * @var Ckfinder_Connector_Utils_XmlNode
-     * @access private
-     */
-    var $_errorNode;
+	/**
+	 * Connector node (root)
+	 *
+	 * @var Ckfinder_Connector_Utils_XmlNode
+	 * @access private
+	 */
+	var $_connectorNode;
+	/**
+	 * Error node
+	 *
+	 * @var Ckfinder_Connector_Utils_XmlNode
+	 * @access private
+	 */
+	var $_errorNode;
 
-    function CKFinder_Connector_Core_Xml()
-    {
-        $this->sendXmlHeaders();
-        echo $this->getXMLDeclaration();
-        $this->_connectorNode = new Ckfinder_Connector_Utils_XmlNode("Connector");
-        $this->_errorNode = new Ckfinder_Connector_Utils_XmlNode("Error");
-        $this->_connectorNode->addChild($this->_errorNode);
-    }
+	function CKFinder_Connector_Core_Xml()
+	{
+		$this->sendXmlHeaders();
+		echo $this->getXMLDeclaration();
+		$this->_connectorNode = new Ckfinder_Connector_Utils_XmlNode("Connector");
+		$this->_errorNode = new Ckfinder_Connector_Utils_XmlNode("Error");
+		$this->_connectorNode->addChild($this->_errorNode);
+	}
 
-    /**
-     * Return connector node
-     *
-     * @access public
-     * @return Ckfinder_Connector_Utils_XmlNode
-     */
-    function &getConnectorNode()
-    {
-    	return $this->_connectorNode;
-    }
+	/**
+	 * Return connector node
+	 *
+	 * @access public
+	 * @return Ckfinder_Connector_Utils_XmlNode
+	 */
+	function &getConnectorNode()
+	{
+		return $this->_connectorNode;
+	}
 
-    /**
-     * Return error node
-     *
-     * @access public
-     * @return Ckfinder_Connector_Utils_XmlNode
-     */
-    function &getErrorNode()
-    {
-    	return $this->_errorNode;
-    }
+	/**
+	 * Return error node
+	 *
+	 * @access public
+	 * @return Ckfinder_Connector_Utils_XmlNode
+	 */
+	function &getErrorNode()
+	{
+		return $this->_errorNode;
+	}
 
-    /**
-     * Send XML headers to the browser (and force browser not to use cache)
-     * @access private
-     */
-    function sendXmlHeaders()
-    {
-        // Prevent the browser from caching the result.
-        // Date in the past
-        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT') ;
-        // always modified
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT') ;
-        // HTTP/1.1
-        header('Cache-Control: no-store, no-cache, must-revalidate') ;
-        header('Cache-Control: post-check=0, pre-check=0', false) ;
-        // HTTP/1.0
-        header('Pragma: no-cache') ;
+	/**
+	 * Send XML headers to the browser (and force browser not to use cache)
+	 * @access private
+	 */
+	function sendXmlHeaders()
+	{
+		// Prevent the browser from caching the result.
+		// Date in the past
+		header('Expires: Mon, 26 Jul 1997 05:00:00 GMT') ;
+		// always modified
+		header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT') ;
+		// HTTP/1.1
+		header('Cache-Control: no-store, no-cache, must-revalidate') ;
+		header('Cache-Control: post-check=0, pre-check=0', false) ;
+		// HTTP/1.0
+		header('Pragma: no-cache') ;
 
-        // Set the response format.
-        header( 'Content-Type:text/xml; charset=utf-8' ) ;
-    }
+		// Set the response format.
+		header( 'Content-Type:text/xml; charset=utf-8' ) ;
+	}
 
-    /**
-     * Return XML declaration
-     *
-     * @access private
-     * @return string
-     */
-    function getXMLDeclaration()
-    {
-    	return '<?xml version="1.0" encoding="utf-8"?>';
-    }
+	/**
+	 * Return XML declaration
+	 *
+	 * @access private
+	 * @return string
+	 */
+	function getXMLDeclaration()
+	{
+		return '<?xml version="1.0" encoding="utf-8"?>';
+	}
 
-    /**
-     * Send error message to the browser. If error number is set to 1, $text (custom error message) will be displayed
-     * Don't call this function directly
-     *
-     * @access public
-     * @param int $number error number
-     * @param string $text Custom error message (optional)
-     */
-    function raiseError( $number, $text = false)
-    {
-        $this->_errorNode->addAttribute("number", intval($number));
-        if (false!=$text) {
-            $this->_errorNode->addAttribute("text", $text);
-        }
+	/**
+	 * Send error message to the browser. If error number is set to 1, $text (custom error message) will be displayed
+	 * Don't call this function directly
+	 *
+	 * @access public
+	 * @param int $number error number
+	 * @param string $text Custom error message (optional)
+	 */
+	function raiseError( $number, $text = false)
+	{
+		$this->_errorNode->addAttribute("number", intval($number));
+		if (false!=$text) {
+			$this->_errorNode->addAttribute("text", $text);
+		}
 
-        echo $this->_connectorNode->asXML();
-    }
+		echo $this->_connectorNode->asXML();
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -21,7 +21,7 @@ 
 /**
  * Include basic Xml library
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Utils/XmlNode.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Utils/XmlNode.php";
 
 /**
  * XML document
@@ -86,17 +86,17 @@ 
     {
         // Prevent the browser from caching the result.
         // Date in the past
-        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT') ;
+        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
         // always modified
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT') ;
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         // HTTP/1.1
-        header('Cache-Control: no-store, no-cache, must-revalidate') ;
-        header('Cache-Control: post-check=0, pre-check=0', false) ;
+        header('Cache-Control: no-store, no-cache, must-revalidate');
+        header('Cache-Control: post-check=0, pre-check=0', false);
         // HTTP/1.0
-        header('Pragma: no-cache') ;
+        header('Pragma: no-cache');
 
         // Set the response format.
-        header( 'Content-Type:text/xml; charset=utf-8' ) ;
+        header('Content-Type:text/xml; charset=utf-8');
     }
 
     /**
@@ -118,10 +118,10 @@ 
      * @param int $number error number
      * @param string $text Custom error message (optional)
      */
-    function raiseError( $number, $text = false)
+    function raiseError($number, $text = false)
     {
         $this->_errorNode->addAttribute("number", intval($number));
-        if (false!=$text) {
+        if (false != $text) {
             $this->_errorNode->addAttribute("text", $text);
         }
 

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/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
-     */
-    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
+	 */
+	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/php4/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
-     */
-    var $_catchAllErrors = false;
-    /**
-     * Array with error numbers that should be ignored
-     *
-     * @var array[]int
-     * @access protected
-     */
-    var $_skipErrorsArray = array();
+	/**
+	 * Try/catch emulation, if set to true, error handler will not throw any error
+	 *
+	 * @var boolean
+	 * @access protected
+	 */
+	var $_catchAllErrors = false;
+	/**
+	 * Array with error numbers that should be ignored
+	 *
+	 * @var array[]int
+	 * @access protected
+	 */
+	var $_skipErrorsArray = array();
 
-    /**
-     * Set whether all errors should be ignored
-     *
-     * @param boolean $newValue
-     * @access public
-     */
-    function setCatchAllErros($newValue)
-    {
-        $this->_catchAllErrors = $newValue ? true : false;
-    }
+	/**
+	 * Set whether all errors should be ignored
+	 *
+	 * @param boolean $newValue
+	 * @access public
+	 */
+	function setCatchAllErros($newValue)
+	{
+		$this->_catchAllErrors = $newValue ? true : false;
+	}
 
-    /**
-     * Set which errors should be ignored
-     *
-     * @param array $newArray
-     */
-    function setSkipErrorsArray($newArray)
-    {
-        if (is_array($newArray)) {
-            $this->_skipErrorsArray = $newArray;
-        }
-    }
+	/**
+	 * Set which errors should be ignored
+	 *
+	 * @param array $newArray
+	 */
+	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
-     */
-    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
+	 */
+	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/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/Thumbnail.php

Indentation +287 added lines, -287 removed lines

@@ -27,296 +27,296 @@
  */
 class CKFinder_Connector_CommandHandler_Thumbnail extends CKFinder_Connector_CommandHandler_CommandHandlerBase
 {
-    /**
-     * Command name
-     *
-     * @access private
-     * @var string
-     */
-    var $command = "Thumbnail";
-
-    /**
-     * Send response
-     * @access public
-     *
-     */
-    function sendResponse()
-    {
-        if (!function_exists('ob_list_handlers') || ob_list_handlers()) {
-            @ob_end_clean();
-        }
-        header("Content-Encoding: none");
-
-        $this->checkConnector();
-        $this->checkRequest();
-
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-
-        $_thumbnails = $_config->getThumbnailsConfig();
-        if (!$_thumbnails->getIsEnabled()) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_THUMBNAILS_DISABLED);
-        }
-
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_VIEW)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
-
-        if (!isset($_GET["FileName"])) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-
-        $fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_GET["FileName"]);
-        $_resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
-
-        if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
-        $sourceFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
-
-        if ($_resourceTypeInfo->checkIsHiddenFile($fileName) || !file_exists($sourceFilePath)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
-        }
-
-        $thumbFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getThumbsServerPath(), $fileName);
-
-        // If the thumbnail file doesn't exists, create it now.
-        if (!file_exists($thumbFilePath)) {
-            if(!$this->createThumb($sourceFilePath, $thumbFilePath, $_thumbnails->getMaxWidth(), $_thumbnails->getMaxHeight(), $_thumbnails->getQuality(), true, $_thumbnails->getBmpSupported())) {
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
-            }
-        }
-
-        $size = filesize($thumbFilePath);
-        $sourceImageAttr = getimagesize($thumbFilePath);
-        $mime = $sourceImageAttr["mime"];
-
-        $rtime = isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])?strtotime($_SERVER["HTTP_IF_MODIFIED_SINCE"]):0;
-        $mtime =  filemtime($thumbFilePath);
-        $etag = dechex($mtime) . "-" . dechex($size);
-
-        $is304 = false;
-
-        if (isset($_SERVER["HTTP_IF_NONE_MATCH"]) && $_SERVER["HTTP_IF_NONE_MATCH"] === $etag) {
-            $is304 = true;
-        }
-        else if($rtime == $mtime) {
-            $is304 = true;
-        }
-
-        if ($is304) {
-            header("HTTP/1.0 304 Not Modified");
-            exit();
-        }
-
-        //header("Cache-Control: cache, must-revalidate");
-        //header("Pragma: public");
-        //header("Expires: 0");
-        header('Cache-control: public');
-        header('Etag: ' . $etag);
-        header("Content-type: " . $mime . "; name=\"" . CKFinder_Connector_Utils_Misc::mbBasename($thumbFilePath) . "\"");
-        header("Last-Modified: ".gmdate('D, d M Y H:i:s', $mtime) . " GMT");
-        //header("Content-type: application/octet-stream; name=\"{$file}\"");
-        //header("Content-Disposition: attachment; filename=\"{$file}\"");
-        header("Content-Length: ".$size);
-        readfile($thumbFilePath);
-        exit;
-    }
-
-    /**
-     * Create thumbnail
-     *
-     * @param string $sourceFile
-     * @param string $targetFile
-     * @param int $maxWidth
-     * @param int $maxHeight
-     * @param boolean $preserverAspectRatio
-     * @param boolean $bmpSupported
-     * @return boolean
-     * @static
-     * @access public
-     */
-    function createThumb($sourceFile, $targetFile, $maxWidth, $maxHeight, $quality, $preserverAspectRatio, $bmpSupported = false)
-    {
-        $sourceImageAttr = @getimagesize($sourceFile);
-        if ($sourceImageAttr === false) {
-            return false;
-        }
-        $sourceImageWidth = isset($sourceImageAttr[0]) ? $sourceImageAttr[0] : 0;
-        $sourceImageHeight = isset($sourceImageAttr[1]) ? $sourceImageAttr[1] : 0;
-        $sourceImageMime = isset($sourceImageAttr["mime"]) ? $sourceImageAttr["mime"] : "";
-        $sourceImageBits = isset($sourceImageAttr["bits"]) ? $sourceImageAttr["bits"] : 8;
-        $sourceImageChannels = isset($sourceImageAttr["channels"]) ? $sourceImageAttr["channels"] : 3;
-
-        if (!$sourceImageWidth || !$sourceImageHeight || !$sourceImageMime) {
-            return false;
-        }
-
-        $iFinalWidth = $maxWidth == 0 ? $sourceImageWidth : $maxWidth;
-        $iFinalHeight = $maxHeight == 0 ? $sourceImageHeight : $maxHeight;
-
-        if ($sourceImageWidth <= $iFinalWidth && $sourceImageHeight <= $iFinalHeight) {
-            if ($sourceFile != $targetFile) {
-                copy($sourceFile, $targetFile);
-            }
-            return true;
-        }
-
-        if ($preserverAspectRatio)
-        {
-            // Gets the best size for aspect ratio resampling
-            $oSize = CKFinder_Connector_CommandHandler_Thumbnail::GetAspectRatioSize($iFinalWidth, $iFinalHeight, $sourceImageWidth, $sourceImageHeight );
-        }
-        else {
-            $oSize = array('Width' => $iFinalWidth, 'Height' => $iFinalHeight);
-        }
-
-        CKFinder_Connector_Utils_Misc::setMemoryForImage($sourceImageWidth, $sourceImageHeight, $sourceImageBits, $sourceImageChannels);
-
-        switch ($sourceImageAttr['mime'])
-        {
-            case 'image/gif':
-                {
-                    if (@imagetypes() & IMG_GIF) {
-                        $oImage = @imagecreatefromgif($sourceFile);
-                    } else {
-                        $ermsg = 'GIF images are not supported';
-                    }
-                }
-                break;
-            case 'image/jpeg':
-                {
-                    if (@imagetypes() & IMG_JPG) {
-                        $oImage = @imagecreatefromjpeg($sourceFile) ;
-                    } else {
-                        $ermsg = 'JPEG images are not supported';
-                    }
-                }
-                break;
-            case 'image/png':
-                {
-                    if (@imagetypes() & IMG_PNG) {
-                        $oImage = @imagecreatefrompng($sourceFile) ;
-                    } else {
-                        $ermsg = 'PNG images are not supported';
-                    }
-                }
-                break;
-            case 'image/wbmp':
-                {
-                    if (@imagetypes() & IMG_WBMP) {
-                        $oImage = @imagecreatefromwbmp($sourceFile);
-                    } else {
-                        $ermsg = 'WBMP images are not supported';
-                    }
-                }
-                break;
-            case 'image/bmp':
-                {
-                    /*
+	/**
+	 * Command name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $command = "Thumbnail";
+
+	/**
+	 * Send response
+	 * @access public
+	 *
+	 */
+	function sendResponse()
+	{
+		if (!function_exists('ob_list_handlers') || ob_list_handlers()) {
+			@ob_end_clean();
+		}
+		header("Content-Encoding: none");
+
+		$this->checkConnector();
+		$this->checkRequest();
+
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+
+		$_thumbnails = $_config->getThumbnailsConfig();
+		if (!$_thumbnails->getIsEnabled()) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_THUMBNAILS_DISABLED);
+		}
+
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_VIEW)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
+
+		if (!isset($_GET["FileName"])) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
+
+		$fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_GET["FileName"]);
+		$_resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+
+		if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
+		$sourceFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
+
+		if ($_resourceTypeInfo->checkIsHiddenFile($fileName) || !file_exists($sourceFilePath)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
+		}
+
+		$thumbFilePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getThumbsServerPath(), $fileName);
+
+		// If the thumbnail file doesn't exists, create it now.
+		if (!file_exists($thumbFilePath)) {
+			if(!$this->createThumb($sourceFilePath, $thumbFilePath, $_thumbnails->getMaxWidth(), $_thumbnails->getMaxHeight(), $_thumbnails->getQuality(), true, $_thumbnails->getBmpSupported())) {
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
+			}
+		}
+
+		$size = filesize($thumbFilePath);
+		$sourceImageAttr = getimagesize($thumbFilePath);
+		$mime = $sourceImageAttr["mime"];
+
+		$rtime = isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])?strtotime($_SERVER["HTTP_IF_MODIFIED_SINCE"]):0;
+		$mtime =  filemtime($thumbFilePath);
+		$etag = dechex($mtime) . "-" . dechex($size);
+
+		$is304 = false;
+
+		if (isset($_SERVER["HTTP_IF_NONE_MATCH"]) && $_SERVER["HTTP_IF_NONE_MATCH"] === $etag) {
+			$is304 = true;
+		}
+		else if($rtime == $mtime) {
+			$is304 = true;
+		}
+
+		if ($is304) {
+			header("HTTP/1.0 304 Not Modified");
+			exit();
+		}
+
+		//header("Cache-Control: cache, must-revalidate");
+		//header("Pragma: public");
+		//header("Expires: 0");
+		header('Cache-control: public');
+		header('Etag: ' . $etag);
+		header("Content-type: " . $mime . "; name=\"" . CKFinder_Connector_Utils_Misc::mbBasename($thumbFilePath) . "\"");
+		header("Last-Modified: ".gmdate('D, d M Y H:i:s', $mtime) . " GMT");
+		//header("Content-type: application/octet-stream; name=\"{$file}\"");
+		//header("Content-Disposition: attachment; filename=\"{$file}\"");
+		header("Content-Length: ".$size);
+		readfile($thumbFilePath);
+		exit;
+	}
+
+	/**
+	 * Create thumbnail
+	 *
+	 * @param string $sourceFile
+	 * @param string $targetFile
+	 * @param int $maxWidth
+	 * @param int $maxHeight
+	 * @param boolean $preserverAspectRatio
+	 * @param boolean $bmpSupported
+	 * @return boolean
+	 * @static
+	 * @access public
+	 */
+	function createThumb($sourceFile, $targetFile, $maxWidth, $maxHeight, $quality, $preserverAspectRatio, $bmpSupported = false)
+	{
+		$sourceImageAttr = @getimagesize($sourceFile);
+		if ($sourceImageAttr === false) {
+			return false;
+		}
+		$sourceImageWidth = isset($sourceImageAttr[0]) ? $sourceImageAttr[0] : 0;
+		$sourceImageHeight = isset($sourceImageAttr[1]) ? $sourceImageAttr[1] : 0;
+		$sourceImageMime = isset($sourceImageAttr["mime"]) ? $sourceImageAttr["mime"] : "";
+		$sourceImageBits = isset($sourceImageAttr["bits"]) ? $sourceImageAttr["bits"] : 8;
+		$sourceImageChannels = isset($sourceImageAttr["channels"]) ? $sourceImageAttr["channels"] : 3;
+
+		if (!$sourceImageWidth || !$sourceImageHeight || !$sourceImageMime) {
+			return false;
+		}
+
+		$iFinalWidth = $maxWidth == 0 ? $sourceImageWidth : $maxWidth;
+		$iFinalHeight = $maxHeight == 0 ? $sourceImageHeight : $maxHeight;
+
+		if ($sourceImageWidth <= $iFinalWidth && $sourceImageHeight <= $iFinalHeight) {
+			if ($sourceFile != $targetFile) {
+				copy($sourceFile, $targetFile);
+			}
+			return true;
+		}
+
+		if ($preserverAspectRatio)
+		{
+			// Gets the best size for aspect ratio resampling
+			$oSize = CKFinder_Connector_CommandHandler_Thumbnail::GetAspectRatioSize($iFinalWidth, $iFinalHeight, $sourceImageWidth, $sourceImageHeight );
+		}
+		else {
+			$oSize = array('Width' => $iFinalWidth, 'Height' => $iFinalHeight);
+		}
+
+		CKFinder_Connector_Utils_Misc::setMemoryForImage($sourceImageWidth, $sourceImageHeight, $sourceImageBits, $sourceImageChannels);
+
+		switch ($sourceImageAttr['mime'])
+		{
+			case 'image/gif':
+				{
+					if (@imagetypes() & IMG_GIF) {
+						$oImage = @imagecreatefromgif($sourceFile);
+					} else {
+						$ermsg = 'GIF images are not supported';
+					}
+				}
+				break;
+			case 'image/jpeg':
+				{
+					if (@imagetypes() & IMG_JPG) {
+						$oImage = @imagecreatefromjpeg($sourceFile) ;
+					} else {
+						$ermsg = 'JPEG images are not supported';
+					}
+				}
+				break;
+			case 'image/png':
+				{
+					if (@imagetypes() & IMG_PNG) {
+						$oImage = @imagecreatefrompng($sourceFile) ;
+					} else {
+						$ermsg = 'PNG images are not supported';
+					}
+				}
+				break;
+			case 'image/wbmp':
+				{
+					if (@imagetypes() & IMG_WBMP) {
+						$oImage = @imagecreatefromwbmp($sourceFile);
+					} else {
+						$ermsg = 'WBMP images are not supported';
+					}
+				}
+				break;
+			case 'image/bmp':
+				{
+					/*
                     * This is sad that PHP doesn't support bitmaps.
                     * Anyway, we will use our custom function at least to display thumbnails.
                     * We'll not resize images this way (if $sourceFile === $targetFile),
                     * because user defined imagecreatefrombmp and imagecreatebmp are horribly slow
                     */
-                    if ($bmpSupported && (@imagetypes() & IMG_JPG) && $sourceFile != $targetFile) {
-                        $oImage = CKFinder_Connector_Utils_Misc::imageCreateFromBmp($sourceFile);
-                    } else {
-                        $ermsg = 'BMP/JPG images are not supported';
-                    }
-                }
-                break;
-            default:
-                $ermsg = $sourceImageAttr['mime'].' images are not supported';
-                break;
-        }
-
-        if (isset($ermsg) || false === $oImage) {
-            return false;
-        }
-
-
-        $oThumbImage = imagecreatetruecolor($oSize["Width"], $oSize["Height"]);
-        //imagecopyresampled($oThumbImage, $oImage, 0, 0, 0, 0, $oSize["Width"], $oSize["Height"], $sourceImageWidth, $sourceImageHeight);
-        CKFinder_Connector_Utils_Misc::fastImageCopyResampled($oThumbImage, $oImage, 0, 0, 0, 0, $oSize["Width"], $oSize["Height"], $sourceImageWidth, $sourceImageHeight, (int)max(floor($quality/20), 1));
-
-        switch ($sourceImageAttr['mime'])
-        {
-            case 'image/gif':
-                imagegif($oThumbImage, $targetFile);
-                break;
-            case 'image/jpeg':
-            case 'image/bmp':
-                imagejpeg($oThumbImage, $targetFile, $quality);
-                break;
-            case 'image/png':
-                imagepng($oThumbImage, $targetFile);
-                break;
-            case 'image/wbmp':
-                imagewbmp($oThumbImage, $targetFile);
-                break;
-        }
-
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        if (file_exists($targetFile) && ($perms = $_config->getChmodFiles())) {
-            $oldUmask = umask(0);
-            chmod($targetFile, $perms);
-            umask($oldUmask);
-        }
-
-        imageDestroy($oImage);
-        imageDestroy($oThumbImage);
-
-        return true;
-    }
-
-
-
-    /**
-     * Return aspect ratio size, returns associative array:
-     * <pre>
-     * Array
-     * (
-     *      [Width] => 80
-     *      [Heigth] => 120
-     * )
-     * </pre>
-     *
-     * @param int $maxWidth
-     * @param int $maxHeight
-     * @param int $actualWidth
-     * @param int $actualHeight
-     * @return array
-     * @static
-     * @access public
-     */
-    function getAspectRatioSize($maxWidth, $maxHeight, $actualWidth, $actualHeight)
-    {
-        $oSize = array("Width"=>$maxWidth, "Height"=>$maxHeight);
-
-        // Calculates the X and Y resize factors
-        $iFactorX = (float)$maxWidth / (float)$actualWidth;
-        $iFactorY = (float)$maxHeight / (float)$actualHeight;
-
-        // If some dimension have to be scaled
-        if ($iFactorX != 1 || $iFactorY != 1)
-        {
-            // Uses the lower Factor to scale the oposite size
-            if ($iFactorX < $iFactorY) {
-                $oSize["Height"] = (int)round($actualHeight * $iFactorX);
-            }
-            else if ($iFactorX > $iFactorY) {
-                $oSize["Width"] = (int)round($actualWidth * $iFactorY);
-            }
-        }
-
-        if ($oSize["Height"] <= 0) {
-            $oSize["Height"] = 1;
-        }
-        if ($oSize["Width"] <= 0) {
-            $oSize["Width"] = 1;
-        }
-
-        // Returns the Size
-        return $oSize;
-    }
+					if ($bmpSupported && (@imagetypes() & IMG_JPG) && $sourceFile != $targetFile) {
+						$oImage = CKFinder_Connector_Utils_Misc::imageCreateFromBmp($sourceFile);
+					} else {
+						$ermsg = 'BMP/JPG images are not supported';
+					}
+				}
+				break;
+			default:
+				$ermsg = $sourceImageAttr['mime'].' images are not supported';
+				break;
+		}
+
+		if (isset($ermsg) || false === $oImage) {
+			return false;
+		}
+
+
+		$oThumbImage = imagecreatetruecolor($oSize["Width"], $oSize["Height"]);
+		//imagecopyresampled($oThumbImage, $oImage, 0, 0, 0, 0, $oSize["Width"], $oSize["Height"], $sourceImageWidth, $sourceImageHeight);
+		CKFinder_Connector_Utils_Misc::fastImageCopyResampled($oThumbImage, $oImage, 0, 0, 0, 0, $oSize["Width"], $oSize["Height"], $sourceImageWidth, $sourceImageHeight, (int)max(floor($quality/20), 1));
+
+		switch ($sourceImageAttr['mime'])
+		{
+			case 'image/gif':
+				imagegif($oThumbImage, $targetFile);
+				break;
+			case 'image/jpeg':
+			case 'image/bmp':
+				imagejpeg($oThumbImage, $targetFile, $quality);
+				break;
+			case 'image/png':
+				imagepng($oThumbImage, $targetFile);
+				break;
+			case 'image/wbmp':
+				imagewbmp($oThumbImage, $targetFile);
+				break;
+		}
+
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		if (file_exists($targetFile) && ($perms = $_config->getChmodFiles())) {
+			$oldUmask = umask(0);
+			chmod($targetFile, $perms);
+			umask($oldUmask);
+		}
+
+		imageDestroy($oImage);
+		imageDestroy($oThumbImage);
+
+		return true;
+	}
+
+
+
+	/**
+	 * Return aspect ratio size, returns associative array:
+	 * <pre>
+	 * Array
+	 * (
+	 *      [Width] => 80
+	 *      [Heigth] => 120
+	 * )
+	 * </pre>
+	 *
+	 * @param int $maxWidth
+	 * @param int $maxHeight
+	 * @param int $actualWidth
+	 * @param int $actualHeight
+	 * @return array
+	 * @static
+	 * @access public
+	 */
+	function getAspectRatioSize($maxWidth, $maxHeight, $actualWidth, $actualHeight)
+	{
+		$oSize = array("Width"=>$maxWidth, "Height"=>$maxHeight);
+
+		// Calculates the X and Y resize factors
+		$iFactorX = (float)$maxWidth / (float)$actualWidth;
+		$iFactorY = (float)$maxHeight / (float)$actualHeight;
+
+		// If some dimension have to be scaled
+		if ($iFactorX != 1 || $iFactorY != 1)
+		{
+			// Uses the lower Factor to scale the oposite size
+			if ($iFactorX < $iFactorY) {
+				$oSize["Height"] = (int)round($actualHeight * $iFactorX);
+			}
+			else if ($iFactorX > $iFactorY) {
+				$oSize["Width"] = (int)round($actualWidth * $iFactorY);
+			}
+		}
+
+		if ($oSize["Height"] <= 0) {
+			$oSize["Height"] = 1;
+		}
+		if ($oSize["Width"] <= 0) {
+			$oSize["Width"] = 1;
+		}
+
+		// Returns the Size
+		return $oSize;
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -50,7 +50,7 @@ 
         $this->checkConnector();
         $this->checkRequest();
 
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
 
         $_thumbnails = $_config->getThumbnailsConfig();
         if (!$_thumbnails->getIsEnabled()) {
@@ -81,7 +81,7 @@ 
 
         // If the thumbnail file doesn't exists, create it now.
         if (!file_exists($thumbFilePath)) {
-            if(!$this->createThumb($sourceFilePath, $thumbFilePath, $_thumbnails->getMaxWidth(), $_thumbnails->getMaxHeight(), $_thumbnails->getQuality(), true, $_thumbnails->getBmpSupported())) {
+            if (!$this->createThumb($sourceFilePath, $thumbFilePath, $_thumbnails->getMaxWidth(), $_thumbnails->getMaxHeight(), $_thumbnails->getQuality(), true, $_thumbnails->getBmpSupported())) {
                 $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_ACCESS_DENIED);
             }
         }
@@ -90,16 +90,16 @@ 
         $sourceImageAttr = getimagesize($thumbFilePath);
         $mime = $sourceImageAttr["mime"];
 
-        $rtime = isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])?strtotime($_SERVER["HTTP_IF_MODIFIED_SINCE"]):0;
-        $mtime =  filemtime($thumbFilePath);
-        $etag = dechex($mtime) . "-" . dechex($size);
+        $rtime = isset($_SERVER["HTTP_IF_MODIFIED_SINCE"]) ? strtotime($_SERVER["HTTP_IF_MODIFIED_SINCE"]) : 0;
+        $mtime = filemtime($thumbFilePath);
+        $etag = dechex($mtime)."-".dechex($size);
 
         $is304 = false;
 
         if (isset($_SERVER["HTTP_IF_NONE_MATCH"]) && $_SERVER["HTTP_IF_NONE_MATCH"] === $etag) {
             $is304 = true;
         }
-        else if($rtime == $mtime) {
+        else if ($rtime == $mtime) {
             $is304 = true;
         }
 
@@ -112,9 +112,9 @@ 
         //header("Pragma: public");
         //header("Expires: 0");
         header('Cache-control: public');
-        header('Etag: ' . $etag);
-        header("Content-type: " . $mime . "; name=\"" . CKFinder_Connector_Utils_Misc::mbBasename($thumbFilePath) . "\"");
-        header("Last-Modified: ".gmdate('D, d M Y H:i:s', $mtime) . " GMT");
+        header('Etag: '.$etag);
+        header("Content-type: ".$mime."; name=\"".CKFinder_Connector_Utils_Misc::mbBasename($thumbFilePath)."\"");
+        header("Last-Modified: ".gmdate('D, d M Y H:i:s', $mtime)." GMT");
         //header("Content-type: application/octet-stream; name=\"{$file}\"");
         //header("Content-Disposition: attachment; filename=\"{$file}\"");
         header("Content-Length: ".$size);
@@ -164,7 +164,7 @@ 
         if ($preserverAspectRatio)
         {
             // Gets the best size for aspect ratio resampling
-            $oSize = CKFinder_Connector_CommandHandler_Thumbnail::GetAspectRatioSize($iFinalWidth, $iFinalHeight, $sourceImageWidth, $sourceImageHeight );
+            $oSize = CKFinder_Connector_CommandHandler_Thumbnail::GetAspectRatioSize($iFinalWidth, $iFinalHeight, $sourceImageWidth, $sourceImageHeight);
         }
         else {
             $oSize = array('Width' => $iFinalWidth, 'Height' => $iFinalHeight);
@@ -186,7 +186,7 @@ 
             case 'image/jpeg':
                 {
                     if (@imagetypes() & IMG_JPG) {
-                        $oImage = @imagecreatefromjpeg($sourceFile) ;
+                        $oImage = @imagecreatefromjpeg($sourceFile);
                     } else {
                         $ermsg = 'JPEG images are not supported';
                     }
@@ -195,7 +195,7 @@ 
             case 'image/png':
                 {
                     if (@imagetypes() & IMG_PNG) {
-                        $oImage = @imagecreatefrompng($sourceFile) ;
+                        $oImage = @imagecreatefrompng($sourceFile);
                     } else {
                         $ermsg = 'PNG images are not supported';
                     }
@@ -237,7 +237,7 @@ 
 
         $oThumbImage = imagecreatetruecolor($oSize["Width"], $oSize["Height"]);
         //imagecopyresampled($oThumbImage, $oImage, 0, 0, 0, 0, $oSize["Width"], $oSize["Height"], $sourceImageWidth, $sourceImageHeight);
-        CKFinder_Connector_Utils_Misc::fastImageCopyResampled($oThumbImage, $oImage, 0, 0, 0, 0, $oSize["Width"], $oSize["Height"], $sourceImageWidth, $sourceImageHeight, (int)max(floor($quality/20), 1));
+        CKFinder_Connector_Utils_Misc::fastImageCopyResampled($oThumbImage, $oImage, 0, 0, 0, 0, $oSize["Width"], $oSize["Height"], $sourceImageWidth, $sourceImageHeight, (int)max(floor($quality / 20), 1));
 
         switch ($sourceImageAttr['mime'])
         {
@@ -256,7 +256,7 @@ 
                 break;
         }
 
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         if (file_exists($targetFile) && ($perms = $_config->getChmodFiles())) {
             $oldUmask = umask(0);
             chmod($targetFile, $perms);

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
@@ -98,8 +100,7 @@ 
 
         if (isset($_SERVER["HTTP_IF_NONE_MATCH"]) && $_SERVER["HTTP_IF_NONE_MATCH"] === $etag) {
             $is304 = true;
-        }
-        else if($rtime == $mtime) {
+        } else if($rtime == $mtime) {
             $is304 = true;
         }
 
@@ -165,8 +166,7 @@ 
         {
             // Gets the best size for aspect ratio resampling
             $oSize = CKFinder_Connector_CommandHandler_Thumbnail::GetAspectRatioSize($iFinalWidth, $iFinalHeight, $sourceImageWidth, $sourceImageHeight );
-        }
-        else {
+        } else {
             $oSize = array('Width' => $iFinalWidth, 'Height' => $iFinalHeight);
         }
 
@@ -303,8 +303,7 @@ 
             // Uses the lower Factor to scale the oposite size
             if ($iFactorX < $iFactorY) {
                 $oSize["Height"] = (int)round($actualHeight * $iFactorX);
-            }
-            else if ($iFactorX > $iFactorY) {
+            } else if ($iFactorX > $iFactorY) {
                 $oSize["Width"] = (int)round($actualWidth * $iFactorY);
             }
         }

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 DeleteFolder 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/FileUpload.php

Indentation +173 added lines, -173 removed lines

@@ -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);
             }
         }

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

Indentation +85 added lines, -85 removed lines

@@ -29,100 +29,100 @@
  */
 class CKFinder_Connector_CommandHandler_CommandHandlerBase
 {
-    /**
-     * CKFinder_Connector_Core_Connector object
-     *
-     * @access protected
-     * @var CKFinder_Connector_Core_Connector
-     */
-    var $_connector;
-    /**
-     * CKFinder_Connector_Core_FolderHandler object
-     *
-     * @access protected
-     * @var CKFinder_Connector_Core_FolderHandler
-     */
-    var $_currentFolder;
-    /**
-     * Error handler object
-     *
-     * @access protected
-     * @var CKFinder_Connector_ErrorHandler_Base|CKFinder_Connector_ErrorHandler_FileUpload|CKFinder_Connector_ErrorHandler_Http
-     */
-    var $_errorHandler;
+	/**
+	 * CKFinder_Connector_Core_Connector object
+	 *
+	 * @access protected
+	 * @var CKFinder_Connector_Core_Connector
+	 */
+	var $_connector;
+	/**
+	 * CKFinder_Connector_Core_FolderHandler object
+	 *
+	 * @access protected
+	 * @var CKFinder_Connector_Core_FolderHandler
+	 */
+	var $_currentFolder;
+	/**
+	 * Error handler object
+	 *
+	 * @access protected
+	 * @var CKFinder_Connector_ErrorHandler_Base|CKFinder_Connector_ErrorHandler_FileUpload|CKFinder_Connector_ErrorHandler_Http
+	 */
+	var $_errorHandler;
 
-    function CKFinder_Connector_CommandHandler_CommandHandlerBase()
-    {
-        $this->_currentFolder =& CKFinder_Connector_Core_Factory::getInstance("Core_FolderHandler");
-        $this->_connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
-        $this->_errorHandler =& $this->_connector->getErrorHandler();
-    }
+	function CKFinder_Connector_CommandHandler_CommandHandlerBase()
+	{
+		$this->_currentFolder =& CKFinder_Connector_Core_Factory::getInstance("Core_FolderHandler");
+		$this->_connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
+		$this->_errorHandler =& $this->_connector->getErrorHandler();
+	}
 
-    /**
-     * Get Folder Handler
-     *
-     * @return CKFinder_Connector_Core_FolderHandler
-     * @access public
-     */
-    function getFolderHandler()
-    {
-        if (is_null($this->_currentFolder)) {
-            $this->_currentFolder =& CKFinder_Connector_Core_Factory::getInstance("Core_FolderHandler");
-        }
+	/**
+	 * Get Folder Handler
+	 *
+	 * @return CKFinder_Connector_Core_FolderHandler
+	 * @access public
+	 */
+	function getFolderHandler()
+	{
+		if (is_null($this->_currentFolder)) {
+			$this->_currentFolder =& CKFinder_Connector_Core_Factory::getInstance("Core_FolderHandler");
+		}
 
-        return $this->_currentFolder;
-    }
+		return $this->_currentFolder;
+	}
 
-    /**
-     * Check whether Connector is enabled
-     * @access protected
-     *
-     */
-    function checkConnector()
-    {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        if (!$_config->getIsEnabled()) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CONNECTOR_DISABLED);
-        }
-    }
+	/**
+	 * Check whether Connector is enabled
+	 * @access protected
+	 *
+	 */
+	function checkConnector()
+	{
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		if (!$_config->getIsEnabled()) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CONNECTOR_DISABLED);
+		}
+	}
 
-    /**
-     * Check request
-     * @access protected
-     *
-     */
-    function checkRequest()
-    {
-        if (preg_match(CKFINDER_REGEX_INVALID_PATH, $this->_currentFolder->getClientPath())) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
-        }
+	/**
+	 * Check request
+	 * @access protected
+	 *
+	 */
+	function checkRequest()
+	{
+		if (preg_match(CKFINDER_REGEX_INVALID_PATH, $this->_currentFolder->getClientPath())) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_NAME);
+		}
 
-        $_resourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
+		$_resourceTypeConfig = $this->_currentFolder->getResourceTypeConfig();
 
-        if (is_null($_resourceTypeConfig)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_TYPE);
-        }
+		if (is_null($_resourceTypeConfig)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_TYPE);
+		}
 
 
-        $_clientPath = $this->_currentFolder->getClientPath();
-        $_clientPathParts = explode("/", trim($_clientPath, "/"));
-        if ($_clientPathParts) {
-            foreach ($_clientPathParts as $_part) {
-                if ($_resourceTypeConfig->checkIsHiddenFolder($_part)) {
-                    $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-                }
-            }
-        }
+		$_clientPath = $this->_currentFolder->getClientPath();
+		$_clientPathParts = explode("/", trim($_clientPath, "/"));
+		if ($_clientPathParts) {
+			foreach ($_clientPathParts as $_part) {
+				if ($_resourceTypeConfig->checkIsHiddenFolder($_part)) {
+					$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+				}
+			}
+		}
 
-        if (!is_dir($this->_currentFolder->getServerPath())) {
-            if ($_clientPath == "/") {
-                if (!CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($this->_currentFolder->getServerPath())) {
+		if (!is_dir($this->_currentFolder->getServerPath())) {
+			if ($_clientPath == "/") {
+				if (!CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($this->_currentFolder->getServerPath())) {
 
-                }
-            }
-            else {
-                $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
-            }
-        }
-    }
+				}
+			}
+			else {
+				$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
+			}
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -53,9 +53,9 @@ 
 
     function CKFinder_Connector_CommandHandler_CommandHandlerBase()
     {
-        $this->_currentFolder =& CKFinder_Connector_Core_Factory::getInstance("Core_FolderHandler");
-        $this->_connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
-        $this->_errorHandler =& $this->_connector->getErrorHandler();
+        $this->_currentFolder = & CKFinder_Connector_Core_Factory::getInstance("Core_FolderHandler");
+        $this->_connector = & CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
+        $this->_errorHandler = & $this->_connector->getErrorHandler();
     }
 
     /**
@@ -67,7 +67,7 @@ 
     function getFolderHandler()
     {
         if (is_null($this->_currentFolder)) {
-            $this->_currentFolder =& CKFinder_Connector_Core_Factory::getInstance("Core_FolderHandler");
+            $this->_currentFolder = & CKFinder_Connector_Core_Factory::getInstance("Core_FolderHandler");
         }
 
         return $this->_currentFolder;
@@ -80,7 +80,7 @@ 
      */
     function checkConnector()
     {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         if (!$_config->getIsEnabled()) {
             $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CONNECTOR_DISABLED);
         }

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
@@ -119,8 +121,7 @@ 
                 if (!CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($this->_currentFolder->getServerPath())) {
 
                 }
-            }
-            else {
+            } else {
                 $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FOLDER_NOT_FOUND);
             }
         }