Piou-piou / ribs-framework

libs/ckfinder/core/connector/php/php5/CommandHandler/DownloadFile.php

Indentation +50 added lines, -50 removed lines

@@ -27,63 +27,63 @@
  */
 class CKFinder_Connector_CommandHandler_DownloadFile extends CKFinder_Connector_CommandHandler_CommandHandlerBase
 {
-    /**
-     * Command name
-     *
-     * @access private
-     * @var string
-     */
-    private $command = "DownloadFile";
+	/**
+	 * Command name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	private $command = "DownloadFile";
 
-    /**
-     * send response (file)
-     * @access public
-     *
-     */
-    public function sendResponse()
-    {
-        if (!function_exists('ob_list_handlers') || ob_list_handlers()) {
-            @ob_end_clean();
-        }
-        header("Content-Encoding: none");
+	/**
+	 * send response (file)
+	 * @access public
+	 *
+	 */
+	public function sendResponse()
+	{
+		if (!function_exists('ob_list_handlers') || ob_list_handlers()) {
+			@ob_end_clean();
+		}
+		header("Content-Encoding: none");
 
-        $this->checkConnector();
-        $this->checkRequest();
+		$this->checkConnector();
+		$this->checkRequest();
 
-        if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_VIEW)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
-        }
+		if (!$this->_currentFolder->checkAcl(CKFINDER_CONNECTOR_ACL_FILE_VIEW)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_UNAUTHORIZED);
+		}
 
-        $fileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding($_GET["FileName"]);
-        $_resourceTypeInfo = $this->_currentFolder->getResourceTypeConfig();
+		$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);
-        }
+		if (!CKFinder_Connector_Utils_FileSystem::checkFileName($fileName)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        if (!$_resourceTypeInfo->checkExtension($fileName, false)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
-        }
+		if (!$_resourceTypeInfo->checkExtension($fileName, false)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_REQUEST);
+		}
 
-        $filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
-        if ($_resourceTypeInfo->checkIsHiddenFile($fileName) || !file_exists($filePath) || !is_file($filePath)) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
-        }
+		$filePath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_currentFolder->getServerPath(), $fileName);
+		if ($_resourceTypeInfo->checkIsHiddenFile($fileName) || !file_exists($filePath) || !is_file($filePath)) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_FILE_NOT_FOUND);
+		}
 
-        $fileName = CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($fileName);
+		$fileName = CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($fileName);
 
-        header("Cache-Control: cache, must-revalidate");
-        header("Pragma: public");
-        header("Expires: 0");
-        if (!empty($_GET['format']) && $_GET['format'] == 'text') {
-            header("Content-Type: text/plain; charset=utf-8");
-        }
-        else {
-            header("Content-type: application/octet-stream; name=\"" . $fileName . "\"");
-            header("Content-Disposition: attachment; filename=\"" . str_replace("\"", "\\\"", $fileName). "\"");
-        }
-        header("Content-Length: " . filesize($filePath));
-        CKFinder_Connector_Utils_FileSystem::readfileChunked($filePath);
-        exit;
-    }
+		header("Cache-Control: cache, must-revalidate");
+		header("Pragma: public");
+		header("Expires: 0");
+		if (!empty($_GET['format']) && $_GET['format'] == 'text') {
+			header("Content-Type: text/plain; charset=utf-8");
+		}
+		else {
+			header("Content-type: application/octet-stream; name=\"" . $fileName . "\"");
+			header("Content-Disposition: attachment; filename=\"" . str_replace("\"", "\\\"", $fileName). "\"");
+		}
+		header("Content-Length: " . filesize($filePath));
+		CKFinder_Connector_Utils_FileSystem::readfileChunked($filePath);
+		exit;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -79,10 +79,10 @@
             header("Content-Type: text/plain; charset=utf-8");
         }
         else {
-            header("Content-type: application/octet-stream; name=\"" . $fileName . "\"");
-            header("Content-Disposition: attachment; filename=\"" . str_replace("\"", "\\\"", $fileName). "\"");
+            header("Content-type: application/octet-stream; name=\"".$fileName."\"");
+            header("Content-Disposition: attachment; filename=\"".str_replace("\"", "\\\"", $fileName)."\"");
         }
-        header("Content-Length: " . filesize($filePath));
+        header("Content-Length: ".filesize($filePath));
         CKFinder_Connector_Utils_FileSystem::readfileChunked($filePath);
         exit;
     }

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/CommandHandler/Init.php

Indentation +112 added lines, -112 removed lines

@@ -32,116 +32,116 @@
  */
 class CKFinder_Connector_CommandHandler_Init extends CKFinder_Connector_CommandHandler_XmlCommandHandlerBase
 {
-    /**
-     * Command name
-     *
-     * @access private
-     * @var string
-     */
-    private $command = "Init";
-
-    protected function mustCheckRequest()
-    {
-        return false;
-    }
-
-    /**
-     * Must add CurrentFolder node?
-     *
-     * @return boolean
-     * @access protected
-     */
-    protected function mustAddCurrentFolderNode()
-    {
-        return false;
-    }
-
-    /**
-     * handle request and build XML
-     * @access protected
-     *
-     */
-    protected function buildXml()
-    {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-
-        // Create the "ConnectorInfo" node.
-        $_oConnInfo = new Ckfinder_Connector_Utils_XmlNode("ConnectorInfo");
-        $this->_connectorNode->addChild($_oConnInfo);
-        $_oConnInfo->addAttribute("enabled", $_config->getIsEnabled() ? "true" : "false");
-
-        if (!$_config->getIsEnabled()) {
-            $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CONNECTOR_DISABLED);
-        }
-
-        $_ln = '' ;
-        $_lc = $_config->getLicenseKey() . '                                  ' ;
-        if ( 1 == ( strpos( CKFINDER_CHARS, $_lc[0] ) % 5 ) )
-        $_ln = $_config->getLicenseName() ;
-
-        $_oConnInfo->addAttribute("s", $_ln);
-        $_oConnInfo->addAttribute("c", trim( $_lc[11] . $_lc[0] . $_lc [8] . $_lc[12] . $_lc[26] . $_lc[2] . $_lc[3] . $_lc[25] . $_lc[1] ));
-        $_thumbnailsConfig = $_config->getThumbnailsConfig();
-        $_thumbnailsEnabled = $_thumbnailsConfig->getIsEnabled() ;
-        $_oConnInfo->addAttribute("thumbsEnabled", $_thumbnailsEnabled ? "true" : "false");
-        if ($_thumbnailsEnabled) {
-            $_oConnInfo->addAttribute("thumbsUrl", $_thumbnailsConfig->getUrl());
-            $_oConnInfo->addAttribute("thumbsDirectAccess", $_thumbnailsConfig->getDirectAccess() ? "true" : "false" );
-        }
-        $_imagesConfig = $_config->getImagesConfig();
-        $_oConnInfo->addAttribute("imgWidth", $_imagesConfig->getMaxWidth());
-        $_oConnInfo->addAttribute("imgHeight", $_imagesConfig->getMaxHeight());
-
-        // Create the "ResourceTypes" node.
-        $_oResourceTypes = new Ckfinder_Connector_Utils_XmlNode("ResourceTypes");
-        $this->_connectorNode->addChild($_oResourceTypes);
-        // Create the "PluginsInfo" node.
-        $_oPluginsInfo = new Ckfinder_Connector_Utils_XmlNode("PluginsInfo");
-        $this->_connectorNode->addChild($_oPluginsInfo);
-
-        // Load the resource types in an array.
-        $_aTypes = $_config->getDefaultResourceTypes();
-
-        if (!sizeof($_aTypes)) {
-            $_aTypes = $_config->getResourceTypeNames();
-        }
-
-        $_aTypesSize = sizeof($_aTypes);
-        if ($_aTypesSize) {
-            for ($i = 0; $i < $_aTypesSize; $i++)
-            {
-                $_resourceTypeName = $_aTypes[$i];
-
-                $_acl = $_config->getAccessControlConfig();
-                $_aclMask = $_acl->getComputedMask($_resourceTypeName, "/");
-
-                if ( ($_aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) != CKFINDER_CONNECTOR_ACL_FOLDER_VIEW ) {
-                    continue;
-                }
-
-                if (!isset($_GET['type']) || $_GET['type'] === $_resourceTypeName) {
-                    //print $_resourceTypeName;
-                    $_oTypeInfo = $_config->getResourceTypeConfig($_resourceTypeName);
-                    //print_r($_oTypeInfo);
-                    $_oResourceType[$i] = new Ckfinder_Connector_Utils_XmlNode("ResourceType");
-                    $_oResourceTypes->addChild($_oResourceType[$i]);
-
-                    $_oResourceType[$i]->addAttribute("name", $_resourceTypeName);
-                    $_oResourceType[$i]->addAttribute("url", $_oTypeInfo->getUrl());
-                    $_oResourceType[$i]->addAttribute("allowedExtensions", implode(",", $_oTypeInfo->getAllowedExtensions()));
-                    $_oResourceType[$i]->addAttribute("deniedExtensions", implode(",", $_oTypeInfo->getDeniedExtensions()));
-                    $_oResourceType[$i]->addAttribute("hash", substr(md5($_oTypeInfo->getDirectory()), 0, 16));
-                    $_oResourceType[$i]->addAttribute("hasChildren", CKFinder_Connector_Utils_FileSystem::hasChildren($_oTypeInfo->getDirectory()) ? "true" : "false");
-                    $_oResourceType[$i]->addAttribute("acl", $_aclMask);
-                }
-            }
-        }
-
-        $config = $GLOBALS['config'];
-        if (!empty($config['Plugins']) && is_array($config['Plugins']) ) {
-            $_oConnInfo->addAttribute("plugins", implode(",", $config['Plugins']));
-        }
-
-        CKFinder_Connector_Core_Hooks::run('InitCommand', array(&$this->_connectorNode));
-    }
+	/**
+	 * Command name
+	 *
+	 * @access private
+	 * @var string
+	 */
+	private $command = "Init";
+
+	protected function mustCheckRequest()
+	{
+		return false;
+	}
+
+	/**
+	 * Must add CurrentFolder node?
+	 *
+	 * @return boolean
+	 * @access protected
+	 */
+	protected function mustAddCurrentFolderNode()
+	{
+		return false;
+	}
+
+	/**
+	 * handle request and build XML
+	 * @access protected
+	 *
+	 */
+	protected function buildXml()
+	{
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+
+		// Create the "ConnectorInfo" node.
+		$_oConnInfo = new Ckfinder_Connector_Utils_XmlNode("ConnectorInfo");
+		$this->_connectorNode->addChild($_oConnInfo);
+		$_oConnInfo->addAttribute("enabled", $_config->getIsEnabled() ? "true" : "false");
+
+		if (!$_config->getIsEnabled()) {
+			$this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CONNECTOR_DISABLED);
+		}
+
+		$_ln = '' ;
+		$_lc = $_config->getLicenseKey() . '                                  ' ;
+		if ( 1 == ( strpos( CKFINDER_CHARS, $_lc[0] ) % 5 ) )
+		$_ln = $_config->getLicenseName() ;
+
+		$_oConnInfo->addAttribute("s", $_ln);
+		$_oConnInfo->addAttribute("c", trim( $_lc[11] . $_lc[0] . $_lc [8] . $_lc[12] . $_lc[26] . $_lc[2] . $_lc[3] . $_lc[25] . $_lc[1] ));
+		$_thumbnailsConfig = $_config->getThumbnailsConfig();
+		$_thumbnailsEnabled = $_thumbnailsConfig->getIsEnabled() ;
+		$_oConnInfo->addAttribute("thumbsEnabled", $_thumbnailsEnabled ? "true" : "false");
+		if ($_thumbnailsEnabled) {
+			$_oConnInfo->addAttribute("thumbsUrl", $_thumbnailsConfig->getUrl());
+			$_oConnInfo->addAttribute("thumbsDirectAccess", $_thumbnailsConfig->getDirectAccess() ? "true" : "false" );
+		}
+		$_imagesConfig = $_config->getImagesConfig();
+		$_oConnInfo->addAttribute("imgWidth", $_imagesConfig->getMaxWidth());
+		$_oConnInfo->addAttribute("imgHeight", $_imagesConfig->getMaxHeight());
+
+		// Create the "ResourceTypes" node.
+		$_oResourceTypes = new Ckfinder_Connector_Utils_XmlNode("ResourceTypes");
+		$this->_connectorNode->addChild($_oResourceTypes);
+		// Create the "PluginsInfo" node.
+		$_oPluginsInfo = new Ckfinder_Connector_Utils_XmlNode("PluginsInfo");
+		$this->_connectorNode->addChild($_oPluginsInfo);
+
+		// Load the resource types in an array.
+		$_aTypes = $_config->getDefaultResourceTypes();
+
+		if (!sizeof($_aTypes)) {
+			$_aTypes = $_config->getResourceTypeNames();
+		}
+
+		$_aTypesSize = sizeof($_aTypes);
+		if ($_aTypesSize) {
+			for ($i = 0; $i < $_aTypesSize; $i++)
+			{
+				$_resourceTypeName = $_aTypes[$i];
+
+				$_acl = $_config->getAccessControlConfig();
+				$_aclMask = $_acl->getComputedMask($_resourceTypeName, "/");
+
+				if ( ($_aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) != CKFINDER_CONNECTOR_ACL_FOLDER_VIEW ) {
+					continue;
+				}
+
+				if (!isset($_GET['type']) || $_GET['type'] === $_resourceTypeName) {
+					//print $_resourceTypeName;
+					$_oTypeInfo = $_config->getResourceTypeConfig($_resourceTypeName);
+					//print_r($_oTypeInfo);
+					$_oResourceType[$i] = new Ckfinder_Connector_Utils_XmlNode("ResourceType");
+					$_oResourceTypes->addChild($_oResourceType[$i]);
+
+					$_oResourceType[$i]->addAttribute("name", $_resourceTypeName);
+					$_oResourceType[$i]->addAttribute("url", $_oTypeInfo->getUrl());
+					$_oResourceType[$i]->addAttribute("allowedExtensions", implode(",", $_oTypeInfo->getAllowedExtensions()));
+					$_oResourceType[$i]->addAttribute("deniedExtensions", implode(",", $_oTypeInfo->getDeniedExtensions()));
+					$_oResourceType[$i]->addAttribute("hash", substr(md5($_oTypeInfo->getDirectory()), 0, 16));
+					$_oResourceType[$i]->addAttribute("hasChildren", CKFinder_Connector_Utils_FileSystem::hasChildren($_oTypeInfo->getDirectory()) ? "true" : "false");
+					$_oResourceType[$i]->addAttribute("acl", $_aclMask);
+				}
+			}
+		}
+
+		$config = $GLOBALS['config'];
+		if (!empty($config['Plugins']) && is_array($config['Plugins']) ) {
+			$_oConnInfo->addAttribute("plugins", implode(",", $config['Plugins']));
+		}
+
+		CKFinder_Connector_Core_Hooks::run('InitCommand', array(&$this->_connectorNode));
+	}
 }

