Piou-piou / Ruined-World

core/admin/contenus/GestionContenus.php

Doc Comments +9 added lines, -6 removed lines

@@ -33,6 +33,9 @@ 
 			return $bloc_editable;
 		}
 
+		/**
+		 * @param integer $parent
+		 */
 		private function getOrdrePage($parent) {
 			if (($parent != "") || ($parent != 0)) {
 				$dbc = \core\App::getDb();
@@ -66,13 +69,13 @@ 
 		}
 
 		/**
-		 * @param $nom_table
-		 * @param $nom_id_table
-		 * @param $champ
+		 * @param string $nom_table
+		 * @param string $nom_id_table
+		 * @param string $champ
 		 * @param $value
-		 * @param $limit_char
-		 * @param $err_char
-		 * @param $err_egalite
+		 * @param integer $limit_char
+		 * @param string $err_char
+		 * @param string $err_egalite
 		 * @param null $value_id_table
 		 * @return string
 		 * fonction qui permet de vérifier qu'il n'y ait pas d'erreur dans le champ spécifié ni de doublons

Braces +10 added lines, -15 removed lines

@@ -52,7 +52,9 @@ 
 		private function getParentId($parent) {
 			$dbc = \core\App::getDb();
 
-			if ($parent == "") return 0;
+			if ($parent == "") {
+				return 0;
+			}
 
 			$query = $dbc->select("ID_page")->from("page")->where("titre", " LIKE ", '"%'.$parent.'%"', "", true)->get();
 
@@ -83,8 +85,7 @@ 
 			if (strlen(utf8_decode($value)) > $limit_char) {
 				$this->erreur = true;
 				return "<li>$err_char</li>";
-			}
-			else if ($dbc->rechercherEgalite($nom_table, $champ, $value, $nom_id_table, $value_id_table) == true) {
+			} else if ($dbc->rechercherEgalite($nom_table, $champ, $value, $nom_id_table, $value_id_table) == true) {
 				$this->erreur = true;
 				return "<li>$err_egalite</li>";
 			}
@@ -167,13 +168,11 @@ 
 					if ($parent == "") {
 						$this->setAjoutLienNavigation("ID_page", $this->id_page, 1);
 					}
-				}
-				else {
+				} else {
 					FlashMessage::setFlash("Impossible de créer cette page, veuillez réeseyer dans un moment. Si le problème persiste contactez votre administrateur.");
 					$this->erreur = true;
 				}
-			}
-			else {
+			} else {
 				$this->setErreurContenus($balise_title, $url, $meta_description, $titre_page, $parent, $err_balise_title, $err_url, $err_meta_description, $err_titre_page);
 				$this->erreur = true;
 			}
@@ -219,8 +218,7 @@ 
 				if ($parent == "") {
 					$this->setAjoutLienNavigation("ID_page", $this->id_page, 1);
 				}
-			}
-			else {
+			} else {
 				$this->setErreurContenus($balise_title, $url, $titre_page, $parent, $err_balise_title, $err_url, $err_titre_page);
 				$this->erreur = true;
 			}
@@ -284,8 +282,7 @@ 
 						->set();
 
 					$this->setModifierLienNavigation("ID_page", $id_page, $this->getParentId($parent), $affiche);
-				}
-				else {
+				} else {
 					$this->setErreurContenus($balise_title, $url, $meta_description, $titre_page, $parent, $err_balise_title, $err_url, $err_meta_description, $err_titre_page);
 				}
 			}
@@ -334,8 +331,7 @@ 
 					FlashMessage::setFlash("Impossible de supprimer cette page, veuillez contacter votre administrateur pour corriger ce problème");
 					$this->erreur = true;
 				}
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("Impossible de supprimer cette page, veuillez contacter votre administrateur pour corriger ce problème");
 				$this->erreur = true;
 			}
@@ -361,8 +357,7 @@ 
 			if ($parent != "") {
 				$nav = new Navigation();
 				$nav->setSupprimerLien($id, $id_page);
-			}
-			else if (($affiche == 1) && ($parent == "")) {
+			} else if (($affiche == 1) && ($parent == "")) {
 				$this->setAjoutLienNavigation($id, $id_page, $affiche);
 			}
 		}

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

Doc Comments +4 added lines

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

Indentation +220 added lines, -220 removed lines

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

Spacing +5 added lines, -5 removed lines

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

Braces +7 added lines, -9 removed lines

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

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

Doc Comments +4 added lines

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

Indentation +209 added lines, -209 removed lines

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

Spacing +5 added lines, -5 removed lines

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

Braces +11 added lines, -17 removed lines

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

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

Doc Comments +3 added lines, -3 removed lines

@@ -232,7 +232,7 @@ 
 	 * Get "forceAscii" value
 	 *
 	 * @access public
-	 * @return array
+	 * @return boolean
 	 */
     function forceAscii()
     {
@@ -243,7 +243,7 @@ 
 	 * Get regular expression to hide folders
 	 *
 	 * @access public
-	 * @return array
+	 * @return string
 	 */
     function getHideFoldersRegex()
     {
@@ -269,7 +269,7 @@ 
 	 * Get regular expression to hide files
 	 *
 	 * @access public
-	 * @return array
+	 * @return string
 	 */
     function getHideFilesRegex()
     {

Indentation +407 added lines, -407 removed lines

@@ -46,491 +46,491 @@
  */
 class CKFinder_Connector_Core_Config
 {
-    /**
-     * Is CKFinder enabled
-     *
-     * @var boolean
-     * @access private
-     */
-    var $_isEnabled = false;
-    /**
+	/**
+	 * Is CKFinder enabled
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	var $_isEnabled = false;
+	/**
 	 * License Name
 	 *
 	 * @var string
 	 * @access private
 	 */
-    var $_licenseName = "";
-    /**
-     * License Key
-     *
-     * @var string
-     * @access private
-     */
-    var $_licenseKey = "";
-    /**
-     * Role session variable name
-     *
-     * @var string
-     * @access private
-     */
-    var $_roleSessionVar = "CKFinder_UserRole";
-    /**
-     * Access Control Configuration
-     *
-     * @var CKFinder_Connector_Core_AccessControlConfig
-     * @access private
-     */
-    var $_accessControlConfigCache;
-    /**
-     * ResourceType config cache
-     *
-     * @var array
-     * @access private
-     */
-    var $_resourceTypeConfigCache = array();
-    /**
-     * Thumbnails config cache
-     *
-     * @var CKFinder_Connector_Core_ThumbnailsConfig
-     * @access private
-     */
-    var $_thumbnailsConfigCache;
-    /**
-     * Images config cache
-     *
-     * @var CKFinder_Connector_Core_ImagesConfig
-     * @access private
-     */
-    var $_imagesConfigCache;
-    /**
-     * Array with default resource types names
-     *
-     * @access private
-     * @var array
-     */
-    var $_defaultResourceTypes = array();
-    /**
-     * Filesystem encoding
-     *
-     * @var string
-     * @access private
-     */
-    var $_filesystemEncoding;
-    /**
-     * Check double extension
-     *
-     * @var boolean
-     * @access private
-     */
-    var $_checkDoubleExtension = true;
-    /**
-     * If set to true, validate image size
-     *
-     * @var boolean
-     * @access private
-     */
-    var $_secureImageUploads = true;
-    /**
-     * Check file size after scaling images (applies to images only)
-     *
-     * @var boolean
-     */
-    var $_checkSizeAfterScaling = true;
-    /**
-     * For security, HTML is allowed in the first Kb of data for files having the following extensions only
-     *
-     * @var array
-     * @access private
-     */
-    var $_htmlExtensions = array('html', 'htm', 'xml', 'xsd', 'txt', 'js');
-    /**
-     * Chmod files after upload to the following permission
-     *
-     * @var integer
-     * @access private
-     */
-    var $_chmodFiles = 0777;
-    /**
-     * Chmod directories after creation
-     *
-     * @var integer
-     * @access private
-     */
-    var $_chmodFolders = 0755;
-    /**
-     * Hide folders
-     *
-     * @var array
-     * @access private
-     */
-    var $_hideFolders = array(".svn", "CVS");
-    /**
-     * Hide files
-     *
-     * @var integer
-     * @access private
-     */
-    var $_hideFiles = array(".*");
-    /**
-     * If set to true, force ASCII names
-     *
-     * @var boolean
-     * @access private
-     */
-    var $_forceAscii = false;
-
-    function CKFinder_Connector_Core_Config()
-    {
-        $this->loadValues();
-    }
-
-    /**
+	var $_licenseName = "";
+	/**
+	 * License Key
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_licenseKey = "";
+	/**
+	 * Role session variable name
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_roleSessionVar = "CKFinder_UserRole";
+	/**
+	 * Access Control Configuration
+	 *
+	 * @var CKFinder_Connector_Core_AccessControlConfig
+	 * @access private
+	 */
+	var $_accessControlConfigCache;
+	/**
+	 * ResourceType config cache
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_resourceTypeConfigCache = array();
+	/**
+	 * Thumbnails config cache
+	 *
+	 * @var CKFinder_Connector_Core_ThumbnailsConfig
+	 * @access private
+	 */
+	var $_thumbnailsConfigCache;
+	/**
+	 * Images config cache
+	 *
+	 * @var CKFinder_Connector_Core_ImagesConfig
+	 * @access private
+	 */
+	var $_imagesConfigCache;
+	/**
+	 * Array with default resource types names
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $_defaultResourceTypes = array();
+	/**
+	 * Filesystem encoding
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_filesystemEncoding;
+	/**
+	 * Check double extension
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	var $_checkDoubleExtension = true;
+	/**
+	 * If set to true, validate image size
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	var $_secureImageUploads = true;
+	/**
+	 * Check file size after scaling images (applies to images only)
+	 *
+	 * @var boolean
+	 */
+	var $_checkSizeAfterScaling = true;
+	/**
+	 * For security, HTML is allowed in the first Kb of data for files having the following extensions only
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_htmlExtensions = array('html', 'htm', 'xml', 'xsd', 'txt', 'js');
+	/**
+	 * Chmod files after upload to the following permission
+	 *
+	 * @var integer
+	 * @access private
+	 */
+	var $_chmodFiles = 0777;
+	/**
+	 * Chmod directories after creation
+	 *
+	 * @var integer
+	 * @access private
+	 */
+	var $_chmodFolders = 0755;
+	/**
+	 * Hide folders
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_hideFolders = array(".svn", "CVS");
+	/**
+	 * Hide files
+	 *
+	 * @var integer
+	 * @access private
+	 */
+	var $_hideFiles = array(".*");
+	/**
+	 * If set to true, force ASCII names
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	var $_forceAscii = false;
+
+	function CKFinder_Connector_Core_Config()
+	{
+		$this->loadValues();
+	}
+
+	/**
 	 * Get file system encoding, returns null if encoding is not set
 	 *
 	 * @access public
 	 * @return string
 	 */
-    function getFilesystemEncoding()
-    {
-        return $this->_filesystemEncoding;
-    }
+	function getFilesystemEncoding()
+	{
+		return $this->_filesystemEncoding;
+	}
 
-    /**
+	/**
 	 * Get "secureImageUploads" value
 	 *
 	 * @access public
 	 * @return boolean
 	 */
-    function getSecureImageUploads()
-    {
-        return $this->_secureImageUploads;
-    }
+	function getSecureImageUploads()
+	{
+		return $this->_secureImageUploads;
+	}
 
-    /**
+	/**
 	 * Get "checkSizeAfterScaling" value
 	 *
 	 * @access public
 	 * @return boolean
 	 */
-    function checkSizeAfterScaling()
-    {
-        return $this->_checkSizeAfterScaling;
-    }
+	function checkSizeAfterScaling()
+	{
+		return $this->_checkSizeAfterScaling;
+	}
 
-    /**
+	/**
 	 * Get "htmlExtensions" value
 	 *
 	 * @access public
 	 * @return array
 	 */
-    function getHtmlExtensions()
-    {
-        return $this->_htmlExtensions;
-    }
+	function getHtmlExtensions()
+	{
+		return $this->_htmlExtensions;
+	}
 
-    /**
+	/**
 	 * Get "forceAscii" value
 	 *
 	 * @access public
 	 * @return array
 	 */
-    function forceAscii()
-    {
-        return $this->_forceAscii;
-    }
+	function forceAscii()
+	{
+		return $this->_forceAscii;
+	}
 
-    /**
+	/**
 	 * Get regular expression to hide folders
 	 *
 	 * @access public
 	 * @return array
 	 */
-    function getHideFoldersRegex()
-    {
-        static $folderRegex;
-
-        if (!isset($folderRegex)) {
-            if (is_array($this->_hideFolders) && $this->_hideFolders) {
-                $folderRegex = join("|", $this->_hideFolders);
-                $folderRegex = strtr($folderRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
-                $folderRegex = preg_quote($folderRegex, "/");
-                $folderRegex = strtr($folderRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
-                $folderRegex = "/^(?:" . $folderRegex . ")$/uim";
-            }
-            else {
-                $folderRegex = "";
-            }
-        }
-
-        return $folderRegex;
-    }
-
-    /**
+	function getHideFoldersRegex()
+	{
+		static $folderRegex;
+
+		if (!isset($folderRegex)) {
+			if (is_array($this->_hideFolders) && $this->_hideFolders) {
+				$folderRegex = join("|", $this->_hideFolders);
+				$folderRegex = strtr($folderRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
+				$folderRegex = preg_quote($folderRegex, "/");
+				$folderRegex = strtr($folderRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
+				$folderRegex = "/^(?:" . $folderRegex . ")$/uim";
+			}
+			else {
+				$folderRegex = "";
+			}
+		}
+
+		return $folderRegex;
+	}
+
+	/**
 	 * Get regular expression to hide files
 	 *
 	 * @access public
 	 * @return array
 	 */
-    function getHideFilesRegex()
-    {
-        static $fileRegex;
-
-        if (!isset($fileRegex)) {
-            if (is_array($this->_hideFiles) && $this->_hideFiles) {
-                $fileRegex = join("|", $this->_hideFiles);
-                $fileRegex = strtr($fileRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
-                $fileRegex = preg_quote($fileRegex, "/");
-                $fileRegex = strtr($fileRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
-                $fileRegex = "/^(?:" . $fileRegex . ")$/uim";
-            }
-            else {
-                $fileRegex = "";
-            }
-        }
-
-        return $fileRegex;
-    }
-
-    /**
+	function getHideFilesRegex()
+	{
+		static $fileRegex;
+
+		if (!isset($fileRegex)) {
+			if (is_array($this->_hideFiles) && $this->_hideFiles) {
+				$fileRegex = join("|", $this->_hideFiles);
+				$fileRegex = strtr($fileRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
+				$fileRegex = preg_quote($fileRegex, "/");
+				$fileRegex = strtr($fileRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
+				$fileRegex = "/^(?:" . $fileRegex . ")$/uim";
+			}
+			else {
+				$fileRegex = "";
+			}
+		}
+
+		return $fileRegex;
+	}
+
+	/**
 	 * Get "Check double extension" value
 	 *
 	 * @access public
 	 * @return boolean
 	 */
-    function getCheckDoubleExtension()
-    {
-        return $this->_checkDoubleExtension;
-    }
+	function getCheckDoubleExtension()
+	{
+		return $this->_checkDoubleExtension;
+	}
 
-    /**
+	/**
 	 * Get default resource types
 	 *
 	 * @access public
 	 * @return array()
 	 */
-    function getDefaultResourceTypes()
-    {
-        return $this->_defaultResourceTypes;
-    }
+	function getDefaultResourceTypes()
+	{
+		return $this->_defaultResourceTypes;
+	}
 
-    /**
+	/**
 	 * Is CKFinder enabled
 	 *
 	 * @access public
 	 * @return boolean
 	 */
-    function getIsEnabled()
-    {
-        return $this->_isEnabled;
-    }
+	function getIsEnabled()
+	{
+		return $this->_isEnabled;
+	}
 
-    /**
+	/**
 	 * Get license key
 	 *
 	 * @access public
 	 * @return string
 	 */
-    function getLicenseKey()
-    {
-        return $this->_licenseKey;
-    }
-
-    /**
-	* Get license name
-		 *
-	* @access public
-	* @return string
-		 */
-    function getLicenseName()
-    {
-        return $this->_licenseName;
-    }
-
-    /**
-	* Get chmod settings for uploaded files
-	*
-	* @access public
-	* @return integer
-	*/
-    function getChmodFiles()
-    {
-        return $this->_chmodFiles;
-    }
-
-    /**
-	* Get chmod settings for created directories
-	*
-	* @access public
-	* @return integer
-	*/
-    function getChmodFolders()
-    {
-        return $this->_chmodFolders;
-    }
-
-    /**
+	function getLicenseKey()
+	{
+		return $this->_licenseKey;
+	}
+
+	/**
+	 * Get license name
+	 *
+	 * @access public
+	 * @return string
+	 */
+	function getLicenseName()
+	{
+		return $this->_licenseName;
+	}
+
+	/**
+	 * Get chmod settings for uploaded files
+	 *
+	 * @access public
+	 * @return integer
+	 */
+	function getChmodFiles()
+	{
+		return $this->_chmodFiles;
+	}
+
+	/**
+	 * Get chmod settings for created directories
+	 *
+	 * @access public
+	 * @return integer
+	 */
+	function getChmodFolders()
+	{
+		return $this->_chmodFolders;
+	}
+
+	/**
 	 * Get role sesion variable name
 	 *
 	 * @access public
 	 * @return string
 	 */
-    function getRoleSessionVar()
-    {
-        return $this->_roleSessionVar;
-    }
+	function getRoleSessionVar()
+	{
+		return $this->_roleSessionVar;
+	}
 
-    /**
+	/**
 	 * Get resourceTypeName config
 	 *
 	 * @param string $resourceTypeName
 	 * @return CKFinder_Connector_Core_ResourceTypeConfig|null
 	 * @access public
 	 */
-    function &getResourceTypeConfig($resourceTypeName)
-    {
-        $_null = null;
-
-        if (isset($this->_resourceTypeConfigCache[$resourceTypeName])) {
-            return $this->_resourceTypeConfigCache[$resourceTypeName];
-        }
-
-        if (!isset($GLOBALS['config']['ResourceType']) || !is_array($GLOBALS['config']['ResourceType'])) {
-            return $_null;
-        }
-
-        reset($GLOBALS['config']['ResourceType']);
-        while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
-            if ($_resourceTypeNode['name'] === $resourceTypeName) {
-                $this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
-
-                return $this->_resourceTypeConfigCache[$resourceTypeName];
-            }
-        }
-
-        return $_null;
-    }
-
-    /**
-     * Get thumbnails config
-     *
-     * @access public
-     * @return CKFinder_Connector_Core_ThumbnailsConfig
-     */
-    function &getThumbnailsConfig()
-    {
-        if (!isset($this->_thumbnailsConfigCache)) {
-            $this->_thumbnailsConfigCache = new CKFinder_Connector_Core_ThumbnailsConfig(isset($GLOBALS['config']['Thumbnails']) ? $GLOBALS['config']['Thumbnails'] : array());
-        }
-
-        return $this->_thumbnailsConfigCache;
-    }
-
-    /**
-     * Get images config
-     *
-     * @access public
-     * @return CKFinder_Connector_Core_ImagesConfig
-     */
-    function &getImagesConfig()
-    {
-        if (!isset($this->_imagesConfigCache)) {
-            $this->_imagesConfigCache = new CKFinder_Connector_Core_ImagesConfig(isset($GLOBALS['config']['Images']) ? $GLOBALS['config']['Images'] : array());
-        }
-
-        return $this->_imagesConfigCache;
-    }
-
-    /**
-     * Get access control config
-     *
-     * @access public
-     * @return CKFinder_Connector_Core_AccessControlConfig
-     */
-    function &getAccessControlConfig()
-    {
-        if (!isset($this->_accessControlConfigCache)) {
-            $this->_accessControlConfigCache = new CKFinder_Connector_Core_AccessControlConfig(isset($GLOBALS['config']['AccessControl']) ? $GLOBALS['config']['AccessControl'] : array());
-        }
-
-        return $this->_accessControlConfigCache;
-    }
-
-    /**
-     * Load values from config
-     *
-     * @access private
-     */
-    function loadValues()
-    {
-        if (function_exists('CheckAuthentication')) {
-            $this->_isEnabled = CheckAuthentication();
-        }
-        if (isset($GLOBALS['config']['LicenseName'])) {
-            $this->_licenseName = (string)$GLOBALS['config']['LicenseName'];
-        }
-        if (isset($GLOBALS['config']['LicenseKey'])) {
-            $this->_licenseKey = (string)$GLOBALS['config']['LicenseKey'];
-        }
-        if (isset($GLOBALS['config']['FilesystemEncoding'])) {
-            $this->_filesystemEncoding = (string)$GLOBALS['config']['FilesystemEncoding'];
-        }
-        if (isset($GLOBALS['config']['RoleSessionVar'])) {
-            $this->_roleSessionVar = (string)$GLOBALS['config']['RoleSessionVar'];
-        }
-        if (isset($GLOBALS['config']['CheckDoubleExtension'])) {
-            $this->_checkDoubleExtension = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['CheckDoubleExtension']);
-        }
-        if (isset($GLOBALS['config']['SecureImageUploads'])) {
-            $this->_secureImageUploads = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['SecureImageUploads']);
-        }
-        if (isset($GLOBALS['config']['CheckSizeAfterScaling'])) {
-            $this->_checkSizeAfterScaling = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['CheckSizeAfterScaling']);
-        }
-        if (isset($GLOBALS['config']['ForceAscii'])) {
-            $this->_forceAscii = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['ForceAscii']);
-        }
-        if (isset($GLOBALS['config']['HtmlExtensions'])) {
-            $this->_htmlExtensions = (array)$GLOBALS['config']['HtmlExtensions'];
-        }
-        if (isset($GLOBALS['config']['HideFolders'])) {
-            $this->_hideFolders = (array)$GLOBALS['config']['HideFolders'];
-        }
-        if (isset($GLOBALS['config']['HideFiles'])) {
-            $this->_hideFiles = (array)$GLOBALS['config']['HideFiles'];
-        }
-        if (isset($GLOBALS['config']['ChmodFiles'])) {
-            $this->_chmodFiles = $GLOBALS['config']['ChmodFiles'];
-        }
-        if (isset($GLOBALS['config']['ChmodFolders'])) {
-            $this->_chmodFolders = $GLOBALS['config']['ChmodFolders'];
-        }
-        if (isset($GLOBALS['config']['DefaultResourceTypes'])) {
-            $_defaultResourceTypes = (string)$GLOBALS['config']['DefaultResourceTypes'];
-            if (strlen($_defaultResourceTypes)) {
-                $this->_defaultResourceTypes = explode(",", $_defaultResourceTypes);
-            }
-        }
-    }
-
-    /**
-     * Get all resource type names defined in config
-     *
-     * @return array
-     * @access public
-     */
-    function getResourceTypeNames()
-    {
-        if (!isset($GLOBALS['config']['ResourceType']) || !is_array($GLOBALS['config']['ResourceType'])) {
-            return array();
-        }
-
-        $_names = array();
-        foreach ($GLOBALS['config']['ResourceType'] as $key => $_resourceType) {
-            if (isset($_resourceType['name'])) {
-                $_names[] = (string)$_resourceType['name'];
-            }
-        }
-
-        return $_names;
-    }
+	function &getResourceTypeConfig($resourceTypeName)
+	{
+		$_null = null;
+
+		if (isset($this->_resourceTypeConfigCache[$resourceTypeName])) {
+			return $this->_resourceTypeConfigCache[$resourceTypeName];
+		}
+
+		if (!isset($GLOBALS['config']['ResourceType']) || !is_array($GLOBALS['config']['ResourceType'])) {
+			return $_null;
+		}
+
+		reset($GLOBALS['config']['ResourceType']);
+		while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
+			if ($_resourceTypeNode['name'] === $resourceTypeName) {
+				$this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
+
+				return $this->_resourceTypeConfigCache[$resourceTypeName];
+			}
+		}
+
+		return $_null;
+	}
+
+	/**
+	 * Get thumbnails config
+	 *
+	 * @access public
+	 * @return CKFinder_Connector_Core_ThumbnailsConfig
+	 */
+	function &getThumbnailsConfig()
+	{
+		if (!isset($this->_thumbnailsConfigCache)) {
+			$this->_thumbnailsConfigCache = new CKFinder_Connector_Core_ThumbnailsConfig(isset($GLOBALS['config']['Thumbnails']) ? $GLOBALS['config']['Thumbnails'] : array());
+		}
+
+		return $this->_thumbnailsConfigCache;
+	}
+
+	/**
+	 * Get images config
+	 *
+	 * @access public
+	 * @return CKFinder_Connector_Core_ImagesConfig
+	 */
+	function &getImagesConfig()
+	{
+		if (!isset($this->_imagesConfigCache)) {
+			$this->_imagesConfigCache = new CKFinder_Connector_Core_ImagesConfig(isset($GLOBALS['config']['Images']) ? $GLOBALS['config']['Images'] : array());
+		}
+
+		return $this->_imagesConfigCache;
+	}
+
+	/**
+	 * Get access control config
+	 *
+	 * @access public
+	 * @return CKFinder_Connector_Core_AccessControlConfig
+	 */
+	function &getAccessControlConfig()
+	{
+		if (!isset($this->_accessControlConfigCache)) {
+			$this->_accessControlConfigCache = new CKFinder_Connector_Core_AccessControlConfig(isset($GLOBALS['config']['AccessControl']) ? $GLOBALS['config']['AccessControl'] : array());
+		}
+
+		return $this->_accessControlConfigCache;
+	}
+
+	/**
+	 * Load values from config
+	 *
+	 * @access private
+	 */
+	function loadValues()
+	{
+		if (function_exists('CheckAuthentication')) {
+			$this->_isEnabled = CheckAuthentication();
+		}
+		if (isset($GLOBALS['config']['LicenseName'])) {
+			$this->_licenseName = (string)$GLOBALS['config']['LicenseName'];
+		}
+		if (isset($GLOBALS['config']['LicenseKey'])) {
+			$this->_licenseKey = (string)$GLOBALS['config']['LicenseKey'];
+		}
+		if (isset($GLOBALS['config']['FilesystemEncoding'])) {
+			$this->_filesystemEncoding = (string)$GLOBALS['config']['FilesystemEncoding'];
+		}
+		if (isset($GLOBALS['config']['RoleSessionVar'])) {
+			$this->_roleSessionVar = (string)$GLOBALS['config']['RoleSessionVar'];
+		}
+		if (isset($GLOBALS['config']['CheckDoubleExtension'])) {
+			$this->_checkDoubleExtension = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['CheckDoubleExtension']);
+		}
+		if (isset($GLOBALS['config']['SecureImageUploads'])) {
+			$this->_secureImageUploads = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['SecureImageUploads']);
+		}
+		if (isset($GLOBALS['config']['CheckSizeAfterScaling'])) {
+			$this->_checkSizeAfterScaling = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['CheckSizeAfterScaling']);
+		}
+		if (isset($GLOBALS['config']['ForceAscii'])) {
+			$this->_forceAscii = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['ForceAscii']);
+		}
+		if (isset($GLOBALS['config']['HtmlExtensions'])) {
+			$this->_htmlExtensions = (array)$GLOBALS['config']['HtmlExtensions'];
+		}
+		if (isset($GLOBALS['config']['HideFolders'])) {
+			$this->_hideFolders = (array)$GLOBALS['config']['HideFolders'];
+		}
+		if (isset($GLOBALS['config']['HideFiles'])) {
+			$this->_hideFiles = (array)$GLOBALS['config']['HideFiles'];
+		}
+		if (isset($GLOBALS['config']['ChmodFiles'])) {
+			$this->_chmodFiles = $GLOBALS['config']['ChmodFiles'];
+		}
+		if (isset($GLOBALS['config']['ChmodFolders'])) {
+			$this->_chmodFolders = $GLOBALS['config']['ChmodFolders'];
+		}
+		if (isset($GLOBALS['config']['DefaultResourceTypes'])) {
+			$_defaultResourceTypes = (string)$GLOBALS['config']['DefaultResourceTypes'];
+			if (strlen($_defaultResourceTypes)) {
+				$this->_defaultResourceTypes = explode(",", $_defaultResourceTypes);
+			}
+		}
+	}
+
+	/**
+	 * Get all resource type names defined in config
+	 *
+	 * @return array
+	 * @access public
+	 */
+	function getResourceTypeNames()
+	{
+		if (!isset($GLOBALS['config']['ResourceType']) || !is_array($GLOBALS['config']['ResourceType'])) {
+			return array();
+		}
+
+		$_names = array();
+		foreach ($GLOBALS['config']['ResourceType'] as $key => $_resourceType) {
+			if (isset($_resourceType['name'])) {
+				$_names[] = (string)$_resourceType['name'];
+			}
+		}
+
+		return $_names;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -21,19 +21,19 @@ 
 /**
  * Include access control config class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/AccessControlConfig.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/AccessControlConfig.php";
 /**
  * Include resource type config class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/ResourceTypeConfig.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/ResourceTypeConfig.php";
 /**
  * Include thumbnails config class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/ThumbnailsConfig.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/ThumbnailsConfig.php";
 /**
  * Include thumbnails config class
  */
-require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/ImagesConfig.php";
+require_once CKFINDER_CONNECTOR_LIB_DIR."/Core/ImagesConfig.php";
 
 /**
  * Main config parser
@@ -255,7 +255,7 @@ 
                 $folderRegex = strtr($folderRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
                 $folderRegex = preg_quote($folderRegex, "/");
                 $folderRegex = strtr($folderRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
-                $folderRegex = "/^(?:" . $folderRegex . ")$/uim";
+                $folderRegex = "/^(?:".$folderRegex.")$/uim";
             }
             else {
                 $folderRegex = "";
@@ -281,7 +281,7 @@ 
                 $fileRegex = strtr($fileRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
                 $fileRegex = preg_quote($fileRegex, "/");
                 $fileRegex = strtr($fileRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
-                $fileRegex = "/^(?:" . $fileRegex . ")$/uim";
+                $fileRegex = "/^(?:".$fileRegex.")$/uim";
             }
             else {
                 $fileRegex = "";
@@ -399,7 +399,7 @@ 
         }
 
         reset($GLOBALS['config']['ResourceType']);
-        while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
+        while (list($_key, $_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
             if ($_resourceTypeNode['name'] === $resourceTypeName) {
                 $this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
 

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
@@ -256,8 +258,7 @@ 
                 $folderRegex = preg_quote($folderRegex, "/");
                 $folderRegex = strtr($folderRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
                 $folderRegex = "/^(?:" . $folderRegex . ")$/uim";
-            }
-            else {
+            } else {
                 $folderRegex = "";
             }
         }
@@ -282,8 +283,7 @@ 
                 $fileRegex = preg_quote($fileRegex, "/");
                 $fileRegex = strtr($fileRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
                 $fileRegex = "/^(?:" . $fileRegex . ")$/uim";
-            }
-            else {
+            } else {
                 $fileRegex = "";
             }
         }

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

Doc Comments -1 removed lines

@@ -24,7 +24,6 @@
      * Run user defined hooks
      *
      * @param string $event
-     * @param object $errorHandler
      * @param array $args
      * @return boolean (true to continue processing, false otherwise)
      */

Indentation +135 added lines, -135 removed lines

@@ -20,154 +20,154 @@
 class CKFinder_Connector_Core_Hooks
 {
 
-    /**
-     * Run user defined hooks
-     *
-     * @param string $event
-     * @param object $errorHandler
-     * @param array $args
-     * @return boolean (true to continue processing, false otherwise)
-     */
-    function run($event, $args = array())
-    {
-        $config = $GLOBALS['config'];
-        if (!isset($config['Hooks'])) {
-            return true;
-        }
-        $hooks =& $config['Hooks'];
+	/**
+	 * Run user defined hooks
+	 *
+	 * @param string $event
+	 * @param object $errorHandler
+	 * @param array $args
+	 * @return boolean (true to continue processing, false otherwise)
+	 */
+	function run($event, $args = array())
+	{
+		$config = $GLOBALS['config'];
+		if (!isset($config['Hooks'])) {
+			return true;
+		}
+		$hooks =& $config['Hooks'];
 
-        if (!is_array($hooks) || !array_key_exists($event, $hooks) || !is_array($hooks[$event])) {
-            return true;
-        }
+		if (!is_array($hooks) || !array_key_exists($event, $hooks) || !is_array($hooks[$event])) {
+			return true;
+		}
 
-        $errorHandler = $GLOBALS['connector']->getErrorHandler();
+		$errorHandler = $GLOBALS['connector']->getErrorHandler();
 
-        foreach ($hooks[$event] as $i => $hook) {
+		foreach ($hooks[$event] as $i => $hook) {
 
-            $object = NULL;
-            $method = NULL;
-            $function = NULL;
-            $data = NULL;
-            $passData = false;
+			$object = NULL;
+			$method = NULL;
+			$function = NULL;
+			$data = NULL;
+			$passData = false;
 
-            /* $hook can be: a function, an object, an array of $functiontion and $data,
+			/* $hook can be: a function, an object, an array of $functiontion and $data,
             * an array of just a function, an array of object and method, or an
             * array of object, method, and data.
             */
-            //function
-            if (is_string($hook)) {
-                $function = $hook;
-            }
-            //object
-            else if (is_object($hook)) {
-                $object = $hooks[$event][$i];
-                $method = "on" . $event;
-            }
-            //array of...
-            else if (is_array($hook)) {
-                $count = count($hook);
-                if ($count) {
-                    //...object
-                    if (is_object($hook[0])) {
-                        $object = $hooks[$event][$i][0];
-                        if ($count < 2) {
-                            $method = "on" . $event;
-                        } else {
-                            //...object and method
-                            $method = $hook[1];
-                            if (count($hook) > 2) {
-                                //...object, method and data
-                                $passData = true;
-                                $data = $hook[2];
-                            }
-                        }
-                    }
-                    //...function
-                    else if (is_string($hook[0])) {
-                        $function = $hook[0];
-                        if ($count > 1) {
-                            //...function with data
-                            $passData = true;
-                            $data = $hook[1];
-                        }
-                    }
-                }
-            }
+			//function
+			if (is_string($hook)) {
+				$function = $hook;
+			}
+			//object
+			else if (is_object($hook)) {
+				$object = $hooks[$event][$i];
+				$method = "on" . $event;
+			}
+			//array of...
+			else if (is_array($hook)) {
+				$count = count($hook);
+				if ($count) {
+					//...object
+					if (is_object($hook[0])) {
+						$object = $hooks[$event][$i][0];
+						if ($count < 2) {
+							$method = "on" . $event;
+						} else {
+							//...object and method
+							$method = $hook[1];
+							if (count($hook) > 2) {
+								//...object, method and data
+								$passData = true;
+								$data = $hook[2];
+							}
+						}
+					}
+					//...function
+					else if (is_string($hook[0])) {
+						$function = $hook[0];
+						if ($count > 1) {
+							//...function with data
+							$passData = true;
+							$data = $hook[1];
+						}
+					}
+				}
+			}
 
-            /* If defined, add data to the arguments array */
-            if ($passData) {
-                $args = array_merge(array($data), $args);
-            }
+			/* If defined, add data to the arguments array */
+			if ($passData) {
+				$args = array_merge(array($data), $args);
+			}
 
-            if (isset($object)) {
-                $callback = array($object, $method);
-            }
-            else if (false !== ($pos = strpos($function, '::'))) {
-                $callback = array(substr($function, 0, $pos), substr($function, $pos + 2));
-            }
-            else {
-                $callback = $function;
-            }
+			if (isset($object)) {
+				$callback = array($object, $method);
+			}
+			else if (false !== ($pos = strpos($function, '::'))) {
+				$callback = array(substr($function, 0, $pos), substr($function, $pos + 2));
+			}
+			else {
+				$callback = $function;
+			}
 
-            if (is_callable($callback)) {
-                $ret = call_user_func_array($callback, $args);
-            }
-            else {
-                $functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
-                $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
-                "CKFinder failed to call a hook: " . $functionName);
-                return false;
-            }
+			if (is_callable($callback)) {
+				$ret = call_user_func_array($callback, $args);
+			}
+			else {
+				$functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
+				$errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
+				"CKFinder failed to call a hook: " . $functionName);
+				return false;
+			}
 
-            //String return is a custom error
-            if (is_string($ret)) {
-                $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR, $ret);
-                return false;
-            }
-            //hook returned an error code, user error codes start from 50000
-            //error codes are important because this way it is possible to create multilanguage extensions
+			//String return is a custom error
+			if (is_string($ret)) {
+				$errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR, $ret);
+				return false;
+			}
+			//hook returned an error code, user error codes start from 50000
+			//error codes are important because this way it is possible to create multilanguage extensions
 
-            //recomendation: create a function that calculates the error codes starting number
-            //for an extension, a pool of 100 error codes for each extension should be safe enough
-            else if (is_int($ret)) {
-                $errorHandler->throwError($ret);
-                return false;
-            }
-            //no value returned
-            else if( $ret === null ) {
-                $functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
-                $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
-                "CKFinder extension returned an invalid value (null)." .
-                "Hook " . $functionName . " should return a value.");
-                return false;
-            }
-            else if (!$ret) {
-                return false;
-            }
-        }
+			//recomendation: create a function that calculates the error codes starting number
+			//for an extension, a pool of 100 error codes for each extension should be safe enough
+			else if (is_int($ret)) {
+				$errorHandler->throwError($ret);
+				return false;
+			}
+			//no value returned
+			else if( $ret === null ) {
+				$functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
+				$errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
+				"CKFinder extension returned an invalid value (null)." .
+				"Hook " . $functionName . " should return a value.");
+				return false;
+			}
+			else if (!$ret) {
+				return false;
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Print user friendly name of a callback
-     *
-     * @param mixed $callback
-     * @return string
-     */
-    function _printCallback($callback)
-    {
-        if (is_array($callback)) {
-            if (is_object($callback[0])) {
-                $className = get_class($callback[0]);
-            } else {
-                $className = strval($callback[0]);
-            }
-            $functionName = $className . '::' . strval($callback[1]);
-        }
-        else {
-            $functionName = strval($callback);
-        }
-        return $functionName;
-    }
+	/**
+	 * Print user friendly name of a callback
+	 *
+	 * @param mixed $callback
+	 * @return string
+	 */
+	function _printCallback($callback)
+	{
+		if (is_array($callback)) {
+			if (is_object($callback[0])) {
+				$className = get_class($callback[0]);
+			} else {
+				$className = strval($callback[0]);
+			}
+			$functionName = $className . '::' . strval($callback[1]);
+		}
+		else {
+			$functionName = strval($callback);
+		}
+		return $functionName;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
         if (!isset($config['Hooks'])) {
             return true;
         }
-        $hooks =& $config['Hooks'];
+        $hooks = & $config['Hooks'];
 
         if (!is_array($hooks) || !array_key_exists($event, $hooks) || !is_array($hooks[$event])) {
             return true;
@@ -61,7 +61,7 @@ 
             //object
             else if (is_object($hook)) {
                 $object = $hooks[$event][$i];
-                $method = "on" . $event;
+                $method = "on".$event;
             }
             //array of...
             else if (is_array($hook)) {
@@ -71,7 +71,7 @@ 
                     if (is_object($hook[0])) {
                         $object = $hooks[$event][$i][0];
                         if ($count < 2) {
-                            $method = "on" . $event;
+                            $method = "on".$event;
                         } else {
                             //...object and method
                             $method = $hook[1];
@@ -115,7 +115,7 @@ 
             else {
                 $functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
                 $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
-                "CKFinder failed to call a hook: " . $functionName);
+                "CKFinder failed to call a hook: ".$functionName);
                 return false;
             }
 
@@ -134,11 +134,11 @@ 
                 return false;
             }
             //no value returned
-            else if( $ret === null ) {
+            else if ($ret === null) {
                 $functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
                 $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
-                "CKFinder extension returned an invalid value (null)." .
-                "Hook " . $functionName . " should return a value.");
+                "CKFinder extension returned an invalid value (null).".
+                "Hook ".$functionName." should return a value.");
                 return false;
             }
             else if (!$ret) {
@@ -163,7 +163,7 @@ 
             } else {
                 $className = strval($callback[0]);
             }
-            $functionName = $className . '::' . strval($callback[1]);
+            $functionName = $className.'::'.strval($callback[1]);
         }
         else {
             $functionName = strval($callback);

Braces +8 added lines, -11 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
@@ -101,18 +103,15 @@ 
 
             if (isset($object)) {
                 $callback = array($object, $method);
-            }
-            else if (false !== ($pos = strpos($function, '::'))) {
+            } else if (false !== ($pos = strpos($function, '::'))) {
                 $callback = array(substr($function, 0, $pos), substr($function, $pos + 2));
-            }
-            else {
+            } else {
                 $callback = $function;
             }
 
             if (is_callable($callback)) {
                 $ret = call_user_func_array($callback, $args);
-            }
-            else {
+            } else {
                 $functionName = CKFinder_Connector_Core_Hooks::_printCallback($callback);
                 $errorHandler->throwError(CKFINDER_CONNECTOR_ERROR_CUSTOM_ERROR,
                 "CKFinder failed to call a hook: " . $functionName);
@@ -140,8 +139,7 @@ 
                 "CKFinder extension returned an invalid value (null)." .
                 "Hook " . $functionName . " should return a value.");
                 return false;
-            }
-            else if (!$ret) {
+            } else if (!$ret) {
                 return false;
             }
         }
