Piou-piou / ribs-framework

core/images/Images.class.php

Doc Comments +2 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
 		 * @param $old_image_req
 		 * @param int $autorize_empty
 		 * @param int $delete_old_img
-		 * @return bool|string -> renvoi false si err sinon renvoi le chemin vers l'img
+		 * @return null|boolean -> renvoi false si err sinon renvoi le chemin vers l'img
 		 */
 		public function setEnvoyerImage($name, $old_image_req=null, $autorize_empty=1, $delete_old_img=1) {
 			$dbc = \core\App::getDb();
@@ -178,9 +178,7 @@ 
 
 		/**
 		 * fonction qui permet de supprimer une image en fonction d'une requete ou de la variable old_image
-		 * @param null $chemin_img
-		 * @param null $req_image
-		 * @return bool
+		 * @return boolean|null
 		 */
 		public function setDeleteImage($nom_image=null) {
 			//si pas de requete et qu'on a une old_img on la supprime

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 	namespace core\images;
 
 	use core\App;
-	use core\HTML\flashmessage\FlashMessage;
 
 	class Images {
 		//initialisée pour le bon fonctionnement de la class

Indentation +3 added lines, -3 removed lines

@@ -43,13 +43,13 @@
 		//-------------------------- GETTER ----------------------------------------------------------------------------//
 
 		public function getOldImage() {
-		    return $this->old_image;
+			return $this->old_image;
 		}
 		public function getCheminImage() {
-		    return $this->chemin_image;
+			return $this->chemin_image;
 		}
 		public function getErreur() {
-		    return $this->erreur;
+			return $this->erreur;
 		}
 		public function getNomImage() {
 			return $this->nom_image;

Spacing +4 added lines, -4 removed lines

@@ -76,7 +76,7 @@ 
 		 * @param int $delete_old_img
 		 * @return bool|string -> renvoi false si err sinon renvoi le chemin vers l'img
 		 */
-		public function setEnvoyerImage($name, $old_image_req=null, $autorize_empty=1, $delete_old_img=1) {
+		public function setEnvoyerImage($name, $old_image_req = null, $autorize_empty = 1, $delete_old_img = 1) {
 			$dbc = \core\App::getDb();
 
 			$this->old_image = null;
@@ -146,7 +146,7 @@ 
 		 * @param null $req_img
 		 * @return string
 		 */
-		public function setResizeImage($width, $height, $prefixe, $delete_old=1, $req_img=null) {
+		public function setResizeImage($width, $height, $prefixe, $delete_old = 1, $req_img = null) {
 			if (($req_img == null) && ($this->chemin_image != "")) {
 				$this->getImage();
 
@@ -182,7 +182,7 @@ 
 		 * @param null $req_image
 		 * @return bool
 		 */
-		public function setDeleteImage($nom_image=null) {
+		public function setDeleteImage($nom_image = null) {
 			//si pas de requete et qu'on a une old_img on la supprime
 			if (($this->old_image != "") && ($nom_image == null)) {
 				$old_image = explode("/", $this->old_image);
@@ -196,7 +196,7 @@ 
 			else if ($nom_image != null) {
 
 				if (is_array($nom_image)) {
-					for ($i=0 ; $i<count($nom_image) ; $i++) {
+					for ($i = 0; $i < count($nom_image); $i++) {
 						$chemin_img = $this->dossier_image."/".$nom_image[$i];
 
 						if (unlink($chemin_img)) {

Braces +13 added lines, -26 removed lines

@@ -59,8 +59,7 @@ 
 				$explode = explode("/", $this->chemin_image);
 				$this->image = end($explode);
 				return $this->image;
-			}
-			else {
+			} else {
 				$this->erreur = "Impossible de trouver votre image, vuellez réessayer dans un instant";
 				return false;
 			}
@@ -90,8 +89,7 @@ 
 					$this->erreur = "Vous devez obligatoirement ajouter une image";
 					return false;
 				}
-			}
-			else {
+			} else {
 				//test si il y a deja une img
 				if ($old_image_req != null) {
 					$query = $dbc->query($old_image_req);
@@ -109,12 +107,10 @@ 
 				if (!in_array(substr($image, -3), $this->autorized_extention)) {
 					$this->erreur = "Votre image ne comporte pas l'extension jpg, png, jpeg, gif, JPG, PNG, JPEG, GIF";
 					return false;
-				}
-				else if (($infos_img[0] >= $this->width_max) && ($infos_img[1] >= $this->height_max) && ($_FILES[$name]['size'] >= $this->poid_max)) {
+				} else if (($infos_img[0] >= $this->width_max) && ($infos_img[1] >= $this->height_max) && ($_FILES[$name]['size'] >= $this->poid_max)) {
 					$this->erreur = "Problème dans les dimensions ou taille de l'image.";
 					return false;
-				}
-				else {
+				} else {
 					$uniqid = uniqid();
 
 					if (move_uploaded_file($_FILES[$name]['tmp_name'], $this->dossier_image."/".$uniqid.substr($image, -4))) {
@@ -129,8 +125,7 @@ 
 						}
 
 						return true;
-					}
-					else {
+					} else {
 						$this->erreur = "Impossible d'envoyer votre image sur le serveur, veuillez réessayer dans une instant, si l'erreur se reproduit, contactez votre administrateur";
 					}
 				}
@@ -157,8 +152,7 @@ 
 				$image = $this->dossier_image."/".$img_resize;
 
 				$this->nom_image = $img_resize;
-			}
-			else {
+			} else {
 
 				$this->nom_image = null;
 				/*$resize = new resize($urlimg);
@@ -192,8 +186,7 @@ 
 					unlink($this->dossier_image."/".end($old_image));
 					return true;
 				}
-			}
-			else if ($nom_image != null) {
+			} else if ($nom_image != null) {
 
 				if (is_array($nom_image)) {
 					for ($i=0 ; $i<count($nom_image) ; $i++) {
@@ -201,27 +194,22 @@ 
 
 						if (unlink($chemin_img)) {
 							$success = true;
-						}
-						else {
+						} else {
 							if (unlink($this->chemin_image)) {
 								$success = true;
-							}
-							else {
+							} else {
 								$this->erreur = "Impossible de supprimer cette image, veuillez réesayer dans un instant, sinon contacter l'administrateur de votre site";
 								$success = false;
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					if (unlink($this->dossier_image."/".$nom_image)) {
 						$success = true;
-					}
-					else {
+					} else {
 						if (unlink($this->chemin_image)) {
 							$success = true;
-						}
-						else {
+						} else {
 							$this->erreur = "Impossible de supprimer cette image, veuillez réesayer dans un instant, sinon contacter l'administrateur de votre site";
 							$success = false;
 						}
@@ -229,8 +217,7 @@ 
 				}
 
 				return $success;
-			}
-			else {
+			} else {
 				$this->erreur = "Impossible de supprimer cette image";
 				return false;
 			}

core/images/Resize.class.php

Doc Comments +6 added lines

@@ -25,6 +25,9 @@ 
 		    private $height;
 			private $imageResized;
 
+			/**
+			 * @param string|null $fileName
+			 */
 			function __construct($fileName)
 			{
 				// *** Open up the file
@@ -85,6 +88,9 @@ 
 
 			## --------------------------------------------------------
 			
+			/**
+			 * @param string $option
+			 */
 			private function getDimensions($newWidth, $newHeight, $option)
 			{
 

Indentation +7 added lines, -7 removed lines

@@ -21,8 +21,8 @@ 
 		{
 			// *** Class variables
 			private $image;
-		    private $width;
-		    private $height;
+			private $width;
+			private $height;
 			private $imageResized;
 
 			function __construct($fileName)
@@ -30,9 +30,9 @@ 
 				// *** Open up the file
 				$this->image = $this->openImage($fileName);
 
-			    // *** Get width and height
-			    $this->width  = imagesx($this->image);
-			    $this->height = imagesy($this->image);
+				// *** Get width and height
+				$this->width  = imagesx($this->image);
+				$this->height = imagesy($this->image);
 			}
 
 			## --------------------------------------------------------
@@ -206,8 +206,8 @@ 
 			public function saveImage($savePath, $imageQuality="100")
 			{
 				// *** Get extension
-        		$extension = strrchr($savePath, '.');
-       			$extension = strtolower($extension);
+				$extension = strrchr($savePath, '.');
+	   			$extension = strtolower($extension);
 
 				switch($extension)
 				{

Spacing +19 added lines, -19 removed lines

@@ -42,7 +42,7 @@ 
 				// *** Get extension
 				$extension = strtolower(strrchr($file, '.'));
 
-				switch($extension)
+				switch ($extension)
 				{
 					case '.jpg':
 					case '.jpeg':
@@ -63,7 +63,7 @@ 
 
 			## --------------------------------------------------------
 
-			public function resizeImage($newWidth, $newHeight, $option="auto")
+			public function resizeImage($newWidth, $newHeight, $option = "auto")
 			{
 				// *** Get optimal width and height - based on $option
 				$optionArray = $this->getDimensions($newWidth, $newHeight, $option);
@@ -92,15 +92,15 @@ 
 				{
 					case 'exact':
 						$optimalWidth = $newWidth;
-						$optimalHeight= $newHeight;
+						$optimalHeight = $newHeight;
 						break;
 					case 'portrait':
 						$optimalWidth = $this->getSizeByFixedHeight($newHeight);
-						$optimalHeight= $newHeight;
+						$optimalHeight = $newHeight;
 						break;
 					case 'landscape':
 						$optimalWidth = $newWidth;
-						$optimalHeight= $this->getSizeByFixedWidth($newWidth);
+						$optimalHeight = $this->getSizeByFixedWidth($newWidth);
 						break;
 					case 'auto':
 						$optionArray = $this->getSizeByAuto($newWidth, $newHeight);
@@ -138,27 +138,27 @@ 
 				// *** Image to be resized is wider (landscape)
 				{
 					$optimalWidth = $newWidth;
-					$optimalHeight= $this->getSizeByFixedWidth($newWidth);
+					$optimalHeight = $this->getSizeByFixedWidth($newWidth);
 				}
 				elseif ($this->height > $this->width)
 				// *** Image to be resized is taller (portrait)
 				{
 					$optimalWidth = $this->getSizeByFixedHeight($newHeight);
-					$optimalHeight= $newHeight;
+					$optimalHeight = $newHeight;
 				}
 				else
 				// *** Image to be resizerd is a square
 				{
 					if ($newHeight < $newWidth) {
 						$optimalWidth = $newWidth;
-						$optimalHeight= $this->getSizeByFixedWidth($newWidth);
+						$optimalHeight = $this->getSizeByFixedWidth($newWidth);
 					} else if ($newHeight > $newWidth) {
 						$optimalWidth = $this->getSizeByFixedHeight($newHeight);
-						$optimalHeight= $newHeight;
+						$optimalHeight = $newHeight;
 					} else {
 						// *** Sqaure being resized to a square
 						$optimalWidth = $newWidth;
-						$optimalHeight= $newHeight;
+						$optimalHeight = $newHeight;
 					}
 				}
 
@@ -171,7 +171,7 @@ 
 			{
 
 				$heightRatio = $this->height / $newHeight;
-				$widthRatio  = $this->width /  $newWidth;
+				$widthRatio  = $this->width / $newWidth;
 
 				if ($heightRatio < $widthRatio) {
 					$optimalRatio = $heightRatio;
@@ -180,7 +180,7 @@ 
 				}
 
 				$optimalHeight = $this->height / $optimalRatio;
-				$optimalWidth  = $this->width  / $optimalRatio;
+				$optimalWidth  = $this->width / $optimalRatio;
 
 				return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight);
 			}
@@ -190,26 +190,26 @@ 
 			private function crop($optimalWidth, $optimalHeight, $newWidth, $newHeight)
 			{
 				// *** Find center - this will be used for the crop
-				$cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
-				$cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+				$cropStartX = ($optimalWidth / 2) - ($newWidth / 2);
+				$cropStartY = ($optimalHeight / 2) - ($newHeight / 2);
 
 				$crop = $this->imageResized;
 				//imagedestroy($this->imageResized);
 
 				// *** Now crop from center to exact requested size
-				$this->imageResized = imagecreatetruecolor($newWidth , $newHeight);
-				imagecopyresampled($this->imageResized, $crop , 0, 0, $cropStartX, $cropStartY, $newWidth, $newHeight , $newWidth, $newHeight);
+				$this->imageResized = imagecreatetruecolor($newWidth, $newHeight);
+				imagecopyresampled($this->imageResized, $crop, 0, 0, $cropStartX, $cropStartY, $newWidth, $newHeight, $newWidth, $newHeight);
 			}
 
 			## --------------------------------------------------------
 
-			public function saveImage($savePath, $imageQuality="100")
+			public function saveImage($savePath, $imageQuality = "100")
 			{
 				// *** Get extension
         		$extension = strrchr($savePath, '.');
        			$extension = strtolower($extension);
 
-				switch($extension)
+				switch ($extension)
 				{
 					case '.jpg':
 					case '.jpeg':
@@ -226,7 +226,7 @@ 
 
 					case '.png':
 						// *** Scale quality from 0-100 to 0-9
-						$scaleQuality = round(($imageQuality/100) * 9);
+						$scaleQuality = round(($imageQuality / 100) * 9);
 
 						// *** Invert quality setting as 0 is best, not 9
 						$invertScaleQuality = 9 - $scaleQuality;

Braces +7 added lines, -7 removed lines

@@ -134,19 +134,19 @@
 
 			private function getSizeByAuto($newWidth, $newHeight)
 			{
-				if ($this->height < $this->width)
-				// *** Image to be resized is wider (landscape)
+				if ($this->height < $this->width) {
+								// *** Image to be resized is wider (landscape)
 				{
 					$optimalWidth = $newWidth;
-					$optimalHeight= $this->getSizeByFixedWidth($newWidth);
 				}
-				elseif ($this->height > $this->width)
-				// *** Image to be resized is taller (portrait)
+					$optimalHeight= $this->getSizeByFixedWidth($newWidth);
+				} elseif ($this->height > $this->width) {
+								// *** Image to be resized is taller (portrait)
 				{
 					$optimalWidth = $this->getSizeByFixedHeight($newHeight);
-					$optimalHeight= $newHeight;
 				}
-				else
+					$optimalHeight= $newHeight;
+				} else
 				// *** Image to be resizerd is a square
 				{
 					if ($newHeight < $newWidth) {

core/modules/GestionModule.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
 
 		/**
 		 * @param $nom_module
-		 * @return bool
+		 * @return boolean|null
 		 * return true si le module est activer sinon false
 		 */
 		public static function getModuleActiver($nom_module) {
@@ -153,7 +153,7 @@ 
 
 		/**
 		 * @param $nom_module
-		 * @return bool
+		 * @return boolean|null
 		 * fonction qui permet de savoir si un module est à jour ou non
 		 * si a jour renvoi true sinon renvoi false
 		 */

Spacing +3 added lines, -3 removed lines

@@ -203,12 +203,12 @@ 
 						$this->nom_fichier = end($explode);
 
 						//on recupere le nom du dossier + extention
-						$explode  = explode(".", $obj->url_telechargement);
+						$explode = explode(".", $obj->url_telechargement);
 						array_pop($explode);
 
 						$version_txt = implode(".", $explode)."_version.txt";
 
-						if(file_get_contents($version_txt) == true) {
+						if (file_get_contents($version_txt) == true) {
 
 							//online pour bdd
 							$version_online_txt = file_get_contents($version_txt);
@@ -275,7 +275,7 @@ 
 		
 		
 		//-------------------------- SETTER ----------------------------------------------------------------------------//
-		private function setListeModuleActiver($id_module, $url, $version, $nom, $icone=null, $url_telechargement=null) {
+		private function setListeModuleActiver($id_module, $url, $version, $nom, $icone = null, $url_telechargement = null) {
 			$this->id_module = $id_module;
 			$this->url = $url;
 			$this->nom = $nom;

Braces +7 added lines, -14 removed lines

@@ -121,12 +121,10 @@ 
 
 				if ($installer == 1) {
 					return true;
-				}
-				else {
+				} else {
 					return false;
 				}
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -144,8 +142,7 @@ 
 			foreach ($query as $obj) {
 				if ($obj->activer == 1) {
 					return true;
-				}
-				else {
+				} else {
 					return false;
 				}
 			}
@@ -165,8 +162,7 @@ 
 			foreach ($query as $obj) {
 				if ($obj->mettre_jour == 1) {
 					return false;
-				}
-				else {
+				} else {
 					return true;
 				}
 			}
@@ -189,8 +185,7 @@ 
 						//si pas de version a checker, cela veut dire qu'on vient d'installer le module
 						//du coup on met le next_check aa la semaine pro
 						$set_next = true;
-					}
-					else if (($obj->next_check_version <= $today) && ($obj->mettre_jour != 1)) {
+					} else if (($obj->next_check_version <= $today) && ($obj->mettre_jour != 1)) {
 						//avant tout on regarde si on doit delete une vieille version
 						if ($obj->delete_old_version == 1) {
 							$import = new ImportModule();
@@ -232,8 +227,7 @@ 
 								$dbc->prepare("UPDATE module SET mettre_jour=:update, online_version=:online_version WHERE ID_module=:id_module", $value);
 
 								$set_next = true;
-							}
-							else {
+							} else {
 								$set_next = true;
 							}
 						}
@@ -266,8 +260,7 @@ 
 				$this->setListeModuleMettreJour($nom_module, $version, $online_version);
 
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}

core/modules/ImportModule.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -50,6 +50,7 @@ 
 		/**
 		 * @param $url_module
 		 * fonction qui permets d'importer un module dans notre site internet
+		 * @param boolean $update
 		 */
 		public function setImportModule($url_module, $update=null) {
 			$dbc= App::getDb();
@@ -226,7 +227,7 @@ 
 		}
 
 		/**
-		 * @param $url
+		 * @param string $url
 		 * fonction qui permet de supprmer un dossier avec toute son abrorescence en fonction d'une URL
 		 */
 		private function supprimerDossier($url) {

Spacing +3 added lines, -3 removed lines

@@ -51,15 +51,15 @@
 		 * @param $url_module
 		 * fonction qui permets d'importer un module dans notre site internet
 		 */
-		public function setImportModule($url_module, $update=null) {
-			$dbc= App::getDb();
+		public function setImportModule($url_module, $update = null) {
+			$dbc = App::getDb();
 
 			//avant tout on récupère le nom du fichier pour le mettre dans le dossier temporaire
 			$explode = explode("/", $url_module);
 			$this->nom_fichier = end($explode);
 
 			//on recupere le nom du dossier + extention
-			$explode  = explode(".", $this->nom_fichier);
+			$explode = explode(".", $this->nom_fichier);
 			$this->nom_dossier = $explode[0];
 			$this->extension = $explode[1];
 

Braces +20 added lines, -21 removed lines

@@ -20,8 +20,12 @@ 
 		//-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
 		public function __construct() {
 			//On test si dossier temporaire + modules a la racines existes bien sinon on les crées
-			if (!file_exists(ROOT."temp")) mkdir(ROOT."temp");
-			if (!file_exists(ROOT."modules")) mkdir(ROOT."modules");
+			if (!file_exists(ROOT."temp")) {
+				mkdir(ROOT."temp");
+			}
+			if (!file_exists(ROOT."modules")) {
+				mkdir(ROOT."modules");
+			}
 		}
 		//-------------------------- FIN CONSTRUCTEUR ----------------------------------------------------------------------------//
 		
@@ -81,19 +85,16 @@ 
 
 
 									FlashMessage::setFlash("Votre module a bien été ajouté au site.", "success");
-								}
-								else {
+								} else {
 									\core\HTML\flashmessage\FlashMessage::setFlash("Erreur lors du téléchargement du module, veuillez réessayer dans un instant.");
 									$this->erreur = true;
 								}
-							}
-							else {
+							} else {
 								\core\HTML\flashmessage\FlashMessage::setFlash("Erreur lors du téléchargement du module, veuillez réessayer dans un instant.");
 								$this->setSupprimerArchiveTemp();
 								$this->erreur = true;
 							}
-						}
-						else {
+						} else {
 							\core\HTML\flashmessage\FlashMessage::setFlash("Erreur lors du téléchargement du module, veuillez réessayer dans un instant.");
 							$this->setSupprimerArchiveTemp();
 							$this->erreur = true;
@@ -101,18 +102,15 @@ 
 
 						$zip->close();
 						$this->setSupprimerArchiveTemp();
-					}
-					else {
+					} else {
 						FlashMessage::setFlash("Le module n'a pas pu être correctement téléchargé, veuillez réesseyer dans un instant");
 						$this->erreur = true;
 					}
-				}
-				else {
+				} else {
 					FlashMessage::setFlash("Ce module est déjà présent sur ce site, merci de renommer votre module");
 					$this->erreur = true;
 				}
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("Le format de votre archive doit obligatoirement être un .zip");
 				$this->erreur = true;
 			}
@@ -150,8 +148,7 @@ 
 
 					FlashMessage::setFlash("Votre module a bien été mis à jour", "success");
 				}
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("Impossible de télécharger la mise à jour, veuillez réesseyer dans un instant");
 			}
 		}
@@ -163,8 +160,7 @@ 
 		private function setSupprimerArchiveTemp() {
 			if (unlink(TEMPROOT.$this->nom_fichier) == true) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -191,8 +187,7 @@ 
 				);
 
 				$dbc->prepare("UPDATE module SET activer=:activer, installer=:installer WHERE ID_module=:id_module", $value);
-			}
-			else {
+			} else {
 				$value = array(
 					"id_module" => $id_module,
 				);
@@ -234,7 +229,11 @@ 
 				$objects = scandir($url);
 				foreach ($objects as $object) {
 					if ($object != "." && $object != "..") {
-						if (filetype($url."/".$object) == "dir") $this->supprimerDossier($url."/".$object); else unlink($url."/".$object);
+						if (filetype($url."/".$object) == "dir") {
+							$this->supprimerDossier($url."/".$object);
+						} else {
+							unlink($url."/".$object);
+						}
 					}
 				}
 				reset($objects);

core/modules/RouterModule.class.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 	use core\App;
 	use core\functions\ChaineCaractere;
-	use core\HTML\flashmessage\FlashMessage;
 
 	class RouterModule {
 		//varaibles de base de config

Spacing +3 added lines, -3 removed lines

@@ -48,10 +48,10 @@ 
 		 * @param $url
 		 * @return string
 		 */
-		public function getUrl($url){
+		public function getUrl($url) {
 			$explode = explode("/", $url);
 
-			for ($i=0 ; $i<count($explode) ; $i++) {
+			for ($i = 0; $i < count($explode); $i++) {
 				if (in_array($explode[$i], $this->getAllModules())) {
 					$this->module = $explode[$i];
 					$debut_url = $explode[$i];
@@ -85,7 +85,7 @@ 
 
 			$query = $dbc->query("SELECT * FROM module");
 
-			foreach($query as $obj) {
+			foreach ($query as $obj) {
 				$test_module = ChaineCaractere::FindInString($url, $obj->url);
 				$test_module1 = ChaineCaractere::FindInString($url, str_replace("/", "", $obj->url));
 				$module_activer = \core\modules\GestionModule::getModuleActiver($obj->nom_module);

Braces +4 added lines, -8 removed lines

@@ -55,12 +55,10 @@ 
 				if (in_array($explode[$i], $this->getAllModules())) {
 					$this->module = $explode[$i];
 					$debut_url = $explode[$i];
-				}
-				else if ($i == 1) {
+				} else if ($i == 1) {
 					$centre_url = $explode[$i];
 					$this->page = $explode[$i];
-				}
-				else {
+				} else {
 					$this->parametre = $explode[$i];
 				}
 			}
@@ -93,16 +91,14 @@ 
 				if ((($test_module == true) || ($test_module1 == true)) && ($module_activer == true)) {
 					$error = false;
 					break;
-				}
-				else {
+				} else {
 					$error = true;
 				}
 			}
 
 			if ($error == true) {
 				return false;
-			}
-			else {
+			} else {
 				return true;
 			}
 		}

core/RedirectError.class.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 
 	class RedirectError {
 
+		/**
+		 * @param integer $type
+		 */
 		public static function Redirect($type) {
 			if ($type == 404) {
 				header("HTTP/1.0 404 Not Found");

Unused Use Statements -2 removed lines

@@ -1,8 +1,6 @@
 <?php
 	namespace core;
 
-	use core\functions\ChaineCaractere;
-	use core\HTML\flashmessage\FlashMessage;
 	use core\modules\RouterModule;
 
 	class RedirectError {

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 			}
 
 
-			$find   = 'controller/';
+			$find = 'controller/';
 			$pos = strpos($url, $find);
 
 			if ($pos !== false) {

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
 		public static function testRedirect404($query, $url) {
 			if (is_array($query)) {
 				$count_query = count($query);
-			}
-			else {
+			} else {
 				$count_query = 0;
 			}
 
@@ -37,15 +36,13 @@ 
 
 			if ($pos !== false) {
 				$controller = true;
-			}
-			else {
+			} else {
 				$controller = false;
 			}
 
 			if (($count_query > 0) || ((!is_array($query)) && ($query > 0)) || ($controller == true)) {
 				return true;
-			}
-			else {
+			} else {
 				$router = new RouterModule();
 
 				if ($router->getRouteModuleExist($url) == false) {

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 = "";
             }
         }