Spacing +11 added lines, -11 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 Init command
@@ -63,7 +63,7 @@ 
      */
     function buildXml()
     {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
 
         // Create the "ConnectorInfo" node.
         $_oConnInfo = new Ckfinder_Connector_Utils_XmlNode("ConnectorInfo");
@@ -74,19 +74,19 @@ 
             $this->_errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CONNECTOR_DISABLED);
         }
 
-        $_ln = '' ;
-        $_lc = $_config->getLicenseKey() . '                                  ' ;
-        if ( 1 == ( strpos( CKFINDER_CHARS, $_lc[0] ) % 5 ) )
-        $_ln = $_config->getLicenseName() ;
+        $_ln = '';
+        $_lc = $_config->getLicenseKey().'                                  ';
+        if (1 == (strpos(CKFINDER_CHARS, $_lc[0]) % 5))
+        $_ln = $_config->getLicenseName();
 
         $_oConnInfo->addAttribute("s", $_ln);
-        $_oConnInfo->addAttribute("c", trim( $_lc[11] . $_lc[0] . $_lc [8] . $_lc[12] . $_lc[26] . $_lc[2] . $_lc[3] . $_lc[25] . $_lc[1] ));
+        $_oConnInfo->addAttribute("c", trim($_lc[11].$_lc[0].$_lc [8].$_lc[12].$_lc[26].$_lc[2].$_lc[3].$_lc[25].$_lc[1]));
         $_thumbnailsConfig = $_config->getThumbnailsConfig();
-        $_thumbnailsEnabled = $_thumbnailsConfig->getIsEnabled() ;
+        $_thumbnailsEnabled = $_thumbnailsConfig->getIsEnabled();
         $_oConnInfo->addAttribute("thumbsEnabled", $_thumbnailsEnabled ? "true" : "false");
         if ($_thumbnailsEnabled) {
             $_oConnInfo->addAttribute("thumbsUrl", $_thumbnailsConfig->getUrl());
-            $_oConnInfo->addAttribute("thumbsDirectAccess", $_thumbnailsConfig->getDirectAccess() ? "true" : "false" );
+            $_oConnInfo->addAttribute("thumbsDirectAccess", $_thumbnailsConfig->getDirectAccess() ? "true" : "false");
         }
         $_imagesConfig = $_config->getImagesConfig();
         $_oConnInfo->addAttribute("imgWidth", $_imagesConfig->getMaxWidth());
@@ -115,7 +115,7 @@ 
                 $_acl = $_config->getAccessControlConfig();
                 $_aclMask = $_acl->getComputedMask($_resourceTypeName, "/");
 
-                if ( ($_aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) != CKFINDER_CONNECTOR_ACL_FOLDER_VIEW ) {
+                if (($_aclMask & CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) != CKFINDER_CONNECTOR_ACL_FOLDER_VIEW) {
                     continue;
                 }
 
@@ -138,7 +138,7 @@ 
         }
 
         $config = $GLOBALS['config'];