@@ -164,8 +162,7 @@ 
                 $className = strval($callback[0]);
             }
             $functionName = $className . '::' . strval($callback[1]);
-        }
-        else {
+        } else {
             $functionName = strval($callback);
         }
         return $functionName;

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

Doc Comments +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
      * Set value
      *
      * @param string $key
-     * @param mixed $obj
+     * @param string $obj
      * @access public
      */
     function set($key, $obj)
@@ -63,7 +63,7 @@ 
      * Get value
      *
      * @param string $key
-     * @return mixed
+     * @return string
      * @access public
      */
     function get($key)

Indentation +42 added lines, -42 removed lines

@@ -27,49 +27,49 @@
  */
 class CKFinder_Connector_Core_Registry
 {
-    /**
-     * Arrat that stores all values
-     *
-     * @var array
-     * @access private
-     */
-    var $_store = array();
+	/**
+	 * Arrat that stores all values
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_store = array();
 
-    /**
-     * Chacke if value has been set
-     *
-     * @param string $key
-     * @return boolean
-     * @access private
-     */
-    function isValid($key)
-    {
-        return array_key_exists($key, $this->_store);
-    }
+	/**
+	 * Chacke if value has been set
+	 *
+	 * @param string $key
+	 * @return boolean
+	 * @access private
+	 */
+	function isValid($key)
+	{
+		return array_key_exists($key, $this->_store);
+	}
 
-    /**
-     * Set value
-     *
-     * @param string $key
-     * @param mixed $obj
-     * @access public
-     */
-    function set($key, $obj)
-    {
-        $this->_store[$key] = $obj;
-    }
+	/**
+	 * Set value
+	 *
+	 * @param string $key
+	 * @param mixed $obj
+	 * @access public
+	 */
+	function set($key, $obj)
+	{
+		$this->_store[$key] = $obj;
+	}
 
-    /**
-     * Get value
-     *
-     * @param string $key
-     * @return mixed
-     * @access public
-     */
-    function get($key)
-    {
-    	if ($this->isValid($key)) {
-    	    return $this->_store[$key];
-    	}
-    }
+	/**
+	 * Get value
+	 *
+	 * @param string $key
+	 * @return mixed
+	 * @access public
+	 */
+	function get($key)
+	{
+		if ($this->isValid($key)) {
+			return $this->_store[$key];
+		}
+	}
 }

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/ResourceTypeConfig.php

