Piou-piou / ribs-framework

core/admin/Admin.class.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 	namespace core\admin;
 
 	use core\App;
-	use core\auth\Connexion;
 	use core\auth\Encrypt;
 	use core\auth\Membre;
 	use core\Configuration;

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 		 * Pour récupérer la liste de tous les users afin d'activer un compte ou modifier des trucs dessus
 		 * si archiver == null on récupère les utilisateurs actifs sur le site sinon on récupere les utilisateurs archives
 		 */
-		public function getAllUser($archiver=null) {
+		public function getAllUser($archiver = null) {
 			$dbc = \core\App::getDb();
 			$this->setAllUser(null, null, null, null, null, null, null);
 
@@ -229,7 +229,7 @@ 
 
 			if ($oldimg_profil != "") {
 				$oldimg_profil = explode("/", $oldimg_profil);
-				if($oldimg_profil[7] != "defaut.png") {
+				if ($oldimg_profil[7] != "defaut.png") {
 					unlink("../../images/profil/".$oldimg_profil[7]);
 				}
 			}

Braces +5 added lines, -10 removed lines

@@ -50,8 +50,7 @@ 
 
 			if ($archiver == null) {
 				$query = $dbc->query("SELECT * FROM identite WHERE archiver IS NULL AND ID_identite > 1");
-			}
-			else {
+			} else {
 				$query = $dbc->query("SELECT * FROM identite WHERE archiver IS NOT NULL AND ID_identite > 1");
 			}
 
@@ -67,20 +66,17 @@ 
 
 					if ($obj->img_profil == "") {
 						$img_profil[] = "profil/defaut.png";
-					}
-					else {
+					} else {
 						$img_profil[] = $obj->img_profil;
 					}
 
 					if ($config->getValiderInscription() == 1) {
 						if ($obj->valide == 0) {
 							$valide[] = "<a href=".ADMWEBROOT."controller/core/admin/comptes/valider_compte?id_identite=$obj->ID_identite>Valider cet utilisateur</a>";
-						}
-						else {
+						} else {
 							$valide[] = "Utilisateur validé";
 						}
-					}
-					else {
+					} else {
 						$valide = "";
 					}
 				}
@@ -177,8 +173,7 @@ 
 
 				$mail = new Mail($this->mail);
 				$mail->setEnvoyerMail("Réinitialisation de votre E-mail effectuée", "Votre mot de passe a été réinitialisé");
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("le mot de passe de $this->pseudo ne peu pas être réinitialisé car il ne possède pas d'E-mail");
 				$this->erreur = true;
 			}

core/Configuration.class.php

Doc Comments +4 added lines

@@ -59,6 +59,10 @@
         public function getNomSite(){
             return $this->nom_site;
         }
+
+        /**
+         * @return string|null
+         */
         public function getMailSite(){
             return $this->mail_site;
         }

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
     namespace core;
 
 
-    use core\HTML\flashmessage\FlashMessage;
-
 	class Configuration {
 		//pour la configuration générale du site
         private $nom_site; //-> nom du site

Indentation +44 added lines, -44 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-    namespace core;
+	namespace core;
 
 
-    use core\HTML\flashmessage\FlashMessage;
+	use core\HTML\flashmessage\FlashMessage;
 
 	class Configuration {
 		//pour la configuration générale du site
-        private $nom_site; //-> nom du site
-        private $mail_site; //-> pour le gérant du site contact@nomdedomaine;com
-        private $gerant_site; //->nom du gérant du site
-        private $url_site; //-> url de site
-        private $mail_administrateur; //-> mail de l'administrateur web@clicand.com
+		private $nom_site; //-> nom du site
+		private $mail_site; //-> pour le gérant du site contact@nomdedomaine;com
+		private $gerant_site; //->nom du gérant du site
+		private $url_site; //-> url de site
+		private $mail_administrateur; //-> mail de l'administrateur web@clicand.com
 		private $last_save; //-> derniere sauvegarde de la bdd
 		private $acces_admin; //-> si == 1 on a acces à l'admin
 		private $contenu_dynamique; //->savoir si es contenus sont dynamique (stockés in DB)
@@ -23,24 +23,24 @@ 
 		private $activer_connexion;
 
 
-        //-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
-        public function __construct() {
-            $dbc = \core\App::getDb();
+		//-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
+		public function __construct() {
+			$dbc = \core\App::getDb();
 
 			//pour la configuration générale du site
-            $query = $dbc->query("SELECT * FROM configuration WHERE ID_configuration=1");
-            foreach ($query as $obj) {
-                $this->nom_site = $obj->nom_site;
-                $this->mail_site = $obj->mail_site;
-                $this->gerant_site = $obj->gerant_site;
-                $this->url_site = $obj->url_site;
-                $this->mail_administrateur = $obj->mail_administrateur;
-                $this->last_save = $obj->last_save;
+			$query = $dbc->query("SELECT * FROM configuration WHERE ID_configuration=1");
+			foreach ($query as $obj) {
+				$this->nom_site = $obj->nom_site;
+				$this->mail_site = $obj->mail_site;
+				$this->gerant_site = $obj->gerant_site;
+				$this->url_site = $obj->url_site;
+				$this->mail_administrateur = $obj->mail_administrateur;
+				$this->last_save = $obj->last_save;
 				$this->acces_admin = $obj->acces_admin;
 				$this->contenu_dynamique = $obj->contenu_dynamique;
 				$this->responsive = $obj->responsive;
 				$this->cache = $obj->cache;
-            }
+			}
 
 			//pour la configuration des comptes
 			$query = $dbc->query("SELECT * FROM configuration_compte WHERE ID_configuration_compte=1");
@@ -49,31 +49,31 @@ 
 				$this->activer_inscription = $obj->activer_inscription;
 				$this->activer_connexion = $obj->activer_connexion;
 			}
-        }
-        //-------------------------- FIN CONSTRUCTEUR ----------------------------------------------------------------------------//
+		}
+		//-------------------------- FIN CONSTRUCTEUR ----------------------------------------------------------------------------//
 
 
 
-        //-------------------------- GETTER ----------------------------------------------------------------------------//
+		//-------------------------- GETTER ----------------------------------------------------------------------------//
 		//pour la configuration générale du site
-        public function getNomSite(){
-            return $this->nom_site;
-        }
-        public function getMailSite(){
-            return $this->mail_site;
-        }
-        public function getGerantSite(){
-            return $this->gerant_site;
-        }
-        public function getUrlSite(){
-            return $this->url_site;
-        }
-        public function getMailAdministrateur(){
-            return $this->mail_administrateur;
-        }
-        public function getLastSave(){
-            return $this->last_save;
-        }
+		public function getNomSite(){
+			return $this->nom_site;
+		}
+		public function getMailSite(){
+			return $this->mail_site;
+		}
+		public function getGerantSite(){
+			return $this->gerant_site;
+		}
+		public function getUrlSite(){
+			return $this->url_site;
+		}
+		public function getMailAdministrateur(){
+			return $this->mail_administrateur;
+		}
+		public function getLastSave(){
+			return $this->last_save;
+		}
 		public function getAccesAdmin() {
 			return $this->acces_admin;
 		}
@@ -97,11 +97,11 @@ 
 		public function getActiverConnexion() {
 			return $this->activer_connexion;
 		}
-        //-------------------------- FIN GETTER ----------------------------------------------------------------------------//
+		//-------------------------- FIN GETTER ----------------------------------------------------------------------------//
 
 
 
-        //-------------------------- SETTER ----------------------------------------------------------------------------//
+		//-------------------------- SETTER ----------------------------------------------------------------------------//
 		/**
 		 * fonction qui permet de mettre à jour la date de la derniere save de la bdd
 		 * + supprimer la sauverde ancienne d'il y a 1 mois
@@ -125,5 +125,5 @@ 
 				unlink(ROOT."bdd_backup/".$nom_save);
 			}
 		}
-        //-------------------------- FIN SETTER ----------------------------------------------------------------------------//
-    }
\ No newline at end of file
+		//-------------------------- FIN SETTER ----------------------------------------------------------------------------//
+	}
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -56,22 +56,22 @@
 
         //-------------------------- GETTER ----------------------------------------------------------------------------//
 		//pour la configuration générale du site
-        public function getNomSite(){
+        public function getNomSite() {
             return $this->nom_site;
         }
-        public function getMailSite(){
+        public function getMailSite() {
             return $this->mail_site;
         }
-        public function getGerantSite(){
+        public function getGerantSite() {
             return $this->gerant_site;
         }
-        public function getUrlSite(){
+        public function getUrlSite() {
             return $this->url_site;
         }
-        public function getMailAdministrateur(){
+        public function getMailAdministrateur() {
             return $this->mail_administrateur;
         }
-        public function getLastSave(){
+        public function getLastSave() {
             return $this->last_save;
         }
 		public function getAccesAdmin() {

core/contenus/Contenus.class.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 	namespace core\contenus;
 
-	use core\functions\ChaineCaractere;
 	use core\RedirectError;
 
 

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
 
 
 		//-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
-		public function __construct($init_all=0) {
+		public function __construct($init_all = 0) {
 			$dbc = \core\App::getDb();
 
 			if ($init_all == 1) {
@@ -71,7 +71,7 @@ 
 		 * pour récupérer l'en tete d'une page (balise title ++ meta description)
 		 * @param $id_page
 		 */
-		public function getHeadPage($id_page, $url=null) {
+		public function getHeadPage($id_page, $url = null) {
 			$dbc = \core\App::getDb();
 
 			if ($id_page != 0) {
@@ -94,7 +94,7 @@ 
 		 * pour récupérer une page en particulier
 		 * @param $id_page
 		 */
-		public function getContenuPage($id_page=null) {
+		public function getContenuPage($id_page = null) {
 			$dbc = \core\App::getDb();
 
 			if ($id_page == null) {
@@ -120,7 +120,7 @@ 
 
 
 		//-------------------------- SETTER ----------------------------------------------------------------------------//
-		protected function setMenu($id_page, $titre, $balise_title, $url, $parent ){
+		protected function setMenu($id_page, $titre, $balise_title, $url, $parent) {
 			$this->id_page = $id_page;
 			$this->titre = $titre;
 			$this->balise_title = $balise_title;

Braces +1 added lines, -2 removed lines

@@ -76,8 +76,7 @@
 
 			if ($id_page != 0) {
 				$query = $dbc->query("SELECT balise_title, meta_description, ID_page FROM page WHERE ID_page=".$id_page);
-			}
-			else {
+			} else {
 				$query = $dbc->query("SELECT balise_title, meta_description, ID_page FROM page WHERE url LIKE '$url'");
 			}
 

core/functions/DateHeure.class.php

Doc Comments +2 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
 		 * Fonction pour passer du format H:m en seconde
 		 * @param int $heure recoit l'heure a passer en minute
 		 * @param int $minute recoit les minutes a passer en minute
-		 * @return int
+		 * @return double|null
 		 **/
 		public static function Heureenseconde($heure, $minute) {
 			if ((is_numeric($heure)) && (is_numeric($minute))) {
@@ -38,7 +38,6 @@ 
 
 		/**
 		 * passe des secondes au format H:m
-		 * @param int $temps correspond aux format seconde à repasser en H:m
 		 * @return string
 		 */
 		public static function Secondeenheure($seconde) {
@@ -77,7 +76,7 @@ 
 
 		/**
 		 * affiche la date du jour au format jeudi 12 janvier
-		 * @param string $date si NULL on prend la date du jour sinon on prend la date qui est mise
+		 * @param integer $date si NULL on prend la date du jour sinon on prend la date qui est mise
 		 * @param int $abreger si NOT NULL, on abrege la date, on enleve la semaine et on coupe le mois à 3 lettres
 		 * @return string
 		 */

Spacing +8 added lines, -8 removed lines

@@ -24,9 +24,9 @@ 
 		 **/
 		public static function Heureenseconde($heure, $minute) {
 			if ((is_numeric($heure)) && (is_numeric($minute))) {
-				$heuresec = $heure*3600;
-				$minutesec = $minute*60;
-				$heureseconde = $heuresec+$minutesec;
+				$heuresec = $heure * 3600;
+				$minutesec = $minute * 60;
+				$heureseconde = $heuresec + $minutesec;
 				return $heureseconde;
 			}
 			else {
@@ -81,12 +81,12 @@ 
 		 * @param int $abreger si NOT NULL, on abrege la date, on enleve la semaine et on coupe le mois à 3 lettres
 		 * @return string
 		 */
-		public static function date_fr_texte($date=0, $abreger=null) {
-			$mois = array("Janvier", "Fevrier", "Mars", "Avril","Mai", "Juin", "Juillet", "Août","Septembre", "Octobre", "Novembre", "Decembre");
-			$jours= array("Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi");
+		public static function date_fr_texte($date = 0, $abreger = null) {
+			$mois = array("Janvier", "Fevrier", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Decembre");
+			$jours = array("Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi");
 
 			if ($date == 0) {
-				return $jours[date("w")]." ".date("j").(date("j")==1 ? "er":" ").$mois[date("n")-1]." ".date("Y");
+				return $jours[date("w")]." ".date("j").(date("j") == 1 ? "er" : " ").$mois[date("n") - 1]." ".date("Y");
 			}
 			else if ((strpos($date, "-") > 0) || (strpos($date, "/") > 0)) {
 				$pos = strpos($date, "-");
@@ -111,7 +111,7 @@ 
 					return $jour_d." ".mb_substr($explode[2], 0, 3, "UTF-8")." ".$annee_d;
 				}
 				else {
-					return $jour_semaine." ".$jour_d." ".$mois[$mois_d-1]." ".$annee_d;
+					return $jour_semaine." ".$jour_d." ".$mois[$mois_d - 1]." ".$annee_d;
 				}
 			}
 			else {

Braces +9 added lines, -18 removed lines

@@ -28,8 +28,7 @@ 
 				$minutesec = $minute*60;
 				$heureseconde = $heuresec+$minutesec;
 				return $heureseconde;
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("La/les valeurs entrée n'est/ne sont pas de type int");
 				FlashMessage::getFlash();
 				die();
@@ -49,8 +48,7 @@ 
 
 				$temps = $heure."h".$minute."m".$seconde;
 				return $temps;
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("La valeur entrée n'est pas de type int");
 				FlashMessage::getFlash();
 				die();
@@ -67,8 +65,7 @@ 
 				$chaine = str_replace(":", "h", $temps);
 
 				return $chaine;
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("La valeur entrée n'est pas de type h:m");
 				FlashMessage::getFlash();
 				die();
@@ -87,8 +84,7 @@ 
 
 			if ($date == 0) {
 				return $jours[date("w")]." ".date("j").(date("j")==1 ? "er":" ").$mois[date("n")-1]." ".date("Y");
-			}
-			else if ((strpos($date, "-") > 0) || (strpos($date, "/") > 0)) {
+			} else if ((strpos($date, "-") > 0) || (strpos($date, "/") > 0)) {
 				$pos = strpos($date, "-");
 
 				//si $pos > 0 cela veut dire qu'on est en YYYY-mm-jj
@@ -97,8 +93,7 @@ 
 					$jour_d = $explode[2];
 					$mois_d = $explode[1];
 					$annee_d = $explode[0];
-				}
-				else {
+				} else {
 					$explode = explode("/", $date);
 					$jour_d = $explode[0];
 					$mois_d = $explode[1];
@@ -109,12 +104,10 @@ 
 
 				if ($abreger != NULL) {
 					return $jour_d." ".mb_substr($explode[2], 0, 3, "UTF-8")." ".$annee_d;
-				}
-				else {
+				} else {
 					return $jour_semaine." ".$jour_d." ".$mois[$mois_d-1]." ".$annee_d;
 				}
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("Format de date passé en paramètre ne correspond pas à YYYY-mm-jj ou jj/mm/YYYY");
 				FlashMessage::getFlash();
 				die();
@@ -140,8 +133,7 @@ 
 				self::$annee = $annee;
 
 				return $jour."/".$mois."/".$annee;
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("format de date passé en paramètre ne correspond pas à YYYY-mm-jj");
 				FlashMessage::getFlash();
 				die();
@@ -163,8 +155,7 @@ 
 				$annee = $explode[2];
 
 				return $annee."-".$mois."-".$jour;
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("Format de date passé en paramètre ne correspond pas à jj/mm/aaaa");
 				FlashMessage::getFlash();
 				die();

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/Utils/FileSystem.php

Doc Comments +3 added lines, -5 removed lines

@@ -135,7 +135,7 @@ 
      * PHP4 Scandir
      * @static
      * @access public
-     * @param $directory directory name
+     * @param string $directory directory name
     */
     function php4_scandir($directory)
     {
@@ -404,7 +404,6 @@ 
      * @static
      * @access public
      * @param string $dir
-     * @param int $mode
      * @return boolean
      */
     function createDirectoryRecursively($dir)
@@ -454,7 +453,7 @@ 
      * @static
      * @access public
      * @param string $filePath absolute path to file
-     * @return boolean
+     * @return string
     */
     function detectHtml($filePath)
     {
@@ -515,8 +514,7 @@ 
      * @access public
      * @param string $filePath absolute path to file
      * @param string $extension file extension
-     * @param integer $detectionLevel 0 = none, 1 = use getimagesize for images, 2 = use DetectHtml for images
-     * @return boolean
+     * @return string
     */
     function isImageValid($filePath, $extension)
     {

Indentation +523 added lines, -523 removed lines

@@ -26,220 +26,220 @@ 
 class CKFinder_Connector_Utils_FileSystem
 {
 
-    /**
-     * This function behaves similar to System.IO.Path.Combine in C#, the only diffrenece is that it also accepts null values and treat them as empty string
-     *
-     * @static
-     * @access public
-     * @param string $path1 first path
-     * @param string $path2 scecond path
-     * @return string
-     */
-    function combinePaths($path1, $path2)
-    {
-        if (is_null($path1))  {
-            $path1 = "";
-        }
-        if (is_null($path2))  {
-            $path2 = "";
-        }
-        if (!strlen($path2)) {
-            if (strlen($path1)) {
-                $_lastCharP1 = substr($path1, -1, 1);
-                if ($_lastCharP1 != "/" && $_lastCharP1 != "\\") {
-                    $path1 .= DIRECTORY_SEPARATOR;
-                }
-            }
-        }
-        else {
-            $_firstCharP2 = substr($path2, 0, 1);
-            if (strlen($path1)) {
-                if (strpos($path2, $path1)===0) {
-                    return $path2;
-                }
-                $_lastCharP1 = substr($path1, -1, 1);
-                if ($_lastCharP1 != "/" && $_lastCharP1 != "\\" && $_firstCharP2 != "/" && $_firstCharP2 != "\\") {
-                    $path1 .= DIRECTORY_SEPARATOR;
-                }
-            }
-            else {
-                return $path2;
-            }
-        }
-        return $path1 . $path2;
-    }
-
-    /**
-     * Check whether $fileName is a valid file name, return true on success
-     *
-     * @static
-     * @access public
-     * @param string $fileName
-     * @return boolean
-     */
-    function checkFileName($fileName)
-    {
-        if (is_null($fileName) || !strlen($fileName) || substr($fileName,-1,1)=="." || false!==strpos($fileName, "..")) {
-            return false;
-        }
-
-        if (preg_match(CKFINDER_REGEX_INVALID_FILE, $fileName)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Unlink file/folder
-     *
-     * @static
-     * @access public
-     * @param string $path
-     * @return boolean
-     */
-    function unlink($path)
-    {
-        /*    make sure the path exists    */
-        if(!file_exists($path)) {
-            return false;
-        }
-
-        /*    If it is a file or link, just delete it    */
-        if(is_file($path) || is_link($path)) {
-            return @unlink($path);
-        }
-
-        /*    Scan the dir and recursively unlink    */
-        $files = CKFinder_Connector_Utils_FileSystem::php4_scandir($path);
-        if ($files) {
-            foreach($files as $filename)
-            {
-                if ($filename == '.' || $filename == '..') {
-                    continue;
-                }
-                $file = str_replace('//','/',$path.'/'.$filename);
-                CKFinder_Connector_Utils_FileSystem::unlink($file);
-            }
-        }
-
-        /*    Remove the parent dir    */
-        if(!@rmdir($path)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * PHP4 Scandir
-     * @static
-     * @access public
-     * @param $directory directory name
-    */
-    function php4_scandir($directory)
-    {
-        if (!is_dir($directory) || (false === $fh = @opendir($directory))) {
-            return false;
-        }
-
-        $files = array ();
-        while (false !== ($filename = readdir($fh))) {
-            $files[] = $filename;
-        }
-
-        closedir($fh);
-
-        return $files;
-    }
-
-    /**
-     * Return file name without extension (without dot & last part after dot)
-     *
-     * @static
-     * @access public
-     * @param string $fileName
-     * @return string
-     */
-    function getFileNameWithoutExtension($fileName)
-    {
-        $dotPos = strrpos( $fileName, '.' );
-        if (false === $dotPos) {
-            return $fileName;
-        }
-
-        return substr($fileName, 0, $dotPos);
-    }
-
-    /**
-     * Get file extension (only last part - e.g. extension of file.foo.bar.jpg = jpg)
-     *
-     * @static
-     * @access public
-     * @param string $fileName
-     * @return string
-     */
-    function getExtension( $fileName )
-    {
-        $dotPos = strrpos( $fileName, '.' );
-        if (false === $dotPos) {
-            return "";
-        }
-
-        return substr( $fileName, strrpos( $fileName, '.' ) +1 ) ;
-    }
-
-    /**
+	/**
+	 * This function behaves similar to System.IO.Path.Combine in C#, the only diffrenece is that it also accepts null values and treat them as empty string
+	 *
+	 * @static
+	 * @access public
+	 * @param string $path1 first path
+	 * @param string $path2 scecond path
+	 * @return string
+	 */
+	function combinePaths($path1, $path2)
+	{
+		if (is_null($path1))  {
+			$path1 = "";
+		}
+		if (is_null($path2))  {
+			$path2 = "";
+		}
+		if (!strlen($path2)) {
+			if (strlen($path1)) {
+				$_lastCharP1 = substr($path1, -1, 1);
+				if ($_lastCharP1 != "/" && $_lastCharP1 != "\\") {
+					$path1 .= DIRECTORY_SEPARATOR;
+				}
+			}
+		}
+		else {
+			$_firstCharP2 = substr($path2, 0, 1);
+			if (strlen($path1)) {
+				if (strpos($path2, $path1)===0) {
+					return $path2;
+				}
+				$_lastCharP1 = substr($path1, -1, 1);
+				if ($_lastCharP1 != "/" && $_lastCharP1 != "\\" && $_firstCharP2 != "/" && $_firstCharP2 != "\\") {
+					$path1 .= DIRECTORY_SEPARATOR;
+				}
+			}
+			else {
+				return $path2;
+			}
+		}
+		return $path1 . $path2;
+	}
+
+	/**
+	 * Check whether $fileName is a valid file name, return true on success
+	 *
+	 * @static
+	 * @access public
+	 * @param string $fileName
+	 * @return boolean
+	 */
+	function checkFileName($fileName)
+	{
+		if (is_null($fileName) || !strlen($fileName) || substr($fileName,-1,1)=="." || false!==strpos($fileName, "..")) {
+			return false;
+		}
+
+		if (preg_match(CKFINDER_REGEX_INVALID_FILE, $fileName)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Unlink file/folder
+	 *
+	 * @static
+	 * @access public
+	 * @param string $path
+	 * @return boolean
+	 */
+	function unlink($path)
+	{
+		/*    make sure the path exists    */
+		if(!file_exists($path)) {
+			return false;
+		}
+
+		/*    If it is a file or link, just delete it    */
+		if(is_file($path) || is_link($path)) {
+			return @unlink($path);
+		}
+
+		/*    Scan the dir and recursively unlink    */
+		$files = CKFinder_Connector_Utils_FileSystem::php4_scandir($path);
+		if ($files) {
+			foreach($files as $filename)
+			{
+				if ($filename == '.' || $filename == '..') {
+					continue;
+				}
+				$file = str_replace('//','/',$path.'/'.$filename);
+				CKFinder_Connector_Utils_FileSystem::unlink($file);
+			}
+		}
+
+		/*    Remove the parent dir    */
+		if(!@rmdir($path)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * PHP4 Scandir
+	 * @static
+	 * @access public
+	 * @param $directory directory name
+	 */
+	function php4_scandir($directory)
+	{
+		if (!is_dir($directory) || (false === $fh = @opendir($directory))) {
+			return false;
+		}
+
+		$files = array ();
+		while (false !== ($filename = readdir($fh))) {
+			$files[] = $filename;
+		}
+
+		closedir($fh);
+
+		return $files;
+	}
+
+	/**
+	 * Return file name without extension (without dot & last part after dot)
+	 *
+	 * @static
+	 * @access public
+	 * @param string $fileName
+	 * @return string
+	 */
+	function getFileNameWithoutExtension($fileName)
+	{
+		$dotPos = strrpos( $fileName, '.' );
+		if (false === $dotPos) {
+			return $fileName;
+		}
+
+		return substr($fileName, 0, $dotPos);
+	}
+
+	/**
+	 * Get file extension (only last part - e.g. extension of file.foo.bar.jpg = jpg)
+	 *
+	 * @static
+	 * @access public
+	 * @param string $fileName
+	 * @return string
+	 */
+	function getExtension( $fileName )
+	{
+		$dotPos = strrpos( $fileName, '.' );
+		if (false === $dotPos) {
+			return "";
+		}
+
+		return substr( $fileName, strrpos( $fileName, '.' ) +1 ) ;
+	}
+
+	/**
 	 * Read file, split it into small chunks and send it to the browser
 	 *
-     * @static
-     * @access public
+	 * @static
+	 * @access public
 	 * @param string $filename
 	 * @return boolean
 	 */
-    function readfileChunked($filename)
-    {
-        $chunksize = 1024 * 10; // how many bytes per chunk
-
-        $handle = fopen($filename, 'rb');
-        if ($handle === false) {
-            return false;
-        }
-        while (!feof($handle)) {
-            echo fread($handle, $chunksize);
-            @ob_flush();
-            flush();
-            @set_time_limit(8);
-        }
-        fclose($handle);
-        return true;
-    }
-
-    /**
-    * Replace accented UTF-8 characters by unaccented ASCII-7 "equivalents".
-    * The purpose of this function is to replace characters commonly found in Latin
-    * alphabets with something more or less equivalent from the ASCII range. This can
-    * be useful for converting a UTF-8 to something ready for a filename, for example.
-    * Following the use of this function, you would probably also pass the string
-    * through utf8_strip_non_ascii to clean out any other non-ASCII chars
-    *
-    * For a more complete implementation of transliteration, see the utf8_to_ascii package
-    * available from the phputf8 project downloads:
-    * http://prdownloads.sourceforge.net/phputf8
-    *
-    * @param string UTF-8 string
-    * @param string UTF-8 with accented characters replaced by ASCII chars
-    * @return string accented chars replaced with ascii equivalents
-    * @author Andreas Gohr <andi@splitbrain.org>
-    * @see http://sourceforge.net/projects/phputf8/
-    */
-    function convertToAscii($str)
-    {
-        static $UTF8_LOWER_ACCENTS = NULL;
-        static $UTF8_UPPER_ACCENTS = NULL;
-
-        if ( is_null($UTF8_LOWER_ACCENTS) ) {
-            $UTF8_LOWER_ACCENTS = array(
+	function readfileChunked($filename)
+	{
+		$chunksize = 1024 * 10; // how many bytes per chunk
+
+		$handle = fopen($filename, 'rb');
+		if ($handle === false) {
+			return false;
+		}
+		while (!feof($handle)) {
+			echo fread($handle, $chunksize);
+			@ob_flush();
+			flush();
+			@set_time_limit(8);
+		}
+		fclose($handle);
+		return true;
+	}
+
+	/**
+	 * Replace accented UTF-8 characters by unaccented ASCII-7 "equivalents".
+	 * The purpose of this function is to replace characters commonly found in Latin
+	 * alphabets with something more or less equivalent from the ASCII range. This can
+	 * be useful for converting a UTF-8 to something ready for a filename, for example.
+	 * Following the use of this function, you would probably also pass the string
+	 * through utf8_strip_non_ascii to clean out any other non-ASCII chars
+	 *
+	 * For a more complete implementation of transliteration, see the utf8_to_ascii package
+	 * available from the phputf8 project downloads:
+	 * http://prdownloads.sourceforge.net/phputf8
+	 *
+	 * @param string UTF-8 string
+	 * @param string UTF-8 with accented characters replaced by ASCII chars
+	 * @return string accented chars replaced with ascii equivalents
+	 * @author Andreas Gohr <andi@splitbrain.org>
+	 * @see http://sourceforge.net/projects/phputf8/
+	 */
+	function convertToAscii($str)
+	{
+		static $UTF8_LOWER_ACCENTS = NULL;
+		static $UTF8_UPPER_ACCENTS = NULL;
+
+		if ( is_null($UTF8_LOWER_ACCENTS) ) {
+			$UTF8_LOWER_ACCENTS = array(
   'à' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o',
   'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k',
   'ŝ' => 's', 'ỳ' => 'y', 'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 'ó' => 'o',
@@ -255,17 +255,17 @@ 
   'â' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 'ī' => 'i', 'ã' => 'a', 'ġ' => 'g',
   'ṁ' => 'm', 'ō' => 'o', 'ĩ' => 'i', 'ù' => 'u', 'į' => 'i', 'ź' => 'z', 'á' => 'a',
   'û' => 'u', 'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u', 'ĕ' => 'e',
-            );
-        }
+			);
+		}
 
-        $str = str_replace(
-                array_keys($UTF8_LOWER_ACCENTS),
-                array_values($UTF8_LOWER_ACCENTS),
-                $str
-            );
+		$str = str_replace(
+				array_keys($UTF8_LOWER_ACCENTS),
+				array_values($UTF8_LOWER_ACCENTS),
+				$str
+			);
 
-        if ( is_null($UTF8_UPPER_ACCENTS) ) {
-            $UTF8_UPPER_ACCENTS = array(
+		if ( is_null($UTF8_UPPER_ACCENTS) ) {
+			$UTF8_UPPER_ACCENTS = array(
   'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O',
   'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K',
   'Ŝ' => 'S', 'Ỳ' => 'Y', 'Ņ' => 'N', 'Ĺ' => 'L', 'Ħ' => 'H', 'Ṗ' => 'P', 'Ó' => 'O',
@@ -281,309 +281,309 @@ 
   'Â' => 'A', 'Ľ' => 'L', 'Ẅ' => 'W', 'Ż' => 'Z', 'Ī' => 'I', 'Ã' => 'A', 'Ġ' => 'G',
   'Ṁ' => 'M', 'Ō' => 'O', 'Ĩ' => 'I', 'Ù' => 'U', 'Į' => 'I', 'Ź' => 'Z', 'Á' => 'A',
   'Û' => 'U', 'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae', 'Ĕ' => 'E',
-            );
-        }
-        $str = str_replace(
-                array_keys($UTF8_UPPER_ACCENTS),
-                array_values($UTF8_UPPER_ACCENTS),
-                $str
-            );
-        return $str;
-    }
-
-    /**
-     * Convert file name from UTF-8 to system encoding
-     *
-     * @static
-     * @access public
-     * @param string $fileName
-     * @return string
-     */
-    function convertToFilesystemEncoding($fileName)
-    {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $encoding = $_config->getFilesystemEncoding();
-        if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
-            return $fileName;
-        }
-
-        if (!function_exists("iconv")) {
-            if (strcasecmp($encoding, "ISO-8859-1") == 0 || strcasecmp($encoding, "ISO8859-1") == 0 || strcasecmp($encoding, "Latin1") == 0) {
-                return str_replace("\0", "_", utf8_decode($fileName));
-            } else if (function_exists('mb_convert_encoding')) {
-
-                $encoded = @mb_convert_encoding($fileName, $encoding, 'UTF-8');
-                if (@mb_strlen($fileName, "UTF-8") != @mb_strlen($encoded, $encoding)) {
-                    return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
-                }
-                else {
-                    return str_replace("\0", "_", $encoded);
-                }
-            } else {
-                return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
-            }
-        }
-
-        $converted = @iconv("UTF-8", $encoding . "//IGNORE//TRANSLIT", $fileName);
-        if ($converted === false) {
-            return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
-        }
-
-        return $converted;
-    }
-
-    /**
-     * Convert file name from system encoding into UTF-8
-     *
-     * @static
-     * @access public
-     * @param string $fileName
-     * @return string
-     */
-    function convertToConnectorEncoding($fileName)
-    {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        $encoding = $_config->getFilesystemEncoding();
-        if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
-            return $fileName;
-        }
-
-        if (!function_exists("iconv")) {
-            if (strcasecmp($encoding, "ISO-8859-1") == 0 || strcasecmp($encoding, "ISO8859-1") == 0 || strcasecmp($encoding, "Latin1") == 0) {
-                return utf8_encode($fileName);
-            } else {
-                return $fileName;
-            }
-        }
-
-        $converted = @iconv($encoding, "UTF-8", $fileName);
-
-        if ($converted === false) {
-            return $fileName;
-        }
-
-        return $converted;
-    }
-
-    /**
-     * Find document root
-     *
-     * @return string
-     * @access public
-     */
-    function getDocumentRootPath()
-    {
-        /**
-         * The absolute pathname of the currently executing script.
-         * Notatka: If a script is executed with the CLI, as a relative path, such as file.php or ../file.php,
-         * $_SERVER['SCRIPT_FILENAME'] will contain the relative path specified by the user.
-         */
-        if (isset($_SERVER['SCRIPT_FILENAME'])) {
-            $sRealPath = dirname($_SERVER['SCRIPT_FILENAME']);
-        }
-        else {
-            /**
-             * realpath — Returns canonicalized absolute pathname
-             */
-            $sRealPath = realpath( './' ) ;
-        }
-
-        /**
-         * The filename of the currently executing script, relative to the document root.
-         * For instance, $_SERVER['PHP_SELF'] in a script at the address http://example.com/test.php/foo.bar
-         * would be /test.php/foo.bar.
-         */
-        $sSelfPath = dirname($_SERVER['PHP_SELF']);
-
-        return substr($sRealPath, 0, strlen($sRealPath) - strlen($sSelfPath));
-    }
-
-    /**
-     * Create directory recursively
-     *
-     * @static
-     * @access public
-     * @param string $dir
-     * @param int $mode
-     * @return boolean
-     */
-    function createDirectoryRecursively($dir)
-    {
-        if (is_dir($dir)) {
-            return true;
-        }
-
-        //attempt to create directory
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
-        if ($perms = $_config->getChmodFolders()) {
-            $oldUmask = umask(0);
-            $bCreated = @mkdir($dir, $perms);
-            umask($oldUmask);
-        }
-        else {
-            $bCreated = @mkdir($dir);
-        }
-
-        if ($bCreated) {
-            return true;
-        }
-
-        //failed to create directory, perhaps we need to create parent directories first
-        if (!CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively(dirname($dir))) {
-            return false;
-        }
-
-        //parent directories created successfully, let's try to create directory once again
-        if ($perms) {
-            $old_umask = umask(0);
-            $result = @mkdir($dir, $perms);
-            umask($old_umask);
-        }
-        else {
-            $result = @mkdir($dir);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Detect HTML in the first KB to prevent against potential security issue with
-     * IE/Safari/Opera file type auto detection bug.
-     * Returns true if file contain insecure HTML code at the beginning.
-     *
-     * @static
-     * @access public
-     * @param string $filePath absolute path to file
-     * @return boolean
-    */
-    function detectHtml($filePath)
-    {
-        $fp = @fopen($filePath, 'rb');
-        if ( $fp === false || !flock( $fp, LOCK_SH ) ) {
-            return -1 ;
-        }
-        $chunk = fread($fp, 1024);
-        flock( $fp, LOCK_UN ) ;
-        fclose($fp);
-
-        $chunk = strtolower($chunk);
-
-        if (!$chunk) {
-            return false;
-        }
-
-        $chunk = trim($chunk);
-
-        if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk)) {
-            return true;
-        }
-
-        $tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
-
-        foreach( $tags as $tag ) {
-            if(false !== strpos($chunk, $tag)) {
-                return true ;
-            }
-        }
-
-        //type = javascript
-        if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk)) {
-            return true ;
-        }
-
-        //href = javascript
-        //src = javascript
-        //data = javascript
-        if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) {
-            return true ;
-        }
-
-        //url(javascript
-        if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
-            return true ;
-        }
-
-        return false ;
-    }
-
-    /**
-     * Check file content.
-     * Currently this function validates only image files.
-     * Returns false if file is invalid.
-     *
-     * @static
-     * @access public
-     * @param string $filePath absolute path to file
-     * @param string $extension file extension
-     * @param integer $detectionLevel 0 = none, 1 = use getimagesize for images, 2 = use DetectHtml for images
-     * @return boolean
-    */
-    function isImageValid($filePath, $extension)
-    {
-        if (!@is_readable($filePath)) {
-            return -1;
-        }
-
-        $imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'psd', 'bmp', 'tiff');
-
-        // version_compare is available since PHP4 >= 4.0.7
-        if ( function_exists( 'version_compare' ) ) {
-            $sCurrentVersion = phpversion();
-            if ( version_compare( $sCurrentVersion, "4.2.0" ) >= 0 ) {
-                $imageCheckExtensions[] = "tiff";
-                $imageCheckExtensions[] = "tif";
-            }
-            if ( version_compare( $sCurrentVersion, "4.3.0" ) >= 0 ) {
-                $imageCheckExtensions[] = "swc";
-            }
-            if ( version_compare( $sCurrentVersion, "4.3.2" ) >= 0 ) {
-                $imageCheckExtensions[] = "jpc";
-                $imageCheckExtensions[] = "jp2";
-                $imageCheckExtensions[] = "jpx";
-                $imageCheckExtensions[] = "jb2";
-                $imageCheckExtensions[] = "xbm";
-                $imageCheckExtensions[] = "wbmp";
-            }
-        }
-
-        if ( !in_array( $extension, $imageCheckExtensions ) ) {
-            return true;
-        }
-
-        if ( @getimagesize( $filePath ) === false ) {
-            return false ;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns true if directory is not empty
-     *
-     * @access public
-     * @static
-     * @param string $serverPath
-     * @return boolean
-     */
-    function hasChildren($serverPath)
-    {
-        if (!is_dir($serverPath) || (false === $fh = @opendir($serverPath))) {
-            return false;
-        }
-
-        $hasChildren = false;
-        while (false !== ($filename = readdir($fh))) {
-            if ($filename == '.' || $filename == '..') {
-                continue;
-            } else if (is_dir($serverPath . DIRECTORY_SEPARATOR . $filename)) {
-                //we have found valid directory
-                $hasChildren = true;
-                break;
-            }
-        }
-
-        closedir($fh);
-
-        return $hasChildren;
-    }
+			);
+		}
+		$str = str_replace(
+				array_keys($UTF8_UPPER_ACCENTS),
+				array_values($UTF8_UPPER_ACCENTS),
+				$str
+			);
+		return $str;
+	}
+
+	/**
+	 * Convert file name from UTF-8 to system encoding
+	 *
+	 * @static
+	 * @access public
+	 * @param string $fileName
+	 * @return string
+	 */
+	function convertToFilesystemEncoding($fileName)
+	{
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$encoding = $_config->getFilesystemEncoding();
+		if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
+			return $fileName;
+		}
+
+		if (!function_exists("iconv")) {
+			if (strcasecmp($encoding, "ISO-8859-1") == 0 || strcasecmp($encoding, "ISO8859-1") == 0 || strcasecmp($encoding, "Latin1") == 0) {
+				return str_replace("\0", "_", utf8_decode($fileName));
+			} else if (function_exists('mb_convert_encoding')) {
+
+				$encoded = @mb_convert_encoding($fileName, $encoding, 'UTF-8');
+				if (@mb_strlen($fileName, "UTF-8") != @mb_strlen($encoded, $encoding)) {
+					return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+				}
+				else {
+					return str_replace("\0", "_", $encoded);
+				}
+			} else {
+				return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+			}
+		}
+
+		$converted = @iconv("UTF-8", $encoding . "//IGNORE//TRANSLIT", $fileName);
+		if ($converted === false) {
+			return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+		}
+
+		return $converted;
+	}
+
+	/**
+	 * Convert file name from system encoding into UTF-8
+	 *
+	 * @static
+	 * @access public
+	 * @param string $fileName
+	 * @return string
+	 */
+	function convertToConnectorEncoding($fileName)
+	{
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		$encoding = $_config->getFilesystemEncoding();
+		if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
+			return $fileName;
+		}
+
+		if (!function_exists("iconv")) {
+			if (strcasecmp($encoding, "ISO-8859-1") == 0 || strcasecmp($encoding, "ISO8859-1") == 0 || strcasecmp($encoding, "Latin1") == 0) {
+				return utf8_encode($fileName);
+			} else {
+				return $fileName;
+			}
+		}
+
+		$converted = @iconv($encoding, "UTF-8", $fileName);
+
+		if ($converted === false) {
+			return $fileName;
+		}
+
+		return $converted;
+	}
+
+	/**
+	 * Find document root
+	 *
+	 * @return string
+	 * @access public
+	 */
+	function getDocumentRootPath()
+	{
+		/**
+		 * The absolute pathname of the currently executing script.
+		 * Notatka: If a script is executed with the CLI, as a relative path, such as file.php or ../file.php,
+		 * $_SERVER['SCRIPT_FILENAME'] will contain the relative path specified by the user.
+		 */
+		if (isset($_SERVER['SCRIPT_FILENAME'])) {
+			$sRealPath = dirname($_SERVER['SCRIPT_FILENAME']);
+		}
+		else {
+			/**
+			 * realpath — Returns canonicalized absolute pathname
+			 */
+			$sRealPath = realpath( './' ) ;
+		}
+
+		/**
+		 * The filename of the currently executing script, relative to the document root.
+		 * For instance, $_SERVER['PHP_SELF'] in a script at the address http://example.com/test.php/foo.bar
+		 * would be /test.php/foo.bar.
+		 */
+		$sSelfPath = dirname($_SERVER['PHP_SELF']);
+
+		return substr($sRealPath, 0, strlen($sRealPath) - strlen($sSelfPath));
+	}
+
+	/**
+	 * Create directory recursively
+	 *
+	 * @static
+	 * @access public
+	 * @param string $dir
+	 * @param int $mode
+	 * @return boolean
+	 */
+	function createDirectoryRecursively($dir)
+	{
+		if (is_dir($dir)) {
+			return true;
+		}
+
+		//attempt to create directory
+		$_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+		if ($perms = $_config->getChmodFolders()) {
+			$oldUmask = umask(0);
+			$bCreated = @mkdir($dir, $perms);
+			umask($oldUmask);
+		}
+		else {
+			$bCreated = @mkdir($dir);
+		}
+
+		if ($bCreated) {
+			return true;
+		}
+
+		//failed to create directory, perhaps we need to create parent directories first
+		if (!CKFinder_Connector_Utils_FileSystem::createDirectoryRecursively(dirname($dir))) {
+			return false;
+		}
+
+		//parent directories created successfully, let's try to create directory once again
+		if ($perms) {
+			$old_umask = umask(0);
+			$result = @mkdir($dir, $perms);
+			umask($old_umask);
+		}
+		else {
+			$result = @mkdir($dir);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Detect HTML in the first KB to prevent against potential security issue with
+	 * IE/Safari/Opera file type auto detection bug.
+	 * Returns true if file contain insecure HTML code at the beginning.
+	 *
+	 * @static
+	 * @access public
+	 * @param string $filePath absolute path to file
+	 * @return boolean
+	 */
+	function detectHtml($filePath)
+	{
+		$fp = @fopen($filePath, 'rb');
+		if ( $fp === false || !flock( $fp, LOCK_SH ) ) {
+			return -1 ;
+		}
+		$chunk = fread($fp, 1024);
+		flock( $fp, LOCK_UN ) ;
+		fclose($fp);
+
+		$chunk = strtolower($chunk);
+
+		if (!$chunk) {
+			return false;
+		}
+
+		$chunk = trim($chunk);
+
+		if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk)) {
+			return true;
+		}
+
+		$tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
+
+		foreach( $tags as $tag ) {
+			if(false !== strpos($chunk, $tag)) {
+				return true ;
+			}
+		}
+
+		//type = javascript
+		if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk)) {
+			return true ;
+		}
+
+		//href = javascript
+		//src = javascript
+		//data = javascript
+		if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) {
+			return true ;
+		}
+
+		//url(javascript
+		if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
+			return true ;
+		}
+
+		return false ;
+	}
+
+	/**
+	 * Check file content.
+	 * Currently this function validates only image files.
+	 * Returns false if file is invalid.
+	 *
+	 * @static
+	 * @access public
+	 * @param string $filePath absolute path to file
+	 * @param string $extension file extension
+	 * @param integer $detectionLevel 0 = none, 1 = use getimagesize for images, 2 = use DetectHtml for images
+	 * @return boolean
+	 */
+	function isImageValid($filePath, $extension)
+	{
+		if (!@is_readable($filePath)) {
+			return -1;
+		}
+
+		$imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'psd', 'bmp', 'tiff');
+
+		// version_compare is available since PHP4 >= 4.0.7
+		if ( function_exists( 'version_compare' ) ) {
+			$sCurrentVersion = phpversion();
+			if ( version_compare( $sCurrentVersion, "4.2.0" ) >= 0 ) {
+				$imageCheckExtensions[] = "tiff";
+				$imageCheckExtensions[] = "tif";
+			}
+			if ( version_compare( $sCurrentVersion, "4.3.0" ) >= 0 ) {
+				$imageCheckExtensions[] = "swc";
+			}
+			if ( version_compare( $sCurrentVersion, "4.3.2" ) >= 0 ) {
+				$imageCheckExtensions[] = "jpc";
+				$imageCheckExtensions[] = "jp2";
+				$imageCheckExtensions[] = "jpx";
+				$imageCheckExtensions[] = "jb2";
+				$imageCheckExtensions[] = "xbm";
+				$imageCheckExtensions[] = "wbmp";
+			}
+		}
+
+		if ( !in_array( $extension, $imageCheckExtensions ) ) {
+			return true;
+		}
+
+		if ( @getimagesize( $filePath ) === false ) {
+			return false ;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns true if directory is not empty
+	 *
+	 * @access public
+	 * @static
+	 * @param string $serverPath
+	 * @return boolean
+	 */
+	function hasChildren($serverPath)
+	{
+		if (!is_dir($serverPath) || (false === $fh = @opendir($serverPath))) {
+			return false;
+		}
+
+		$hasChildren = false;
+		while (false !== ($filename = readdir($fh))) {
+			if ($filename == '.' || $filename == '..') {
+				continue;
+			} else if (is_dir($serverPath . DIRECTORY_SEPARATOR . $filename)) {
+				//we have found valid directory
+				$hasChildren = true;
+				break;
+			}
+		}
+
+		closedir($fh);
+
+		return $hasChildren;
+	}
 }

Spacing +44 added lines, -44 removed lines

@@ -37,10 +37,10 @@ 
      */
     function combinePaths($path1, $path2)
     {
-        if (is_null($path1))  {
+        if (is_null($path1)) {
             $path1 = "";
         }
-        if (is_null($path2))  {
+        if (is_null($path2)) {
             $path2 = "";
         }
         if (!strlen($path2)) {
@@ -54,7 +54,7 @@ 
         else {
             $_firstCharP2 = substr($path2, 0, 1);
             if (strlen($path1)) {
-                if (strpos($path2, $path1)===0) {
+                if (strpos($path2, $path1) === 0) {
                     return $path2;
                 }
                 $_lastCharP1 = substr($path1, -1, 1);
@@ -66,7 +66,7 @@ 
                 return $path2;
             }
         }
-        return $path1 . $path2;
+        return $path1.$path2;
     }
 
     /**
@@ -79,7 +79,7 @@ 
      */
     function checkFileName($fileName)
     {
-        if (is_null($fileName) || !strlen($fileName) || substr($fileName,-1,1)=="." || false!==strpos($fileName, "..")) {
+        if (is_null($fileName) || !strlen($fileName) || substr($fileName, -1, 1) == "." || false !== strpos($fileName, "..")) {
             return false;
         }
 
@@ -101,30 +101,30 @@ 
     function unlink($path)
     {
         /*    make sure the path exists    */
-        if(!file_exists($path)) {
+        if (!file_exists($path)) {
             return false;
         }
 
         /*    If it is a file or link, just delete it    */
-        if(is_file($path) || is_link($path)) {
+        if (is_file($path) || is_link($path)) {
             return @unlink($path);
         }
 
         /*    Scan the dir and recursively unlink    */
         $files = CKFinder_Connector_Utils_FileSystem::php4_scandir($path);
         if ($files) {
-            foreach($files as $filename)
+            foreach ($files as $filename)
             {
                 if ($filename == '.' || $filename == '..') {
                     continue;
                 }
-                $file = str_replace('//','/',$path.'/'.$filename);
+                $file = str_replace('//', '/', $path.'/'.$filename);
                 CKFinder_Connector_Utils_FileSystem::unlink($file);
             }
         }
 
         /*    Remove the parent dir    */
-        if(!@rmdir($path)) {
+        if (!@rmdir($path)) {
             return false;
         }
 
@@ -143,7 +143,7 @@ 
             return false;
         }
 
-        $files = array ();
+        $files = array();
         while (false !== ($filename = readdir($fh))) {
             $files[] = $filename;
         }
@@ -163,7 +163,7 @@ 
      */
     function getFileNameWithoutExtension($fileName)
     {
-        $dotPos = strrpos( $fileName, '.' );
+        $dotPos = strrpos($fileName, '.');
         if (false === $dotPos) {
             return $fileName;
         }
@@ -179,14 +179,14 @@ 
      * @param string $fileName
      * @return string
      */
-    function getExtension( $fileName )
+    function getExtension($fileName)
     {
-        $dotPos = strrpos( $fileName, '.' );
+        $dotPos = strrpos($fileName, '.');
         if (false === $dotPos) {
             return "";
         }
 
-        return substr( $fileName, strrpos( $fileName, '.' ) +1 ) ;
+        return substr($fileName, strrpos($fileName, '.') + 1);
     }
 
     /**
@@ -238,7 +238,7 @@ 
         static $UTF8_LOWER_ACCENTS = NULL;
         static $UTF8_UPPER_ACCENTS = NULL;
 
-        if ( is_null($UTF8_LOWER_ACCENTS) ) {
+        if (is_null($UTF8_LOWER_ACCENTS)) {
             $UTF8_LOWER_ACCENTS = array(
   'à' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o',
   'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k',
@@ -264,7 +264,7 @@ 
                 $str
             );
 
-        if ( is_null($UTF8_UPPER_ACCENTS) ) {
+        if (is_null($UTF8_UPPER_ACCENTS)) {
             $UTF8_UPPER_ACCENTS = array(
   'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O',
   'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K',
@@ -301,7 +301,7 @@ 
      */
     function convertToFilesystemEncoding($fileName)
     {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         $encoding = $_config->getFilesystemEncoding();
         if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
             return $fileName;
@@ -314,19 +314,19 @@ 
 
                 $encoded = @mb_convert_encoding($fileName, $encoding, 'UTF-8');
                 if (@mb_strlen($fileName, "UTF-8") != @mb_strlen($encoded, $encoding)) {
-                    return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+                    return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u", "_", $fileName));
                 }
                 else {
                     return str_replace("\0", "_", $encoded);
                 }
             } else {
-                return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+                return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u", "_", $fileName));
             }
         }
 
-        $converted = @iconv("UTF-8", $encoding . "//IGNORE//TRANSLIT", $fileName);
+        $converted = @iconv("UTF-8", $encoding."//IGNORE//TRANSLIT", $fileName);
         if ($converted === false) {
-            return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
+            return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u", "_", $fileName));
         }
 
         return $converted;
@@ -342,7 +342,7 @@ 
      */
     function convertToConnectorEncoding($fileName)
     {
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         $encoding = $_config->getFilesystemEncoding();
         if (is_null($encoding) || strcasecmp($encoding, "UTF-8") == 0 || strcasecmp($encoding, "UTF8") == 0) {
             return $fileName;
@@ -385,7 +385,7 @@ 
             /**
              * realpath — Returns canonicalized absolute pathname
              */
-            $sRealPath = realpath( './' ) ;
+            $sRealPath = realpath('./');
         }
 
         /**
@@ -414,7 +414,7 @@ 
         }
 
         //attempt to create directory
-        $_config =& CKFinder_Connector_Core_Factory::getInstance("Core_Config");
+        $_config = & CKFinder_Connector_Core_Factory::getInstance("Core_Config");
         if ($perms = $_config->getChmodFolders()) {
             $oldUmask = umask(0);
             $bCreated = @mkdir($dir, $perms);
@@ -459,11 +459,11 @@ 
     function detectHtml($filePath)
     {
         $fp = @fopen($filePath, 'rb');
-        if ( $fp === false || !flock( $fp, LOCK_SH ) ) {
-            return -1 ;
+        if ($fp === false || !flock($fp, LOCK_SH)) {
+            return -1;
         }
         $chunk = fread($fp, 1024);
-        flock( $fp, LOCK_UN ) ;
+        flock($fp, LOCK_UN);
         fclose($fp);
 
         $chunk = strtolower($chunk);
@@ -480,30 +480,30 @@ 
 
         $tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
 
-        foreach( $tags as $tag ) {
-            if(false !== strpos($chunk, $tag)) {
-                return true ;
+        foreach ($tags as $tag) {
+            if (false !== strpos($chunk, $tag)) {
+                return true;
             }
         }
 
         //type = javascript
         if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk)) {
-            return true ;
+            return true;
         }
 
         //href = javascript
         //src = javascript
         //data = javascript
-        if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) {
-            return true ;
+        if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
+            return true;
         }
 
         //url(javascript
         if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
-            return true ;
+            return true;
         }
 
-        return false ;
+        return false;
     }
 
     /**
@@ -527,16 +527,16 @@ 
         $imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'psd', 'bmp', 'tiff');
 
         // version_compare is available since PHP4 >= 4.0.7
-        if ( function_exists( 'version_compare' ) ) {
+        if (function_exists('version_compare')) {
             $sCurrentVersion = phpversion();
-            if ( version_compare( $sCurrentVersion, "4.2.0" ) >= 0 ) {
+            if (version_compare($sCurrentVersion, "4.2.0") >= 0) {
                 $imageCheckExtensions[] = "tiff";
                 $imageCheckExtensions[] = "tif";
             }
-            if ( version_compare( $sCurrentVersion, "4.3.0" ) >= 0 ) {
+            if (version_compare($sCurrentVersion, "4.3.0") >= 0) {
                 $imageCheckExtensions[] = "swc";
             }
-            if ( version_compare( $sCurrentVersion, "4.3.2" ) >= 0 ) {
+            if (version_compare($sCurrentVersion, "4.3.2") >= 0) {
                 $imageCheckExtensions[] = "jpc";
                 $imageCheckExtensions[] = "jp2";
                 $imageCheckExtensions[] = "jpx";
@@ -546,12 +546,12 @@ 
             }
         }
 
-        if ( !in_array( $extension, $imageCheckExtensions ) ) {
+        if (!in_array($extension, $imageCheckExtensions)) {
             return true;
         }
 
-        if ( @getimagesize( $filePath ) === false ) {
-            return false ;
+        if (@getimagesize($filePath) === false) {
+            return false;
         }
 
         return true;
@@ -575,7 +575,7 @@ 
         while (false !== ($filename = readdir($fh))) {
             if ($filename == '.' || $filename == '..') {
                 continue;
-            } else if (is_dir($serverPath . DIRECTORY_SEPARATOR . $filename)) {
+            } else if (is_dir($serverPath.DIRECTORY_SEPARATOR.$filename)) {
                 //we have found valid directory
                 $hasChildren = true;
                 break;

Braces +9 added lines, -13 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
@@ -50,8 +52,7 @@ 
                     $path1 .= DIRECTORY_SEPARATOR;
                 }
             }
-        }
-        else {
+        } else {
             $_firstCharP2 = substr($path2, 0, 1);
             if (strlen($path1)) {
                 if (strpos($path2, $path1)===0) {
@@ -61,8 +62,7 @@ 
                 if ($_lastCharP1 != "/" && $_lastCharP1 != "\\" && $_firstCharP2 != "/" && $_firstCharP2 != "\\") {
                     $path1 .= DIRECTORY_SEPARATOR;
                 }
-            }
-            else {
+            } else {
                 return $path2;
             }
         }
@@ -315,8 +315,7 @@ 
                 $encoded = @mb_convert_encoding($fileName, $encoding, 'UTF-8');
                 if (@mb_strlen($fileName, "UTF-8") != @mb_strlen($encoded, $encoding)) {
                     return str_replace("\0", "_", preg_replace("/[^[:ascii:]]/u","_",$fileName));
-                }
-                else {
+                } else {
                     return str_replace("\0", "_", $encoded);
                 }
             } else {
@@ -380,8 +379,7 @@ 
          */
         if (isset($_SERVER['SCRIPT_FILENAME'])) {
             $sRealPath = dirname($_SERVER['SCRIPT_FILENAME']);
-        }
-        else {
+        } else {
             /**
              * realpath — Returns canonicalized absolute pathname
              */
@@ -419,8 +417,7 @@ 
             $oldUmask = umask(0);
             $bCreated = @mkdir($dir, $perms);
             umask($oldUmask);
-        }
-        else {
+        } else {
             $bCreated = @mkdir($dir);
         }
 
@@ -438,8 +435,7 @@ 
             $old_umask = umask(0);
             $result = @mkdir($dir, $perms);
             umask($old_umask);
-        }
-        else {
+        } else {
             $result = @mkdir($dir);
         }