-        if (!empty($config['Plugins']) && is_array($config['Plugins']) ) {
+        if (!empty($config['Plugins']) && is_array($config['Plugins'])) {
             $_oConnInfo->addAttribute("plugins", implode(",", $config['Plugins']));
         }
 

Braces +6 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
@@ -76,8 +78,9 @@ 
 
         $_ln = '' ;
         $_lc = $_config->getLicenseKey() . '                                  ' ;
-        if ( 1 == ( strpos( CKFINDER_CHARS, $_lc[0] ) % 5 ) )
-        $_ln = $_config->getLicenseName() ;
+        if ( 1 == ( strpos( CKFINDER_CHARS, $_lc[0] ) % 5 ) ) {
+                $_ln = $_config->getLicenseName() ;
+        }
 
         $_oConnInfo->addAttribute("s", $_ln);
         $_oConnInfo->addAttribute("c", trim( $_lc[11] . $_lc[0] . $_lc [8] . $_lc[12] . $_lc[26] . $_lc[2] . $_lc[3] . $_lc[25] . $_lc[1] ));

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

Indentation +32 added lines, -32 removed lines

@@ -27,42 +27,42 @@
  */
 class CKFinder_Connector_Core_Factory
 {
-    static $instances = array();
+	static $instances = array();
 
-    /**
-     * Initiate factory
-     * @static
-     */
-    static function initFactory()
-    {
-    }
+	/**
+	 * Initiate factory
+	 * @static
+	 */
+	static function initFactory()
+	{
+	}
 
-    /**
-     * 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
-     */
-    public static 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
+	 */
+	public static function &getInstance($className)
+	{
+		$namespace = "CKFinder_Connector_";
 
-        $baseName = str_replace($namespace,"",$className);
+		$baseName = str_replace($namespace,"",$className);
 
-        $className = $namespace.$baseName;
+		$className = $namespace.$baseName;
 
-        if (!isset(CKFinder_Connector_Core_Factory::$instances[$className])) {
-            require_once CKFINDER_CONNECTOR_LIB_DIR . "/" . str_replace("_","/",$baseName).".php";
-            CKFinder_Connector_Core_Factory::$instances[$className] = new $className;
-        }
+		if (!isset(CKFinder_Connector_Core_Factory::$instances[$className])) {
+			require_once CKFINDER_CONNECTOR_LIB_DIR . "/" . str_replace("_","/",$baseName).".php";
+			CKFinder_Connector_Core_Factory::$instances[$className] = new $className;
+		}
 
-        return CKFinder_Connector_Core_Factory::$instances[$className];
-    }
+		return CKFinder_Connector_Core_Factory::$instances[$className];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -54,12 +54,12 @@
     {
         $namespace = "CKFinder_Connector_";
 
-        $baseName = str_replace($namespace,"",$className);
+        $baseName = str_replace($namespace, "", $className);
 
         $className = $namespace.$baseName;
 
         if (!isset(CKFinder_Connector_Core_Factory::$instances[$className])) {
-            require_once CKFINDER_CONNECTOR_LIB_DIR . "/" . str_replace("_","/",$baseName).".php";
+            require_once CKFINDER_CONNECTOR_LIB_DIR."/".str_replace("_", "/", $baseName).".php";
             CKFinder_Connector_Core_Factory::$instances[$className] = new $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/php5/Core/FolderHandler.php

Indentation +210 added lines, -210 removed lines

@@ -30,239 +30,239 @@
  */
 class CKFinder_Connector_Core_FolderHandler
 {
-    /**
-     * CKFinder_Connector_Core_ResourceTypeConfig object
-     *
-     * @var CKFinder_Connector_Core_ResourceTypeConfig
-     * @access private
-     */
-    private $_resourceTypeConfig;
-    /**
-     * ResourceType name
-     *
-     * @var string
-     * @access private
-     */
-    private $_resourceTypeName = "";
-    /**
-     * Client path
-     *
-     * @var string
-     * @access private
-     */
-    private $_clientPath = "/";
-    /**
-     * Url
-     *
-     * @var string
-     * @access private
-     */
-    private $_url;
-    /**
-     * Server path
-     *
-     * @var string
-     * @access private
-     */
-    private $_serverPath;
-    /**
-     * Thumbnails server path
-     *
-     * @var string
-     * @access private
-     */
-    private $_thumbsServerPath;
-    /**
-     * ACL mask
-     *
-     * @var int
-     * @access private
-     */
-    private $_aclMask;
-    /**
-     * Folder info
-     *
-     * @var mixed
-     * @access private
-     */
-    private $_folderInfo;
-    /**
-     * Thumbnails folder info
-     *
-     * @var mized
-     * @access private
-     */
-    private $_thumbsFolderInfo;
+	/**
+	 * CKFinder_Connector_Core_ResourceTypeConfig object
+	 *
+	 * @var CKFinder_Connector_Core_ResourceTypeConfig
+	 * @access private
+	 */
+	private $_resourceTypeConfig;
+	/**
+	 * ResourceType name
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_resourceTypeName = "";
+	/**
+	 * Client path
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_clientPath = "/";
+	/**
+	 * Url
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_url;
+	/**
+	 * Server path
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_serverPath;
+	/**
+	 * Thumbnails server path
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_thumbsServerPath;
+	/**
+	 * ACL mask
+	 *
+	 * @var int
+	 * @access private
+	 */
+	private $_aclMask;
+	/**
+	 * Folder info
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	private $_folderInfo;
+	/**
+	 * Thumbnails folder info
+	 *
+	 * @var mized
+	 * @access private
+	 */
+	private $_thumbsFolderInfo;
 
-    function __construct()
-    {
-        if (isset($_GET["type"])) {
-            $this->_resourceTypeName = (string)$_GET["type"];
-        }
+	function __construct()
+	{
+		if (isset($_GET["type"])) {
+			$this->_resourceTypeName = (string)$_GET["type"];
+		}
 
-        if (isset($_GET["currentFolder"])) {
-            $this->_clientPath = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding((string)$_GET["currentFolder"]);
-        }
+		if (isset($_GET["currentFolder"])) {
+			$this->_clientPath = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding((string)$_GET["currentFolder"]);
+		}
 
-        if (!strlen($this->_clientPath)) {
-            $this->_clientPath = "/";
-        }
-        else {
-            if (substr($this->_clientPath, -1, 1) != "/") {
-                $this->_clientPath .= "/";
-            }
-            if (substr($this->_clientPath, 0, 1) != "/") {
-                $this->_clientPath = "/" . $this->_clientPath;
-            }
-        }
+		if (!strlen($this->_clientPath)) {
+			$this->_clientPath = "/";
+		}
+		else {
+			if (substr($this->_clientPath, -1, 1) != "/") {
+				$this->_clientPath .= "/";
+			}
+			if (substr($this->_clientPath, 0, 1) != "/") {
+				$this->_clientPath = "/" . $this->_clientPath;
+			}
+		}
 
-        $this->_aclMask = -1;
-    }
+		$this->_aclMask = -1;
+	}
 
-    /**
-     * Get resource type config
-     *
-     * @return CKFinder_Connector_Core_ResourceTypeConfig
-     * @access public
-     */
-    public function &getResourceTypeConfig()
-    {
-        if (!isset($this->_resourceTypeConfig)) {
-            $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-            $this->_resourceTypeConfig = $_config->getResourceTypeConfig($this->_resourceTypeName);
-        }
+	/**
+	 * Get resource type config
+	 *
+	 * @return CKFinder_Connector_Core_ResourceTypeConfig
+	 * @access public
+	 */
+	public function &getResourceTypeConfig()
+	{
+		if (!isset($this->_resourceTypeConfig)) {
+			$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+			$this->_resourceTypeConfig = $_config->getResourceTypeConfig($this->_resourceTypeName);
+		}
 
-        if (is_null($this->_resourceTypeConfig)) {
-            $connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
-            $oErrorHandler =& $connector->getErrorHandler();
-            $oErrorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_TYPE);
-        }
+		if (is_null($this->_resourceTypeConfig)) {
+			$connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
+			$oErrorHandler =& $connector->getErrorHandler();
+			$oErrorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_TYPE);
+		}
 
-        return $this->_resourceTypeConfig;
-    }
+		return $this->_resourceTypeConfig;
+	}
 
-    /**
-     * Get resource type name
-     *
-     * @return string
-     * @access public
-     */
-    public function getResourceTypeName()
-    {
-        return $this->_resourceTypeName;
-    }
+	/**
+	 * Get resource type name
+	 *
+	 * @return string
+	 * @access public
+	 */
+	public function getResourceTypeName()
+	{
+		return $this->_resourceTypeName;
+	}
 
-    /**
-     * Get Client path
-     *
-     * @return string
-     * @access public
-     */
-    public function getClientPath()
-    {
-        return $this->_clientPath;
-    }
+	/**
+	 * Get Client path
+	 *
+	 * @return string
+	 * @access public
+	 */
+	public function getClientPath()
+	{
+		return $this->_clientPath;
+	}
 
-    /**
-     * Get Url
-     *
-     * @return string
-     * @access public
-     */
-    public function getUrl()
-    {
-        if (is_null($this->_url)) {
-            $this->_resourceTypeConfig = $this->getResourceTypeConfig();
-            if (is_null($this->_resourceTypeConfig)) {
-                $connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
-                $oErrorHandler =& $connector->getErrorHandler();
-                $oErrorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_TYPE);
-                $this->_url = "";
-            }
-            else {
-                $this->_url = $this->_resourceTypeConfig->getUrl() . ltrim($this->getClientPath(), "/");
-            }
-        }
+	/**
+	 * Get Url
+	 *
+	 * @return string
+	 * @access public
+	 */
+	public function getUrl()
+	{
+		if (is_null($this->_url)) {
+			$this->_resourceTypeConfig = $this->getResourceTypeConfig();
+			if (is_null($this->_resourceTypeConfig)) {
+				$connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
+				$oErrorHandler =& $connector->getErrorHandler();
+				$oErrorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_TYPE);
+				$this->_url = "";
+			}
+			else {
+				$this->_url = $this->_resourceTypeConfig->getUrl() . ltrim($this->getClientPath(), "/");
+			}
+		}
 
-        return $this->_url;
-    }
+		return $this->_url;
+	}
 
-    /**
-     * Get server path
-     *
-     * @return string
-     * @access public
-     */
-    public function getServerPath()
-    {
-        if (is_null($this->_serverPath)) {
-            $this->_resourceTypeConfig = $this->getResourceTypeConfig();
-            $this->_serverPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_resourceTypeConfig->getDirectory(), ltrim($this->_clientPath, "/"));
-        }
+	/**
+	 * Get server path
+	 *
+	 * @return string
+	 * @access public
+	 */
+	public function getServerPath()
+	{
+		if (is_null($this->_serverPath)) {
+			$this->_resourceTypeConfig = $this->getResourceTypeConfig();
+			$this->_serverPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_resourceTypeConfig->getDirectory(), ltrim($this->_clientPath, "/"));
+		}
 
-        return $this->_serverPath;
-    }
+		return $this->_serverPath;
+	}
 