Doc Comments +1 added lines, -2 removed lines

@@ -221,7 +221,6 @@ 
      * If allowed extensions are defined, return false if extension isn't on allowed list.
      *
      * @access public
-     * @param string $extension extension
      * @param boolean $renameIfRequired whether try to rename file or not
      * @return boolean
      */
@@ -314,8 +313,8 @@ 
      * Check given path
      * Return true if path contains folder name that matches hidden folder names list
      *
-     * @param string $folderName
      * @access public
+     * @param string $path
      * @return boolean
      */
     function checkIsHiddenPath($path)

Indentation +321 added lines, -321 removed lines

@@ -27,325 +27,325 @@
  */
 class CKFinder_Connector_Core_ResourceTypeConfig
 {
-    /**
-     * Resource name
-     *
-     * @var string
-     * @access private
-     */
-    var $_name = "";
-    /**
-     * Resource url
-     *
-     * @var string
-     * @access private
-     */
-    var $_url = "";
-    /**
-     * Directory path on a server
-     *
-     * @var string
-     * @access private
-     */
-    var $_directory = "";
-    /**
-     * Max size
-     *
-     * @var unknown_type
-     * @access private
-     */
-    var $_maxSize = 0;
-    /**
-     * Array with allowed extensions
-     *
-     * @var array[]string
-     * @access private
-     */
-    var $_allowedExtensions = array();
-    /**
-     * Array with denied extensions
-     *
-     * @var array[]string
-     * @access private
-     */
-    var $_deniedExtensions = array();
-    /**
-     * used for CKFinder_Connector_Core_Config object caching
-     *
-     * @var CKFinder_Connector_Core_Config
-     * @access private
-     */
-    var $_config;
-
-    /**
-     * Get ResourceType configuration
-     *
-     * @param string $resourceTypeNode
-     * @return array
-     *
-     */
-    function CKFinder_Connector_Core_ResourceTypeConfig($resourceTypeNode)
-    {
-        if (isset($resourceTypeNode["name"])) {
-            $this->_name = $resourceTypeNode["name"];
-        }
-
-        if (isset($resourceTypeNode["url"])) {
-            $this->_url = $resourceTypeNode["url"];
-        }
-
-        if (!strlen($this->_url)) {
-            $this->_url = "/";
-        }
-        else if(substr($this->_url,-1,1) != "/") {
-            $this->_url .= "/";
-        }
-
-        if (isset($resourceTypeNode["maxSize"])) {
-            $this->_maxSize = CKFinder_Connector_Utils_Misc::returnBytes((string)$resourceTypeNode["maxSize"]);
-        }
-
-        if (isset($resourceTypeNode["directory"])) {
-            $this->_directory = $resourceTypeNode["directory"];
-        }
-
-        if (!strlen($this->_directory)) {
-            $this->_directory = resolveUrl($this->_url);
-        }
-
-        if (isset($resourceTypeNode["allowedExtensions"])) {
-            if (is_array($resourceTypeNode["allowedExtensions"])) {
-                foreach ($resourceTypeNode["allowedExtensions"] as $e) {
-                    $this->_allowedExtensions[] = strtolower(trim((string)$e));
-                }
-            }
-            else {
-                $resourceTypeNode["allowedExtensions"] = trim((string)$resourceTypeNode["allowedExtensions"]);
-                if (strlen($resourceTypeNode["allowedExtensions"])) {
-                    $extensions = explode(",", $resourceTypeNode["allowedExtensions"]);
-                    foreach ($extensions as $e) {
-                        $this->_allowedExtensions[] = strtolower(trim($e));
-                    }
-                }
-            }
-        }
-
-        if (isset($resourceTypeNode["deniedExtensions"])) {
-            if (is_array($resourceTypeNode["deniedExtensions"])) {
-
-                foreach ($resourceTypeNode["deniedExtensions"] as $extension) {
-                    $this->_deniedExtensions[] = strtolower(trim((string)$e));
-                }
-            }
-            else {
-                $resourceTypeNode["deniedExtensions"] = trim((string)$resourceTypeNode["deniedExtensions"]);
-                if (strlen($resourceTypeNode["deniedExtensions"])) {
-                    $extensions = explode(",", $resourceTypeNode["deniedExtensions"]);
-                    foreach ($extensions as $e) {
-                        $this->_deniedExtensions[] = strtolower(trim($e));
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Get name
-     *
-     * @access public
-     * @return string
-     */
-    function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Get url
-     *
-     * @access public
-     * @return string
-     */
-    function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * Get directory
-     *
-     * @access public
-     * @return string
-     */
-    function getDirectory()
-    {
-        return $this->_directory;
-    }
-
-    /**
-     * Get max size
-     *
-     * @access public
-     * @return int
-     */
-    function getMaxSize()
-    {
-        return $this->_maxSize;
-    }
-
-    /**
-     * Get allowed extensions
-     *
-     * @access public
-     * @return array[]string
-     */
-    function getAllowedExtensions()
-    {
-        return $this->_allowedExtensions;
-    }
-
-    /**
-     * Get denied extensions
-     *
-     * @access public
-     * @return array[]string
-     */
-    function getDeniedExtensions()
-    {
-        return $this->_deniedExtensions;
-    }
-
-    /**
-     * Check extension, return true if file name is valid.
-     * Return false if extension is on denied list.
-     * If allowed extensions are defined, return false if extension isn't on allowed list.
-     *
-     * @access public
-     * @param string $extension extension
-     * @param boolean $renameIfRequired whether try to rename file or not
-     * @return boolean
-     */
-    function checkExtension(&$fileName, $renameIfRequired = true)
-    {
-        if (strpos($fileName, '.') === false) {
-            return true;
-        }
-
-        if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        }
-
-        $toCheck = array();
-
-        if ($this->_config->getCheckDoubleExtension()) {
-            $pieces = explode('.', $fileName);
-
-            // First, check the last extension (ex. in file.php.jpg, the "jpg").
-            if ( !$this->checkSingleExtension( $pieces[sizeof($pieces)-1] ) ) {
-                return false;
-            }
-
-            if ($renameIfRequired) {
-                // Check the other extensions, rebuilding the file name. If an extension is
-                // not allowed, replace the dot with an underscore.
-                $fileName = $pieces[0] ;
-                for ($i=1; $i<sizeof($pieces)-1; $i++) {
-                    $fileName .= $this->checkSingleExtension( $pieces[$i] ) ? '.' : '_' ;
-                    $fileName .= $pieces[$i];
-                }
-
-                // Add the last extension to the final name.
-                $fileName .= '.' . $pieces[sizeof($pieces)-1] ;
-            }
-        }
-        else {
-            // Check only the last extension (ex. in file.php.jpg, only "jpg").
-            return $this->checkSingleExtension( substr($fileName, strrpos($fileName,'.')+1) );
-        }
-
-        return true;
-    }
-
-    /**
-     * Check given folder name
-     * Return true if folder name matches hidden folder names list
-     *
-     * @param string $folderName
-     * @access public
-     * @return boolean
-     */
-    function checkIsHiddenFolder($folderName)
-    {
-        if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        }
-
-        $regex = $this->_config->getHideFoldersRegex();
-        if ($regex) {
-            return preg_match($regex, $folderName);
-        }
-
-        return false;
-    }
-
-    /**
-     * Check given file name
-     * Return true if file name matches hidden file names list
-     *
-     * @param string $fileName
-     * @access public
-     * @return boolean
-     */
-    function checkIsHiddenFile($fileName)
-    {
-        if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        }
-
-        $regex = $this->_config->getHideFilesRegex();
-        if ($regex) {
-            return preg_match($regex, $fileName);
-        }
-
-        return false;
-    }
-
-    /**
-     * Check given path
-     * Return true if path contains folder name that matches hidden folder names list
-     *
-     * @param string $folderName
-     * @access public
-     * @return boolean
-     */
-    function checkIsHiddenPath($path)
-    {
-        $_clientPathParts = explode("/", trim($path, "/"));
-        if ($_clientPathParts) {
-            foreach ($_clientPathParts as $_part) {
-                if ($this->checkIsHiddenFolder($_part)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    function checkSingleExtension($extension)
-    {
-        $extension = strtolower(ltrim($extension,'.'));
-
-        if (sizeof($this->_deniedExtensions)) {
-            if (in_array($extension, $this->_deniedExtensions)) {
-                return false;
-            }
-        }
-
-        if (sizeof($this->_allowedExtensions)) {
-            return in_array($extension, $this->_allowedExtensions);
-        }
-
-        return true;
-    }
+	/**
+	 * Resource name
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_name = "";
+	/**
+	 * Resource url
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_url = "";
+	/**
+	 * Directory path on a server
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_directory = "";
+	/**
+	 * Max size
+	 *
+	 * @var unknown_type
+	 * @access private
+	 */
+	var $_maxSize = 0;
+	/**
+	 * Array with allowed extensions
+	 *
+	 * @var array[]string
+	 * @access private
+	 */
+	var $_allowedExtensions = array();
+	/**
+	 * Array with denied extensions
+	 *
+	 * @var array[]string
+	 * @access private
+	 */
+	var $_deniedExtensions = array();
+	/**
+	 * used for CKFinder_Connector_Core_Config object caching
+	 *
+	 * @var CKFinder_Connector_Core_Config
+	 * @access private
+	 */
+	var $_config;
+
+	/**
+	 * Get ResourceType configuration
+	 *
+	 * @param string $resourceTypeNode
+	 * @return array
+	 *
+	 */
+	function CKFinder_Connector_Core_ResourceTypeConfig($resourceTypeNode)
+	{
+		if (isset($resourceTypeNode["name"])) {
+			$this->_name = $resourceTypeNode["name"];
+		}
+
+		if (isset($resourceTypeNode["url"])) {
+			$this->_url = $resourceTypeNode["url"];
+		}
+
+		if (!strlen($this->_url)) {
+			$this->_url = "/";
+		}
+		else if(substr($this->_url,-1,1) != "/") {
+			$this->_url .= "/";
+		}
+
+		if (isset($resourceTypeNode["maxSize"])) {
+			$this->_maxSize = CKFinder_Connector_Utils_Misc::returnBytes((string)$resourceTypeNode["maxSize"]);
+		}
+
+		if (isset($resourceTypeNode["directory"])) {
+			$this->_directory = $resourceTypeNode["directory"];
+		}
+
+		if (!strlen($this->_directory)) {
+			$this->_directory = resolveUrl($this->_url);
+		}
+
+		if (isset($resourceTypeNode["allowedExtensions"])) {
+			if (is_array($resourceTypeNode["allowedExtensions"])) {
+				foreach ($resourceTypeNode["allowedExtensions"] as $e) {
+					$this->_allowedExtensions[] = strtolower(trim((string)$e));
+				}
+			}
+			else {
+				$resourceTypeNode["allowedExtensions"] = trim((string)$resourceTypeNode["allowedExtensions"]);
+				if (strlen($resourceTypeNode["allowedExtensions"])) {
+					$extensions = explode(",", $resourceTypeNode["allowedExtensions"]);
+					foreach ($extensions as $e) {
+						$this->_allowedExtensions[] = strtolower(trim($e));
+					}
+				}
+			}
+		}
+
+		if (isset($resourceTypeNode["deniedExtensions"])) {
+			if (is_array($resourceTypeNode["deniedExtensions"])) {
+
+				foreach ($resourceTypeNode["deniedExtensions"] as $extension) {
+					$this->_deniedExtensions[] = strtolower(trim((string)$e));
+				}
+			}
+			else {
+				$resourceTypeNode["deniedExtensions"] = trim((string)$resourceTypeNode["deniedExtensions"]);
+				if (strlen($resourceTypeNode["deniedExtensions"])) {
+					$extensions = explode(",", $resourceTypeNode["deniedExtensions"]);
+					foreach ($extensions as $e) {
+						$this->_deniedExtensions[] = strtolower(trim($e));
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get name
+	 *
+	 * @access public
+	 * @return string
+	 */
+	function getName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * Get url
+	 *
+	 * @access public
+	 * @return string
+	 */
+	function getUrl()
+	{
+		return $this->_url;
+	}
+
+	/**
+	 * Get directory
+	 *
+	 * @access public
+	 * @return string
+	 */
+	function getDirectory()
+	{
+		return $this->_directory;
+	}
+
+	/**
+	 * Get max size
+	 *
+	 * @access public
+	 * @return int
+	 */
+	function getMaxSize()
+	{
+		return $this->_maxSize;
+	}
+
+	/**
+	 * Get allowed extensions
+	 *
+	 * @access public
+	 * @return array[]string
+	 */
+	function getAllowedExtensions()
+	{
+		return $this->_allowedExtensions;
+	}
+
+	/**
+	 * Get denied extensions
+	 *
+	 * @access public
+	 * @return array[]string
+	 */
+	function getDeniedExtensions()
+	{
+		return $this->_deniedExtensions;
+	}
+
+	/**
+	 * Check extension, return true if file name is valid.
+	 * Return false if extension is on denied list.
+	 * If allowed extensions are defined, return false if extension isn't on allowed list.
+	 *
+	 * @access public
+	 * @param string $extension extension
+	 * @param boolean $renameIfRequired whether try to rename file or not
+	 * @return boolean
+	 */
+	function checkExtension(&$fileName, $renameIfRequired = true)
+	{
+		if (strpos($fileName, '.') === false) {
+			return true;
+		}
+
+		if (is_null($this->_config)) {
+			$this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		}
+
+		$toCheck = array();
+
+		if ($this->_config->getCheckDoubleExtension()) {
+			$pieces = explode('.', $fileName);
+
+			// First, check the last extension (ex. in file.php.jpg, the "jpg").
+			if ( !$this->checkSingleExtension( $pieces[sizeof($pieces)-1] ) ) {
+				return false;
+			}
+
+			if ($renameIfRequired) {
+				// Check the other extensions, rebuilding the file name. If an extension is
+				// not allowed, replace the dot with an underscore.
+				$fileName = $pieces[0] ;
+				for ($i=1; $i<sizeof($pieces)-1; $i++) {
+					$fileName .= $this->checkSingleExtension( $pieces[$i] ) ? '.' : '_' ;
+					$fileName .= $pieces[$i];
+				}
+
+				// Add the last extension to the final name.
+				$fileName .= '.' . $pieces[sizeof($pieces)-1] ;
+			}
+		}
+		else {
+			// Check only the last extension (ex. in file.php.jpg, only "jpg").
+			return $this->checkSingleExtension( substr($fileName, strrpos($fileName,'.')+1) );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check given folder name
+	 * Return true if folder name matches hidden folder names list
+	 *
+	 * @param string $folderName
+	 * @access public
+	 * @return boolean
+	 */
+	function checkIsHiddenFolder($folderName)
+	{
+		if (is_null($this->_config)) {
+			$this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		}
+
+		$regex = $this->_config->getHideFoldersRegex();
+		if ($regex) {
+			return preg_match($regex, $folderName);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check given file name
+	 * Return true if file name matches hidden file names list
+	 *
+	 * @param string $fileName
+	 * @access public
+	 * @return boolean
+	 */
+	function checkIsHiddenFile($fileName)
+	{
+		if (is_null($this->_config)) {
+			$this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		}
+
+		$regex = $this->_config->getHideFilesRegex();
+		if ($regex) {
+			return preg_match($regex, $fileName);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check given path
+	 * Return true if path contains folder name that matches hidden folder names list
+	 *
+	 * @param string $folderName
+	 * @access public
+	 * @return boolean
+	 */
+	function checkIsHiddenPath($path)
+	{
+		$_clientPathParts = explode("/", trim($path, "/"));
+		if ($_clientPathParts) {
+			foreach ($_clientPathParts as $_part) {
+				if ($this->checkIsHiddenFolder($_part)) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	function checkSingleExtension($extension)
+	{
+		$extension = strtolower(ltrim($extension,'.'));
+
+		if (sizeof($this->_deniedExtensions)) {
+			if (in_array($extension, $this->_deniedExtensions)) {
+				return false;
+			}
+		}
+
+		if (sizeof($this->_allowedExtensions)) {
+			return in_array($extension, $this->_allowedExtensions);
+		}
+
+		return true;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -97,7 +97,7 @@ 
         if (!strlen($this->_url)) {
             $this->_url = "/";
         }
-        else if(substr($this->_url,-1,1) != "/") {
+        else if (substr($this->_url, -1, 1) != "/") {
             $this->_url .= "/";
         }
 
@@ -232,7 +232,7 @@ 
         }
 
         if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+            $this->_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         }
 
         $toCheck = array();
@@ -241,26 +241,26 @@ 
             $pieces = explode('.', $fileName);
 
             // First, check the last extension (ex. in file.php.jpg, the "jpg").
-            if ( !$this->checkSingleExtension( $pieces[sizeof($pieces)-1] ) ) {
+            if (!$this->checkSingleExtension($pieces[sizeof($pieces) - 1])) {
                 return false;
             }
 
             if ($renameIfRequired) {
                 // Check the other extensions, rebuilding the file name. If an extension is
                 // not allowed, replace the dot with an underscore.
-                $fileName = $pieces[0] ;
-                for ($i=1; $i<sizeof($pieces)-1; $i++) {
-                    $fileName .= $this->checkSingleExtension( $pieces[$i] ) ? '.' : '_' ;
+                $fileName = $pieces[0];
+                for ($i = 1; $i < sizeof($pieces) - 1; $i++) {
+                    $fileName .= $this->checkSingleExtension($pieces[$i]) ? '.' : '_';
                     $fileName .= $pieces[$i];
                 }
 
                 // Add the last extension to the final name.
-                $fileName .= '.' . $pieces[sizeof($pieces)-1] ;
+                $fileName .= '.'.$pieces[sizeof($pieces) - 1];
             }
         }
         else {
             // Check only the last extension (ex. in file.php.jpg, only "jpg").
-            return $this->checkSingleExtension( substr($fileName, strrpos($fileName,'.')+1) );
+            return $this->checkSingleExtension(substr($fileName, strrpos($fileName, '.') + 1));
         }
 
         return true;
@@ -277,7 +277,7 @@ 
     function checkIsHiddenFolder($folderName)
     {
         if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+            $this->_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         }
 
         $regex = $this->_config->getHideFoldersRegex();
@@ -299,7 +299,7 @@ 
     function checkIsHiddenFile($fileName)
     {
         if (is_null($this->_config)) {
-            $this->_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+            $this->_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         }
 
         $regex = $this->_config->getHideFilesRegex();
@@ -334,7 +334,7 @@ 
 
     function checkSingleExtension($extension)
     {
-        $extension = strtolower(ltrim($extension,'.'));
+        $extension = strtolower(ltrim($extension, '.'));
 
         if (sizeof($this->_deniedExtensions)) {
             if (in_array($extension, $this->_deniedExtensions)) {

Braces +7 added lines, -9 removed lines

@@ -10,7 +10,9 @@ 
  * modifying or distribute this file or part of its contents. The contents of
  * this file is part of the Source Code of CKFinder.
  */
-if (!defined('IN_CKFINDER')) exit;
+if (!defined('IN_CKFINDER')) {
+	exit;
+}
 
 /**
  * @package CKFinder
@@ -96,8 +98,7 @@ 
 
         if (!strlen($this->_url)) {
             $this->_url = "/";
-        }
-        else if(substr($this->_url,-1,1) != "/") {
+        } else if(substr($this->_url,-1,1) != "/") {
             $this->_url .= "/";
         }
 
@@ -118,8 +119,7 @@ 
                 foreach ($resourceTypeNode["allowedExtensions"] as $e) {
                     $this->_allowedExtensions[] = strtolower(trim((string)$e));
                 }
-            }
-            else {
+            } else {
                 $resourceTypeNode["allowedExtensions"] = trim((string)$resourceTypeNode["allowedExtensions"]);
                 if (strlen($resourceTypeNode["allowedExtensions"])) {
                     $extensions = explode(",", $resourceTypeNode["allowedExtensions"]);
@@ -136,8 +136,7 @@ 
                 foreach ($resourceTypeNode["deniedExtensions"] as $extension) {
                     $this->_deniedExtensions[] = strtolower(trim((string)$e));
                 }
-            }
-            else {
+            } else {
                 $resourceTypeNode["deniedExtensions"] = trim((string)$resourceTypeNode["deniedExtensions"]);
                 if (strlen($resourceTypeNode["deniedExtensions"])) {
                     $extensions = explode(",", $resourceTypeNode["deniedExtensions"]);
@@ -257,8 +256,7 @@ 
                 // Add the last extension to the final name.
                 $fileName .= '.' . $pieces[sizeof($pieces)-1] ;
             }
-        }
-        else {
+        } else {
             // Check only the last extension (ex. in file.php.jpg, only "jpg").
             return $this->checkSingleExtension( substr($fileName, strrpos($fileName,'.')+1) );
         }

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

Doc Comments +1 added lines, -1 removed lines

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

Indentation +37 added lines, -37 removed lines

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

Spacing +3 added lines, -3 removed lines

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

Braces +4 added lines, -3 removed lines

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

libs/ckfinder/core/connector/php/php4/ErrorHandler/QuickUpload.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +37 added lines, -37 removed lines

@@ -32,52 +32,52 @@
  */
 class CKFinder_Connector_ErrorHandler_QuickUpload 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, $uploaded = false, $exit = true) {
-        if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
-            return false;
-        }
+	/**
+	 * Throw file upload error, return true if error has been thrown, false if error has been catched
+	 *
+	 * @param int $number
+	 * @param string $text
+	 * @access public
+	 */
+	function throwError($number, $uploaded = false, $exit = true) {
+		if ($this->_catchAllErrors || in_array($number, $this->_skipErrorsArray)) {
+			return false;
+		}
 
-        $oRegistry = & CKFinder_Connector_Core_Factory :: getInstance("Core_Registry");
-        $sFileName = $oRegistry->get("FileUpload_fileName");
-        $sFileUrl = $oRegistry->get("FileUpload_url");
+		$oRegistry = & CKFinder_Connector_Core_Factory :: getInstance("Core_Registry");
+		$sFileName = $oRegistry->get("FileUpload_fileName");
+		$sFileUrl = $oRegistry->get("FileUpload_url");
 
-        header('Content-Type: text/html; charset=utf-8');
+		header('Content-Type: text/html; charset=utf-8');
 
 		/**
 		 * echo <script> is not called before CKFinder_Connector_Utils_Misc::getErrorMessage
 		 * because PHP has problems with including files that contain BOM character.
 		 * Having BOM character after <script> tag causes a javascript error.
 		 */
-        echo "<script type=\"text/javascript\">";
-        if (!empty($_GET['CKEditor'])) {
-            $errorMessage = CKFinder_Connector_Utils_Misc::getErrorMessage($number, $sFileName);
+		echo "<script type=\"text/javascript\">";
+		if (!empty($_GET['CKEditor'])) {
+			$errorMessage = CKFinder_Connector_Utils_Misc::getErrorMessage($number, $sFileName);
 
-            if (!$uploaded) {
-                $sFileUrl = "";
-                $sFileName = "";
-            }
+			if (!$uploaded) {
+				$sFileUrl = "";
+				$sFileName = "";
+			}
 
-            $funcNum = preg_replace("/[^0-9]/", "", $_GET['CKEditorFuncNum']);
-            echo "window.parent.CKEDITOR.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
-        }
-        else {
-            if (!$uploaded) {
-                echo "window.parent.OnUploadCompleted(" . $number . ", '', '', '') ;";
-            } else {
-                echo "window.parent.OnUploadCompleted(" . $number . ", '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" . str_replace("'", "\\'", $sFileName) . "', '') ;";
-            }
-        }
-        echo "</script>";
+			$funcNum = preg_replace("/[^0-9]/", "", $_GET['CKEditorFuncNum']);
+			echo "window.parent.CKEDITOR.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
+		}
+		else {
+			if (!$uploaded) {
+				echo "window.parent.OnUploadCompleted(" . $number . ", '', '', '') ;";
+			} else {
+				echo "window.parent.OnUploadCompleted(" . $number . ", '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" . str_replace("'", "\\'", $sFileName) . "', '') ;";
+			}
+		}
+		echo "</script>";
 
-        if ($exit) {
-            exit;
-        }
-    }
+		if ($exit) {
+			exit;
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

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

Braces +4 added lines, -3 removed lines

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