-    /**
-     * Get server path to thumbnails directory
-     *
-     * @access public
-     * @return string
-     */
-    public function getThumbsServerPath()
-    {
-        if (is_null($this->_thumbsServerPath)) {
-            $this->_resourceTypeConfig = $this->getResourceTypeConfig();
+	/**
+	 * Get server path to thumbnails directory
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function getThumbsServerPath()
+	{
+		if (is_null($this->_thumbsServerPath)) {
+			$this->_resourceTypeConfig = $this->getResourceTypeConfig();
 
-            $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-            $_thumbnailsConfig = $_config->getThumbnailsConfig();
+			$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+			$_thumbnailsConfig = $_config->getThumbnailsConfig();
 
-            // Get the resource type directory.
-            $this->_thumbsServerPath = CKFinder_Connector_Utils_FileSystem::combinePaths($_thumbnailsConfig->getDirectory(), $this->_resourceTypeConfig->getName());
+			// Get the resource type directory.
+			$this->_thumbsServerPath = CKFinder_Connector_Utils_FileSystem::combinePaths($_thumbnailsConfig->getDirectory(), $this->_resourceTypeConfig->getName());
 
-            // Return the resource type directory combined with the required path.
-            $this->_thumbsServerPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_thumbsServerPath, ltrim($this->_clientPath, '/'));
+			// Return the resource type directory combined with the required path.
+			$this->_thumbsServerPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_thumbsServerPath, ltrim($this->_clientPath, '/'));
 
-            if (!is_dir($this->_thumbsServerPath)) {
-                if(!CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($this->_thumbsServerPath)) {
+			if (!is_dir($this->_thumbsServerPath)) {
+				if(!CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($this->_thumbsServerPath)) {
 
-                }
-            }
-        }
+				}
+			}
+		}
 
-        return $this->_thumbsServerPath;
-    }
+		return $this->_thumbsServerPath;
+	}
 
-    /**
-     * Get ACL Mask
-     *
-     * @return int
-     * @access public
-     */
-    public function getAclMask()
-    {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $_aclConfig = $_config->getAccessControlConfig();
+	/**
+	 * Get ACL Mask
+	 *
+	 * @return int
+	 * @access public
+	 */
+	public function getAclMask()
+	{
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$_aclConfig = $_config->getAccessControlConfig();
 
-        if ($this->_aclMask == -1) {
-            $this->_aclMask = $_aclConfig->getComputedMask($this->_resourceTypeName, $this->_clientPath);
-        }
+		if ($this->_aclMask == -1) {
+			$this->_aclMask = $_aclConfig->getComputedMask($this->_resourceTypeName, $this->_clientPath);
+		}
 
-        return $this->_aclMask;
-    }
+		return $this->_aclMask;
+	}
 
-    /**
-     * Check ACL
-     *
-     * @access public
-     * @param int $aclToCkeck
-     * @return boolean
-     */
-    public function checkAcl($aclToCkeck)
-    {
-        $aclToCkeck = intval($aclToCkeck);
+	/**
+	 * Check ACL
+	 *
+	 * @access public
+	 * @param int $aclToCkeck
+	 * @return boolean
+	 */
+	public function checkAcl($aclToCkeck)
+	{
+		$aclToCkeck = intval($aclToCkeck);
 
-        $maska = $this->getAclMask();
-        return (($maska & $aclToCkeck) == $aclToCkeck);
-    }
+		$maska = $this->getAclMask();
+		return (($maska & $aclToCkeck) == $aclToCkeck);
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -21,7 +21,7 @@ 
 /**
  * Include file system utils class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Utils/FileSystem.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Utils/FileSystem.php";
 
 /**
  * @package CKFinder
@@ -112,7 +112,7 @@ 
                 $this->_clientPath .= "/";
             }
             if (substr($this->_clientPath, 0, 1) != "/") {
-                $this->_clientPath = "/" . $this->_clientPath;
+                $this->_clientPath = "/".$this->_clientPath;
             }
         }
 
@@ -128,13 +128,13 @@ 
     function &getResourceTypeConfig()
     {
         if (!isset($this->_resourceTypeConfig)) {
-            $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+            $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
             $this->_resourceTypeConfig = $_config->getResourceTypeConfig($this->_resourceTypeName);
         }
 
         if (is_null($this->_resourceTypeConfig)) {
-            $connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
-            $oErrorHandler =& $connector->getErrorHandler();
+            $connector = & CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
+            $oErrorHandler = & $connector->getErrorHandler();
             $oErrorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_TYPE);
         }
 
@@ -174,13 +174,13 @@ 
         if (is_null($this->_url)) {
             $this->_resourceTypeConfig = $this->getResourceTypeConfig();
             if (is_null($this->_resourceTypeConfig)) {
-                $connector =& CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
-                $oErrorHandler =& $connector->getErrorHandler();
+                $connector = & CKFinder_Connector_Core_Factory::getInstance("Core_Connector");
+                $oErrorHandler = & $connector->getErrorHandler();
                 $oErrorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_TYPE);
                 $this->_url = "";
             }
             else {
-                $this->_url = $this->_resourceTypeConfig->getUrl() . ltrim($this->getClientPath(), "/");
+                $this->_url = $this->_resourceTypeConfig->getUrl().ltrim($this->getClientPath(), "/");
             }
         }
 
@@ -214,7 +214,7 @@ 
         if (is_null($this->_thumbsServerPath)) {
             $this->_resourceTypeConfig = $this->getResourceTypeConfig();
 
-            $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+            $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
             $_thumbnailsConfig = $_config->getThumbnailsConfig();
 
             // Get the resource type directory.
@@ -224,7 +224,7 @@ 
             $this->_thumbsServerPath = CKFinder_Connector_Utils_FileSystem::combinePaths($this->_thumbsServerPath, ltrim($this->_clientPath, '/'));
 
             if (!is_dir($this->_thumbsServerPath)) {
-                if(!CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($this->_thumbsServerPath)) {
+                if (!CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively($this->_thumbsServerPath)) {
 
                 }
             }
@@ -241,7 +241,7 @@ 
      */
     function getAclMask()
     {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         $_aclConfig = $_config->getAccessControlConfig();
 
         if ($this->_aclMask == -1) {

Braces +5 added lines, -5 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -106,8 +108,7 @@ 
 
         if (!strlen($this->_clientPath)) {
             $this->_clientPath = "/";
-        }
-        else {
+        } else {
             if (substr($this->_clientPath, -1, 1) != "/") {
                 $this->_clientPath .= "/";
             }
@@ -178,8 +179,7 @@ 
                 $oErrorHandler =& $connector->getErrorHandler();
                 $oErrorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_TYPE);
                 $this->_url = "";
-            }
-            else {
+            } else {
                 $this->_url = $this->_resourceTypeConfig->getUrl() . ltrim($this->getClientPath(), "/");
             }
         }

libs/ckfinder/core/connector/php/php5/Core/ThumbnailsConfig.php

Indentation +163 added lines, -163 removed lines

@@ -28,193 +28,193 @@
 class CKFinder_Connector_Core_ThumbnailsConfig
 {
 
-    /**
-     * Url to thumbnails directory
-     *
-     * @var string
-     * @access private
-     */
-    private $_url = "";
-    /**
+	/**
+	 * Url to thumbnails directory
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_url = "";
+	/**
 	 * Directory where thumbnails are stored
 	 *
 	 * @var string
 	 * @access private
 	 */
-    private $_directory = "";
-    /**
+	private $_directory = "";
+	/**
 	 * Are thumbnails enabled
 	 *
 	 * @var boolean
 	 * @access private
 	 */
-    private $_isEnabled = false;
-    /**
+	private $_isEnabled = false;
+	/**
 	 * Direct access to thumbnails?
 	 *
 	 * @var boolean
 	 * @access private
 	 */
-    private $_directAccess = false;
-    /**
-     * Max width for thumbnails
-     *
-     * @var int
-     * @access private
-     */
-    private $_maxWidth = 100;
-    /**
-     * Max height for thumbnails
-     *
-     * @var int
-     * @access private
-     */
-    private $_maxHeight = 100;
-    /**
-     * Quality of thumbnails
-     *
-     * @var int
-     * @access private
-     */
-    private $_quality = 100;
-    /**
-     * Are thumbnails of bitmap files enabled?
-     *
-     * @var boolean
-     * @access private
-     */
-    private $_bmpSupported = false;
+	private $_directAccess = false;
+	/**
+	 * Max width for thumbnails
+	 *
+	 * @var int
+	 * @access private
+	 */
+	private $_maxWidth = 100;
+	/**
+	 * Max height for thumbnails
+	 *
+	 * @var int
+	 * @access private
+	 */
+	private $_maxHeight = 100;
+	/**
+	 * Quality of thumbnails
+	 *
+	 * @var int
+	 * @access private
+	 */
+	private $_quality = 100;
+	/**
+	 * Are thumbnails of bitmap files enabled?
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	private $_bmpSupported = false;
 
-    function __construct($thumbnailsNode)
-    {
-        if(extension_loaded('gd') && isset($thumbnailsNode['enabled'])) {
-            $this->_isEnabled = CKFinder_Connector_Utils_Misc::booleanValue($thumbnailsNode['enabled']);
-        }
-        if( isset($thumbnailsNode['directAccess'])) {
-            $this->_directAccess = CKFinder_Connector_Utils_Misc::booleanValue($thumbnailsNode['directAccess']);
-        }
-        if( isset($thumbnailsNode['bmpSupported'])) {
-            $this->_bmpSupported = CKFinder_Connector_Utils_Misc::booleanValue($thumbnailsNode['bmpSupported']);
-        }
-        if(isset($thumbnailsNode['maxWidth'])) {
-            $_maxWidth = intval($thumbnailsNode['maxWidth']);
-            if($_maxWidth>=0) {
-                $this->_maxWidth = $_maxWidth;
-            }
-        }
-        if(isset($thumbnailsNode['maxHeight'])) {
-            $_maxHeight = intval($thumbnailsNode['maxHeight']);
-            if($_maxHeight>=0) {
-                $this->_maxHeight = $_maxHeight;
-            }
-        }
-        if(isset($thumbnailsNode['quality'])) {
-            $_quality = intval($thumbnailsNode['quality']);
-            if($_quality>0 && $_quality<=100) {
-                $this->_quality = $_quality;
-            }
-        }
+	function __construct($thumbnailsNode)
+	{
+		if(extension_loaded('gd') && isset($thumbnailsNode['enabled'])) {
+			$this->_isEnabled = CKFinder_Connector_Utils_Misc::booleanValue($thumbnailsNode['enabled']);
+		}
+		if( isset($thumbnailsNode['directAccess'])) {
+			$this->_directAccess = CKFinder_Connector_Utils_Misc::booleanValue($thumbnailsNode['directAccess']);
+		}
+		if( isset($thumbnailsNode['bmpSupported'])) {
+			$this->_bmpSupported = CKFinder_Connector_Utils_Misc::booleanValue($thumbnailsNode['bmpSupported']);
+		}
+		if(isset($thumbnailsNode['maxWidth'])) {
+			$_maxWidth = intval($thumbnailsNode['maxWidth']);
+			if($_maxWidth>=0) {
+				$this->_maxWidth = $_maxWidth;
+			}
+		}
+		if(isset($thumbnailsNode['maxHeight'])) {
+			$_maxHeight = intval($thumbnailsNode['maxHeight']);
+			if($_maxHeight>=0) {
+				$this->_maxHeight = $_maxHeight;
+			}
+		}
+		if(isset($thumbnailsNode['quality'])) {
+			$_quality = intval($thumbnailsNode['quality']);
+			if($_quality>0 && $_quality<=100) {
+				$this->_quality = $_quality;
+			}
+		}
 
-        if(isset($thumbnailsNode['url'])) {
-            $this->_url = $thumbnailsNode['url'];
-        }
-        if (!strlen($this->_url)) {
-            $this->_url = "/";
-        }
-        else if(substr($this->_url,-1,1) != "/") {
-            $this->_url .= "/";
-        }
+		if(isset($thumbnailsNode['url'])) {
+			$this->_url = $thumbnailsNode['url'];
+		}
+		if (!strlen($this->_url)) {
+			$this->_url = "/";
+		}
+		else if(substr($this->_url,-1,1) != "/") {
+			$this->_url .= "/";
+		}
 
-        if(isset($thumbnailsNode['directory'])) {
-            $this->_directory = $thumbnailsNode['directory'];
-        }
-    }
+		if(isset($thumbnailsNode['directory'])) {
+			$this->_directory = $thumbnailsNode['directory'];
+		}
+	}
 
-    /**
-     * Get URL
-     *
-     * @access public
-     * @return string
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
+	/**
+	 * Get URL
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function getUrl()
+	{
+		return $this->_url;
+	}
 
-    /**
-     * Get directory
-     *
-     * @access public
-     * @return string
-     */
-    public function getDirectory()
-    {
-        return $this->_directory;
-    }
+	/**
+	 * Get directory
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function getDirectory()
+	{
+		return $this->_directory;
+	}
 
-    /**
-     * Get is enabled setting
-     *
-     * @access public
-     * @return boolean
-     */
-    public function getIsEnabled()
-    {
-        return $this->_isEnabled;
-    }
+	/**
+	 * Get is enabled setting
+	 *
+	 * @access public
+	 * @return boolean
+	 */
+	public function getIsEnabled()
+	{
+		return $this->_isEnabled;
+	}
 
-    /**
-     * Get is enabled setting
-     *
-     * @access public
-     * @return boolean
-     */
-    public function getBmpSupported()
-    {
-        return $this->_bmpSupported;
-    }
+	/**
+	 * Get is enabled setting
+	 *
+	 * @access public
+	 * @return boolean
+	 */
+	public function getBmpSupported()
+	{
+		return $this->_bmpSupported;
+	}
 
-    /**
-     * Is direct access to thumbnails allowed?
-     *
-     * @access public
-     * @return boolean
-     */
-    public function getDirectAccess()
-    {
-        return $this->_directAccess;
-    }
+	/**
+	 * Is direct access to thumbnails allowed?
+	 *
+	 * @access public
+	 * @return boolean
+	 */
+	public function getDirectAccess()
+	{
+		return $this->_directAccess;
+	}
 
-    /**
-     * Get maximum width of a thumbnail
-     *
-     * @access public
-     * @return int
-     */
-    public function getMaxWidth()
-    {
-        return $this->_maxWidth;
-    }
+	/**
+	 * Get maximum width of a thumbnail
+	 *
+	 * @access public
+	 * @return int
+	 */
+	public function getMaxWidth()
+	{
+		return $this->_maxWidth;
+	}
 
-    /**
-     * Get maximum height of a thumbnail
-     *
-     * @access public
-     * @return int
-     */
-    public function getMaxHeight()
-    {
-        return $this->_maxHeight;
-    }
+	/**
+	 * Get maximum height of a thumbnail
+	 *
+	 * @access public
+	 * @return int
+	 */
+	public function getMaxHeight()
+	{
+		return $this->_maxHeight;
+	}
 
-    /**
-     * Get quality of a thumbnail (1-100)
-     *
-     * @access public
-     * @return int
-     */
-    public function getQuality()
-    {
-        return $this->_quality;
-    }
+	/**
+	 * Get quality of a thumbnail (1-100)
+	 *
+	 * @access public
+	 * @return int
+	 */
+	public function getQuality()
+	{
+		return $this->_quality;
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -87,45 +87,45 @@
 
     function CKFinder_Connector_Core_ThumbnailsConfig($thumbnailsNode)
     {
-        if(extension_loaded('gd') && isset($thumbnailsNode['enabled'])) {
+        if (extension_loaded('gd') && isset($thumbnailsNode['enabled'])) {
             $this->_isEnabled = CKFinder_Connector_Utils_Misc::booleanValue($thumbnailsNode['enabled']);
         }
-        if( isset($thumbnailsNode['directAccess'])) {
+        if (isset($thumbnailsNode['directAccess'])) {
             $this->_directAccess = CKFinder_Connector_Utils_Misc::booleanValue($thumbnailsNode['directAccess']);
         }
-        if( isset($thumbnailsNode['bmpSupported'])) {
+        if (isset($thumbnailsNode['bmpSupported'])) {
             $this->_bmpSupported = CKFinder_Connector_Utils_Misc::booleanValue($thumbnailsNode['bmpSupported']);
         }
-        if(isset($thumbnailsNode['maxWidth'])) {
+        if (isset($thumbnailsNode['maxWidth'])) {
             $_maxWidth = intval($thumbnailsNode['maxWidth']);
-            if($_maxWidth>=0) {
+            if ($_maxWidth >= 0) {
                 $this->_maxWidth = $_maxWidth;
             }
         }
-        if(isset($thumbnailsNode['maxHeight'])) {
+        if (isset($thumbnailsNode['maxHeight'])) {
             $_maxHeight = intval($thumbnailsNode['maxHeight']);
-            if($_maxHeight>=0) {
+            if ($_maxHeight >= 0) {
                 $this->_maxHeight = $_maxHeight;
             }
         }
-        if(isset($thumbnailsNode['quality'])) {
+        if (isset($thumbnailsNode['quality'])) {
             $_quality = intval($thumbnailsNode['quality']);
-            if($_quality>0 && $_quality<=100) {
+            if ($_quality > 0 && $_quality <= 100) {
                 $this->_quality = $_quality;
             }
         }
 
-        if(isset($thumbnailsNode['url'])) {
+        if (isset($thumbnailsNode['url'])) {
             $this->_url = $thumbnailsNode['url'];
         }
         if (!strlen($this->_url)) {
             $this->_url = "/";
         }
-        else if(substr($this->_url,-1,1) != "/") {
+        else if (substr($this->_url, -1, 1) != "/") {
             $this->_url .= "/";
         }
 
-        if(isset($thumbnailsNode['directory'])) {
+        if (isset($thumbnailsNode['directory'])) {
             $this->_directory = $thumbnailsNode['directory'];
         }
     }

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
@@ -120,8 +122,7 @@ 
         }
         if (!strlen($this->_url)) {
             $this->_url = "/";
-        }
-        else if(substr($this->_url,-1,1) != "/") {
+        } else if(substr($this->_url,-1,1) != "/") {
             $this->_url .= "/";
         }
 

libs/ckfinder/core/connector/php/php5/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
-     */
-    private $_connectorNode;
-    /**
-     * Error node
-     *
-     * @var Ckfinder_Connector_Utils_XmlNode
-     * @access private
-     */
-    private $_errorNode;
+	/**
+	 * Connector node (root)
+	 *
+	 * @var Ckfinder_Connector_Utils_XmlNode
+	 * @access private
+	 */
+	private $_connectorNode;
+	/**
+	 * Error node
+	 *
+	 * @var Ckfinder_Connector_Utils_XmlNode
+	 * @access private
+	 */
+	private $_errorNode;
 
-    function __construct()
-    {
-        $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 __construct()
+	{
+		$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
-     *
-     * @return Ckfinder_Connector_Utils_XmlNode
-     * @access public
-     */
-    public function &getConnectorNode()
-    {
-    	return $this->_connectorNode;
-    }
+	/**
+	 * Return connector node
+	 *
+	 * @return Ckfinder_Connector_Utils_XmlNode
+	 * @access public
+	 */
+	public function &getConnectorNode()
+	{
+		return $this->_connectorNode;
+	}
 
-    /**
-     * Return error node
-     *
-     * @return Ckfinder_Connector_Utils_XmlNode
-     * @access public
-     */
-    public function &getErrorNode()
-    {
-    	return $this->_errorNode;
-    }
+	/**
+	 * Return error node
+	 *
+	 * @return Ckfinder_Connector_Utils_XmlNode
+	 * @access public
+	 */
+	public function &getErrorNode()
+	{
+		return $this->_errorNode;
+	}
 
-    /**
-     * Send XML headers to the browser (and force browser not to use cache)
-     * @access private
-     */
-    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
+	 */
+	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
-     */
-    private function getXMLDeclaration()
-    {
-    	return '<?xml version="1.0" encoding="utf-8"?>';
-    }
+	/**
+	 * Return XML declaration
+	 *
+	 * @access private
+	 * @return string
+	 */
+	private 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)
-     */
-    public 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)
+	 */
+	public 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)
      */
-    public function raiseError( $number, $text = false)
+    public 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/php5/Core/Connector.php

Indentation +81 added lines, -81 removed lines

@@ -27,94 +27,94 @@
  */
 class CKFinder_Connector_Core_Connector
 {
-    /**
-     * Registry
-     *
-     * @var CKFinder_Connector_Core_Registry
-     * @access private
-     */
-    private $_registry;
+	/**
+	 * Registry
+	 *
+	 * @var CKFinder_Connector_Core_Registry
+	 * @access private
+	 */
+	private $_registry;
 
-    function __construct()
-    {
-        $this->_registry =& CKFinder_Connector_Core_Factory::getInstance("Core_Registry");
-        $this->_registry->set("errorHandler", "ErrorHandler_Base");
-    }
+	function __construct()
+	{
+		$this->_registry =& CKFinder_Connector_Core_Factory::getInstance("Core_Registry");
+		$this->_registry->set("errorHandler", "ErrorHandler_Base");
+	}
 
-    /**
-     * Generic handler for invalid commands
-     * @access public
-     *
-     */
-    public function handleInvalidCommand()
-    {
-        $oErrorHandler =& $this->getErrorHandler();
-        $oErrorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_COMMAND);
-    }
+	/**
+	 * Generic handler for invalid commands
+	 * @access public
+	 *
+	 */
+	public function handleInvalidCommand()
+	{
+		$oErrorHandler =& $this->getErrorHandler();
+		$oErrorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_COMMAND);
+	}
 
-    /**
-     * Execute command
-     *
-     * @param string $command
-     * @access public
-     */
-    public function executeCommand($command)
-    {
-        if (!CKFinder_Connector_Core_Hooks::run('BeforeExecuteCommand', array(&$command))) {
-            return;
-        }
+	/**
+	 * Execute command
+	 *
+	 * @param string $command
+	 * @access public
+	 */
+	public function executeCommand($command)
+	{
+		if (!CKFinder_Connector_Core_Hooks::run('BeforeExecuteCommand', array(&$command))) {
+			return;
+		}
 
-        switch ($command)
-        {
-            case 'FileUpload':
-            $this->_registry->set("errorHandler", "ErrorHandler_FileUpload");
-            $obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
-            $obj->sendResponse();
-            break;
+		switch ($command)
+		{
+			case 'FileUpload':
+			$this->_registry->set("errorHandler", "ErrorHandler_FileUpload");
+			$obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+			$obj->sendResponse();
+			break;
 
-            case 'QuickUpload':
-            $this->_registry->set("errorHandler", "ErrorHandler_QuickUpload");
-            $obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
-            $obj->sendResponse();
-            break;
+			case 'QuickUpload':
+			$this->_registry->set("errorHandler", "ErrorHandler_QuickUpload");
+			$obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+			$obj->sendResponse();
+			break;
 
-            case 'DownloadFile':
-            case 'Thumbnail':
-            $this->_registry->set("errorHandler", "ErrorHandler_Http");
-            $obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
-            $obj->sendResponse();
-            break;
+			case 'DownloadFile':
+			case 'Thumbnail':
+			$this->_registry->set("errorHandler", "ErrorHandler_Http");
+			$obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+			$obj->sendResponse();
+			break;
 
-            case 'CopyFiles':
-            case 'CreateFolder':
-            case 'DeleteFile':
-            case 'DeleteFolder':
-            case 'GetFiles':
-            case 'GetFolders':
-            case 'Init':
-            case 'MoveFiles':
-            case 'RenameFile':
-            case 'RenameFolder':
-            $obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
-            $obj->sendResponse();
-            break;
+			case 'CopyFiles':
+			case 'CreateFolder':
+			case 'DeleteFile':
+			case 'DeleteFolder':
+			case 'GetFiles':
+			case 'GetFolders':
+			case 'Init':
+			case 'MoveFiles':
+			case 'RenameFile':
+			case 'RenameFolder':
+			$obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+			$obj->sendResponse();
+			break;
 
-            default:
-            $this->handleInvalidCommand();
-            break;
-        }
-    }
+			default:
+			$this->handleInvalidCommand();
+			break;
+		}
+	}
 
-    /**
-     * Get error handler
-     *
-     * @access public
-     * @return CKFinder_Connector_ErrorHandler_Base|CKFinder_Connector_ErrorHandler_FileUpload|CKFinder_Connector_ErrorHandler_Http
-     */
-    public function &getErrorHandler()
-    {
-        $_errorHandler = $this->_registry->get("errorHandler");
-        $oErrorHandler =& CKFinder_Connector_Core_Factory::getInstance($_errorHandler);
-        return $oErrorHandler;
-    }
+	/**
+	 * Get error handler
+	 *
+	 * @access public
+	 * @return CKFinder_Connector_ErrorHandler_Base|CKFinder_Connector_ErrorHandler_FileUpload|CKFinder_Connector_ErrorHandler_Http
+	 */
+	public function &getErrorHandler()
+	{
+		$_errorHandler = $this->_registry->get("errorHandler");
+		$oErrorHandler =& CKFinder_Connector_Core_Factory::getInstance($_errorHandler);
+		return $oErrorHandler;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 
     function CKFinder_Connector_Core_Connector()
     {
-        $this->_registry =& CKFinder_Connector_Core_Factory::getInstance("Core_Registry");
+        $this->_registry = & CKFinder_Connector_Core_Factory::getInstance("Core_Registry");
         $this->_registry->set("errorHandler", "ErrorHandler_Base");
     }
 
@@ -48,7 +48,7 @@ 
      */
     function handleInvalidCommand()
     {
-        $oErrorHandler =& $this->getErrorHandler();
+        $oErrorHandler = & $this->getErrorHandler();
         $oErrorHandler->throwError(CKFINDER_CONNECTOR_ERROR_INVALID_COMMAND);
     }
 
@@ -68,20 +68,20 @@ 
         {
             case 'FileUpload':
             $this->_registry->set("errorHandler", "ErrorHandler_FileUpload");
-            $obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+            $obj = & CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
             $obj->sendResponse();
             break;
 
             case 'QuickUpload':
             $this->_registry->set("errorHandler", "ErrorHandler_QuickUpload");
-            $obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+            $obj = & CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
             $obj->sendResponse();
             break;
 
             case 'DownloadFile':
             case 'Thumbnail':
             $this->_registry->set("errorHandler", "ErrorHandler_Http");
-            $obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+            $obj = & CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
             $obj->sendResponse();
             break;
 
@@ -95,7 +95,7 @@ 
             case 'MoveFiles':
             case 'RenameFile':
             case 'RenameFolder':
-            $obj =& CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
+            $obj = & CKFinder_Connector_Core_Factory::getInstance("CommandHandler_".$command);
             $obj->sendResponse();
             break;
 
@@ -114,7 +114,7 @@ 
     function &getErrorHandler()
     {
         $_errorHandler = $this->_registry->get("errorHandler");
-        $oErrorHandler =& CKFinder_Connector_Core_Factory::getInstance($_errorHandler);
+        $oErrorHandler = & CKFinder_Connector_Core_Factory::getInstance($_errorHandler);
         return $oErrorHandler;
     }
 }

Braces +3 added lines, -1 removed lines

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

libs/ckfinder/core/connector/php/php5/Core/AccessControlConfig.php

Indentation +182 added lines, -182 removed lines

@@ -40,186 +40,186 @@
 class CKFinder_Connector_Core_AccessControlConfig
 {
 
-    /**
-     * array with ACL entries
-     *
-     * @var array[string]string
-     * @access private
-     */
-    private $_aclEntries = array();
-
-    function __construct($accessControlNodes)
-    {
-        foreach ($accessControlNodes as $node) {
-            $_folderView = isset($node['folderView']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['folderView']) : false;
-            $_folderCreate = isset($node['folderCreate']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['folderCreate']) : false;
-            $_folderRename = isset($node['folderRename']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['folderRename']) : false;
-            $_folderDelete = isset($node['folderDelete']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['folderDelete']) : false;
-            $_fileView = isset($node['fileView']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['fileView']) : false;
-            $_fileUpload = isset($node['fileUpload']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['fileUpload']) : false;
-            $_fileRename = isset($node['fileRename']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['fileRename']) : false;
-            $_fileDelete = isset($node['fileDelete']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['fileDelete']) : false;
-
-            $_role = isset($node['role']) ? $node['role'] : "*";
-            $_resourceType = isset($node['resourceType']) ? $node['resourceType'] : "*";
-            $_folder = isset($node['folder']) ? $node['folder'] : "/";
-
-            $this->addACLEntry($_role, $_resourceType, $_folder,
-            array(
-            $_folderView ? CKFINDER_CONNECTOR_ACL_FOLDER_VIEW : 0,
-            $_folderCreate ? CKFINDER_CONNECTOR_ACL_FOLDER_CREATE : 0,
-            $_folderRename ? CKFINDER_CONNECTOR_ACL_FOLDER_RENAME : 0,
-            $_folderDelete ? CKFINDER_CONNECTOR_ACL_FOLDER_DELETE : 0,
-            $_fileView ? CKFINDER_CONNECTOR_ACL_FILE_VIEW : 0,
-            $_fileUpload ? CKFINDER_CONNECTOR_ACL_FILE_UPLOAD : 0,
-            $_fileRename ? CKFINDER_CONNECTOR_ACL_FILE_RENAME : 0,
-            $_fileDelete ? CKFINDER_CONNECTOR_ACL_FILE_DELETE : 0,
-            ),
-            array(
-            $_folderView ? 0 : CKFINDER_CONNECTOR_ACL_FOLDER_VIEW,
-            $_folderCreate ? 0 : CKFINDER_CONNECTOR_ACL_FOLDER_CREATE,
-            $_folderRename ? 0 : CKFINDER_CONNECTOR_ACL_FOLDER_RENAME,
-            $_folderDelete ? 0 : CKFINDER_CONNECTOR_ACL_FOLDER_DELETE,
-            $_fileView ? 0 : CKFINDER_CONNECTOR_ACL_FILE_VIEW,
-            $_fileUpload ? 0 : CKFINDER_CONNECTOR_ACL_FILE_UPLOAD,
-            $_fileRename ? 0 : CKFINDER_CONNECTOR_ACL_FILE_RENAME,
-            $_fileDelete ? 0 : CKFINDER_CONNECTOR_ACL_FILE_DELETE,
-            )
-            );
-        }
-    }
-
-    /**
-     * Add ACL entry
-     *
-     * @param string $role role
-     * @param string $resourceType resource type
-     * @param string $folderPath folder path
-     * @param int $allowRulesMask allow rules mask
-     * @param int $denyRulesMask deny rules mask
-     * @access private
-     */
-    private function addACLEntry($role, $resourceType, $folderPath, $allowRulesMask, $denyRulesMask)
-    {
-
-        if (!strlen($folderPath)) {
-            $folderPath = '/';
-        }
-        else {
-            if (substr($folderPath,0,1) != '/') {
-                $folderPath = '/' . $folderPath;
-            }
-
-            if (substr($folderPath,-1,1) != '/') {
-                $folderPath .= '/';
-            }
-        }
-
-        $_entryKey = $role . "#@#" . $resourceType;
-
-        if (array_key_exists($folderPath,$this->_aclEntries)) {
-            if (array_key_exists($_entryKey, $this->_aclEntries[$folderPath])) {
-                $_rulesMasks = $this->_aclEntries[$folderPath][$_entryKey];
-                foreach ($_rulesMasks[0] as $key => $value) {
-                    $allowRulesMask[$key] |= $value;
-                }
-                foreach ($_rulesMasks[1] as $key => $value) {
-                    $denyRulesMask[$key] |= $value;
-                }
-            }
-        }
-        else {
-            $this->_aclEntries[$folderPath] = array();
-        }
-
-        $this->_aclEntries[$folderPath][$_entryKey] = array($allowRulesMask, $denyRulesMask);
-    }
-
-
-    /**
-     * Get computed mask
-     *
-     * @param string $resourceType
-     * @param string $folderPath
-     * @return int
-     */
-    public function getComputedMask($resourceType, $folderPath)
-    {
-        $_computedMask = 0;
-
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $_roleSessionVar = $_config->getRoleSessionVar();
-
-        $_userRole = null;
-        if (strlen($_roleSessionVar) && isset($_SESSION[$_roleSessionVar])) {
-            $_userRole = (string)$_SESSION[$_roleSessionVar];
-        }
-        if (!is_null($_userRole) && !strlen($_userRole)) {
-            $_userRole = null;
-        }
-
-        $folderPath = trim($folderPath, "/");
-        $_pathParts = explode("/", $folderPath);
-
-        $_currentPath = "/";
-
-        for($i = -1; $i < sizeof($_pathParts); $i++) {
-            if ($i >= 0) {
-                if (!strlen($_pathParts[$i])) {
-                    continue;
-                }
-
-                if (array_key_exists($_currentPath . '*/', $this->_aclEntries))
-                $_computedMask = $this->mergePathComputedMask( $_computedMask, $resourceType, $_userRole, $_currentPath . '*/' );
-
-                $_currentPath .= $_pathParts[$i] . '/';
-            }
-
-            if (array_key_exists($_currentPath, $this->_aclEntries)) {
-                $_computedMask = $this->mergePathComputedMask( $_computedMask, $resourceType, $_userRole, $_currentPath );
-            }
-        }
-
-        return $_computedMask;
-    }
-
-    /**
-     * merge current mask with folder entries
-     *
-     * @access private
-     * @param int $currentMask
-     * @param string $resourceType
-     * @param string $userRole
-     * @param string $path
-     * @return int
-     */
-    private function mergePathComputedMask( $currentMask, $resourceType, $userRole, $path )
-    {
-        $_folderEntries = $this->_aclEntries[$path];
-
-        $_possibleEntries = array();
-
-        $_possibleEntries[0] = "*#@#*";
-        $_possibleEntries[1] = "*#@#" . $resourceType;
-
-        if (!is_null($userRole))
-        {
-            $_possibleEntries[2] = $userRole . "#@#*";
-            $_possibleEntries[3] = $userRole . "#@#" . $resourceType;
-        }
-
-        for ($r = 0; $r < sizeof($_possibleEntries); $r++)
-        {
-            $_possibleKey = $_possibleEntries[$r];
-            if (array_key_exists($_possibleKey, $_folderEntries))
-            {
-                $_rulesMasks = $_folderEntries[$_possibleKey];
-
-                $currentMask |= array_sum($_rulesMasks[0]);
-                $currentMask ^= ($currentMask & array_sum($_rulesMasks[1]));
-            }
-        }
-
-        return $currentMask;
-    }
+	/**
+	 * array with ACL entries
+	 *
+	 * @var array[string]string
+	 * @access private
+	 */
+	private $_aclEntries = array();
+
+	function __construct($accessControlNodes)
+	{
+		foreach ($accessControlNodes as $node) {
+			$_folderView = isset($node['folderView']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['folderView']) : false;
+			$_folderCreate = isset($node['folderCreate']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['folderCreate']) : false;
+			$_folderRename = isset($node['folderRename']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['folderRename']) : false;
+			$_folderDelete = isset($node['folderDelete']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['folderDelete']) : false;
+			$_fileView = isset($node['fileView']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['fileView']) : false;
+			$_fileUpload = isset($node['fileUpload']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['fileUpload']) : false;
+			$_fileRename = isset($node['fileRename']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['fileRename']) : false;
+			$_fileDelete = isset($node['fileDelete']) ? CKFinder_Connector_Utils_Misc::booleanValue($node['fileDelete']) : false;
+
+			$_role = isset($node['role']) ? $node['role'] : "*";
+			$_resourceType = isset($node['resourceType']) ? $node['resourceType'] : "*";
+			$_folder = isset($node['folder']) ? $node['folder'] : "/";
+
+			$this->addACLEntry($_role, $_resourceType, $_folder,
+			array(
+			$_folderView ? CKFINDER_CONNECTOR_ACL_FOLDER_VIEW : 0,
+			$_folderCreate ? CKFINDER_CONNECTOR_ACL_FOLDER_CREATE : 0,
+			$_folderRename ? CKFINDER_CONNECTOR_ACL_FOLDER_RENAME : 0,
+			$_folderDelete ? CKFINDER_CONNECTOR_ACL_FOLDER_DELETE : 0,
+			$_fileView ? CKFINDER_CONNECTOR_ACL_FILE_VIEW : 0,
+			$_fileUpload ? CKFINDER_CONNECTOR_ACL_FILE_UPLOAD : 0,
+			$_fileRename ? CKFINDER_CONNECTOR_ACL_FILE_RENAME : 0,
+			$_fileDelete ? CKFINDER_CONNECTOR_ACL_FILE_DELETE : 0,
+			),
+			array(
+			$_folderView ? 0 : CKFINDER_CONNECTOR_ACL_FOLDER_VIEW,
+			$_folderCreate ? 0 : CKFINDER_CONNECTOR_ACL_FOLDER_CREATE,
+			$_folderRename ? 0 : CKFINDER_CONNECTOR_ACL_FOLDER_RENAME,
+			$_folderDelete ? 0 : CKFINDER_CONNECTOR_ACL_FOLDER_DELETE,
+			$_fileView ? 0 : CKFINDER_CONNECTOR_ACL_FILE_VIEW,
+			$_fileUpload ? 0 : CKFINDER_CONNECTOR_ACL_FILE_UPLOAD,
+			$_fileRename ? 0 : CKFINDER_CONNECTOR_ACL_FILE_RENAME,
+			$_fileDelete ? 0 : CKFINDER_CONNECTOR_ACL_FILE_DELETE,
+			)
+			);
+		}
+	}
+
+	/**
+	 * Add ACL entry
+	 *
+	 * @param string $role role
+	 * @param string $resourceType resource type
+	 * @param string $folderPath folder path
+	 * @param int $allowRulesMask allow rules mask
+	 * @param int $denyRulesMask deny rules mask
+	 * @access private
+	 */
+	private function addACLEntry($role, $resourceType, $folderPath, $allowRulesMask, $denyRulesMask)
+	{
+
+		if (!strlen($folderPath)) {
+			$folderPath = '/';
+		}
+		else {
+			if (substr($folderPath,0,1) != '/') {
+				$folderPath = '/' . $folderPath;
+			}
+
+			if (substr($folderPath,-1,1) != '/') {
+				$folderPath .= '/';
+			}
+		}
+
+		$_entryKey = $role . "#@#" . $resourceType;
+
+		if (array_key_exists($folderPath,$this->_aclEntries)) {
+			if (array_key_exists($_entryKey, $this->_aclEntries[$folderPath])) {
+				$_rulesMasks = $this->_aclEntries[$folderPath][$_entryKey];
+				foreach ($_rulesMasks[0] as $key => $value) {
+					$allowRulesMask[$key] |= $value;
+				}
+				foreach ($_rulesMasks[1] as $key => $value) {
+					$denyRulesMask[$key] |= $value;
+				}
+			}
+		}
+		else {
+			$this->_aclEntries[$folderPath] = array();
+		}
+
+		$this->_aclEntries[$folderPath][$_entryKey] = array($allowRulesMask, $denyRulesMask);
+	}
+
+
+	/**
+	 * Get computed mask
+	 *
+	 * @param string $resourceType
+	 * @param string $folderPath
+	 * @return int
+	 */
+	public function getComputedMask($resourceType, $folderPath)
+	{
+		$_computedMask = 0;
+
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$_roleSessionVar = $_config->getRoleSessionVar();
+
+		$_userRole = null;
+		if (strlen($_roleSessionVar) && isset($_SESSION[$_roleSessionVar])) {
+			$_userRole = (string)$_SESSION[$_roleSessionVar];
+		}
+		if (!is_null($_userRole) && !strlen($_userRole)) {
+			$_userRole = null;
+		}
+
+		$folderPath = trim($folderPath, "/");
+		$_pathParts = explode("/", $folderPath);
+
+		$_currentPath = "/";
+
+		for($i = -1; $i < sizeof($_pathParts); $i++) {
+			if ($i >= 0) {
+				if (!strlen($_pathParts[$i])) {
+					continue;
+				}
+
+				if (array_key_exists($_currentPath . '*/', $this->_aclEntries))
+				$_computedMask = $this->mergePathComputedMask( $_computedMask, $resourceType, $_userRole, $_currentPath . '*/' );
+
+				$_currentPath .= $_pathParts[$i] . '/';
+			}
+
+			if (array_key_exists($_currentPath, $this->_aclEntries)) {
+				$_computedMask = $this->mergePathComputedMask( $_computedMask, $resourceType, $_userRole, $_currentPath );
+			}
+		}
+
+		return $_computedMask;
+	}
+
+	/**
+	 * merge current mask with folder entries
+	 *
+	 * @access private
+	 * @param int $currentMask
+	 * @param string $resourceType
+	 * @param string $userRole
+	 * @param string $path
+	 * @return int
+	 */
+	private function mergePathComputedMask( $currentMask, $resourceType, $userRole, $path )
+	{
+		$_folderEntries = $this->_aclEntries[$path];
+
+		$_possibleEntries = array();
+
+		$_possibleEntries[0] = "*#@#*";
+		$_possibleEntries[1] = "*#@#" . $resourceType;
+
+		if (!is_null($userRole))
+		{
+			$_possibleEntries[2] = $userRole . "#@#*";
+			$_possibleEntries[3] = $userRole . "#@#" . $resourceType;
+		}
+
+		for ($r = 0; $r < sizeof($_possibleEntries); $r++)
+		{
+			$_possibleKey = $_possibleEntries[$r];
+			if (array_key_exists($_possibleKey, $_folderEntries))
+			{
+				$_rulesMasks = $_folderEntries[$_possibleKey];
+
+				$currentMask |= array_sum($_rulesMasks[0]);
+				$currentMask ^= ($currentMask & array_sum($_rulesMasks[1]));
+			}
+		}
+
+		return $currentMask;
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -21,14 +21,14 @@ 
 /**
  * Folder view mask
  */
-define('CKFINDER_CONNECTOR_ACL_FOLDER_VIEW',1);
-define('CKFINDER_CONNECTOR_ACL_FOLDER_CREATE',2);
-define('CKFINDER_CONNECTOR_ACL_FOLDER_RENAME',4);
-define('CKFINDER_CONNECTOR_ACL_FOLDER_DELETE',8);
-define('CKFINDER_CONNECTOR_ACL_FILE_VIEW',16);
-define('CKFINDER_CONNECTOR_ACL_FILE_UPLOAD',32);
-define('CKFINDER_CONNECTOR_ACL_FILE_RENAME',64);
-define('CKFINDER_CONNECTOR_ACL_FILE_DELETE',128);
+define('CKFINDER_CONNECTOR_ACL_FOLDER_VIEW', 1);
+define('CKFINDER_CONNECTOR_ACL_FOLDER_CREATE', 2);
+define('CKFINDER_CONNECTOR_ACL_FOLDER_RENAME', 4);
+define('CKFINDER_CONNECTOR_ACL_FOLDER_DELETE', 8);
+define('CKFINDER_CONNECTOR_ACL_FILE_VIEW', 16);
+define('CKFINDER_CONNECTOR_ACL_FILE_UPLOAD', 32);
+define('CKFINDER_CONNECTOR_ACL_FILE_RENAME', 64);
+define('CKFINDER_CONNECTOR_ACL_FILE_DELETE', 128);
 
 /**
  * This class keeps ACL configuration
@@ -106,18 +106,18 @@ 
             $folderPath = '/';
         }
         else {
-            if (substr($folderPath,0,1) != '/') {
-                $folderPath = '/' . $folderPath;
+            if (substr($folderPath, 0, 1) != '/') {
+                $folderPath = '/'.$folderPath;
             }
 
-            if (substr($folderPath,-1,1) != '/') {
+            if (substr($folderPath, -1, 1) != '/') {
                 $folderPath .= '/';
             }
         }
 
-        $_entryKey = $role . "#@#" . $resourceType;
+        $_entryKey = $role."#@#".$resourceType;
 
-        if (array_key_exists($folderPath,$this->_aclEntries)) {
+        if (array_key_exists($folderPath, $this->_aclEntries)) {
             if (array_key_exists($_entryKey, $this->_aclEntries[$folderPath])) {
                 $_rulesMasks = $this->_aclEntries[$folderPath][$_entryKey];
                 foreach ($_rulesMasks[0] as $key => $value) {
@@ -147,7 +147,7 @@ 
     {
         $_computedMask = 0;
 
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         $_roleSessionVar = $_config->getRoleSessionVar();
 
         $_userRole = null;
@@ -163,20 +163,20 @@ 
 
         $_currentPath = "/";
 
-        for($i = -1; $i < sizeof($_pathParts); $i++) {
+        for ($i = -1; $i < sizeof($_pathParts); $i++) {
             if ($i >= 0) {
                 if (!strlen($_pathParts[$i])) {
                     continue;
                 }
 
-                if (array_key_exists($_currentPath . '*/', $this->_aclEntries))
-                $_computedMask = $this->mergePathComputedMask( $_computedMask, $resourceType, $_userRole, $_currentPath . '*/' );
+                if (array_key_exists($_currentPath.'*/', $this->_aclEntries))
+                $_computedMask = $this->mergePathComputedMask($_computedMask, $resourceType, $_userRole, $_currentPath.'*/');
 
-                $_currentPath .= $_pathParts[$i] . '/';
+                $_currentPath .= $_pathParts[$i].'/';
             }
 
             if (array_key_exists($_currentPath, $this->_aclEntries)) {
-                $_computedMask = $this->mergePathComputedMask( $_computedMask, $resourceType, $_userRole, $_currentPath );
+                $_computedMask = $this->mergePathComputedMask($_computedMask, $resourceType, $_userRole, $_currentPath);
             }
         }
 
@@ -193,19 +193,19 @@ 
      * @param string $path
      * @return int
      */
-    private function mergePathComputedMask( $currentMask, $resourceType, $userRole, $path )
+    private function mergePathComputedMask($currentMask, $resourceType, $userRole, $path)
     {
         $_folderEntries = $this->_aclEntries[$path];
 
         $_possibleEntries = array();
 
         $_possibleEntries[0] = "*#@#*";
-        $_possibleEntries[1] = "*#@#" . $resourceType;
+        $_possibleEntries[1] = "*#@#".$resourceType;
 
         if (!is_null($userRole))
         {
-            $_possibleEntries[2] = $userRole . "#@#*";
-            $_possibleEntries[3] = $userRole . "#@#" . $resourceType;
+            $_possibleEntries[2] = $userRole."#@#*";
+            $_possibleEntries[3] = $userRole."#@#".$resourceType;
         }
 
         for ($r = 0; $r < sizeof($_possibleEntries); $r++)

Braces +8 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
@@ -104,8 +106,7 @@ 
 
         if (!strlen($folderPath)) {
             $folderPath = '/';
-        }
-        else {
+        } else {
             if (substr($folderPath,0,1) != '/') {
                 $folderPath = '/' . $folderPath;
             }
@@ -127,8 +128,7 @@ 
                     $denyRulesMask[$key] |= $value;
                 }
             }
-        }
-        else {
+        } else {
             $this->_aclEntries[$folderPath] = array();
         }
 
@@ -169,8 +169,9 @@ 
                     continue;
                 }
 
-                if (array_key_exists($_currentPath . '*/', $this->_aclEntries))
-                $_computedMask = $this->mergePathComputedMask( $_computedMask, $resourceType, $_userRole, $_currentPath . '*/' );
+                if (array_key_exists($_currentPath . '*/', $this->_aclEntries)) {
+                                $_computedMask = $this->mergePathComputedMask( $_computedMask, $resourceType, $_userRole, $_currentPath . '*/' );
+                }
 
                 $_currentPath .= $_pathParts[$i] . '/';
             }

libs/ckfinder/core/connector/php/php5/Core/ImagesConfig.php

Indentation +72 added lines, -72 removed lines

@@ -27,80 +27,80 @@
  */
 class CKFinder_Connector_Core_ImagesConfig
 {
-    /**
-     * Max width for images, 0 to disable resizing
-     *
-     * @var int
-     * @access private
-     */
-    private $_maxWidth = 0;
-    /**
-     * Max height for images, 0 to disable resizing
-     *
-     * @var int
-     * @access private
-     */
-    private $_maxHeight = 0;
-    /**
-     * Quality of thumbnails
-     *
-     * @var int
-     * @access private
-     */
-    private $_quality = 80;
+	/**
+	 * Max width for images, 0 to disable resizing
+	 *
+	 * @var int
+	 * @access private
+	 */
+	private $_maxWidth = 0;
+	/**
+	 * Max height for images, 0 to disable resizing
+	 *
+	 * @var int
+	 * @access private
+	 */
+	private $_maxHeight = 0;
+	/**
+	 * Quality of thumbnails
+	 *
+	 * @var int
+	 * @access private
+	 */
+	private $_quality = 80;
 
-    function __construct($imagesNode)
-    {
-        if(isset($imagesNode['maxWidth'])) {
-            $_maxWidth = intval($imagesNode['maxWidth']);
-            if($_maxWidth>=0) {
-                $this->_maxWidth = $_maxWidth;
-            }
-        }
-        if(isset($imagesNode['maxHeight'])) {
-            $_maxHeight = intval($imagesNode['maxHeight']);
-            if($_maxHeight>=0) {
-                $this->_maxHeight = $_maxHeight;
-            }
-        }
-        if(isset($imagesNode['quality'])) {
-            $_quality = intval($imagesNode['quality']);
-            if($_quality>0 && $_quality<=100) {
-                $this->_quality = $_quality;
-            }
-        }
-    }
+	function __construct($imagesNode)
+	{
+		if(isset($imagesNode['maxWidth'])) {
+			$_maxWidth = intval($imagesNode['maxWidth']);
+			if($_maxWidth>=0) {
+				$this->_maxWidth = $_maxWidth;
+			}
+		}
+		if(isset($imagesNode['maxHeight'])) {
+			$_maxHeight = intval($imagesNode['maxHeight']);
+			if($_maxHeight>=0) {
+				$this->_maxHeight = $_maxHeight;
+			}
+		}
+		if(isset($imagesNode['quality'])) {
+			$_quality = intval($imagesNode['quality']);
+			if($_quality>0 && $_quality<=100) {
+				$this->_quality = $_quality;
+			}
+		}
+	}
 
-    /**
-     * Get maximum width of a thumbnail
-     *
-     * @access public
-     * @return int
-     */
-    public function getMaxWidth()
-    {
-    	return $this->_maxWidth;
-    }
+	/**
+	 * Get maximum width of a thumbnail
+	 *
+	 * @access public
+	 * @return int
+	 */
+	public function getMaxWidth()
+	{
+		return $this->_maxWidth;
+	}
 
-    /**
-     * Get maximum height of a thumbnail
-     *
-     * @access public
-     * @return int
-     */
-    public function getMaxHeight()
-    {
-    	return $this->_maxHeight;
-    }
+	/**
+	 * Get maximum height of a thumbnail
+	 *
+	 * @access public
+	 * @return int
+	 */
+	public function getMaxHeight()
+	{
+		return $this->_maxHeight;
+	}
 
-    /**
-     * Get quality of a thumbnail (1-100)
-     *
-     * @access public
-     * @return int
-     */
-    public function getQuality()
-    {
-    	return $this->_quality;
-    }
+	/**
+	 * Get quality of a thumbnail (1-100)
+	 *
+	 * @access public
+	 * @return int
+	 */
+	public function getQuality()
+	{
+		return $this->_quality;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -51,21 +51,21 @@
 
     function CKFinder_Connector_Core_ImagesConfig($imagesNode)
     {
-        if(isset($imagesNode['maxWidth'])) {
+        if (isset($imagesNode['maxWidth'])) {
             $_maxWidth = intval($imagesNode['maxWidth']);
-            if($_maxWidth>=0) {
+            if ($_maxWidth >= 0) {
                 $this->_maxWidth = $_maxWidth;
             }
         }
-        if(isset($imagesNode['maxHeight'])) {
+        if (isset($imagesNode['maxHeight'])) {
             $_maxHeight = intval($imagesNode['maxHeight']);
-            if($_maxHeight>=0) {
+            if ($_maxHeight >= 0) {
                 $this->_maxHeight = $_maxHeight;
             }
         }
-        if(isset($imagesNode['quality'])) {
+        if (isset($imagesNode['quality'])) {
             $_quality = intval($imagesNode['quality']);
-            if($_quality>0 && $_quality<=100) {
+            if ($_quality > 0 && $_quality <= 100) {
                 $this->_quality = $_quality;
             }
         }

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