Piou-piou / ribs-framework

core/modules/GestionModule.php

Braces +2 added lines, -4 removed lines

@@ -130,8 +130,7 @@ 
 				foreach ($query as $obj) {
 					if ($obj->activer == 1) {
 						return true;
-					}
-					else {
+					} else {
 						return false;
 					}
 				}
@@ -183,8 +182,7 @@ 
 
 			if ($activer == 1) {
 				$nav->setAjoutLien("ID_module", self::getUrlToId($url));
-			}
-			else {
+			} else {
 				$nav->setSupprimerLien("ID_module", self::getUrlToId($url));
 			}
 		}

core/admin/inscription/AdminInscription.php

Braces +4 added lines, -8 removed lines

@@ -36,12 +36,10 @@ 
 			if ($this->getTestInt($value) === true) {
 				$this->acces_administration = $value;
 				return true;
-			}
-			else if ($this->getTestInt($value) === false) {
+			} else if ($this->getTestInt($value) === false) {
 				$this->erreur .= "<li>Le champs accès administration n'est pas au bon format</li>";
 				return false;
-			}
-			else {
+			} else {
 				return true;
 			}
 
@@ -59,12 +57,10 @@ 
 			if ($this->getTestInt($value) === true) {
 				$this->id_liste_droit_acces = $value;
 				return true;
-			}
-			else if ($this->getTestInt($value) === false) {
+			} else if ($this->getTestInt($value) === false) {
 				$this->erreur .= "<li>Le champs accès administration n'est pas au bon format</li>";
 				return false;
-			}
-			else {
+			} else {
 				return true;
 			}
 

core/database/Database.php

Braces +7 added lines, -9 removed lines

@@ -55,8 +55,7 @@ 
 			if ($query) {
 				$obj = $query->fetchAll(PDO::FETCH_OBJ);
 				return $obj;
-			}
-			else {
+			} else {
 				FlashMessage::setFlash("Une erreur est survenue en executant cette requette : ".$req);
 			}
 		}
@@ -84,8 +83,7 @@ 
 		public function rechercherEgalite($table, $champ, $value, $id_table = null, $id = null) {
 			if ($id == null) {
 				$query = $this->getPdo()->query("SELECT COUNT($champ) as nb FROM $table WHERE $champ LIKE '$value'");
-			}
-			else {
+			} else {
 				$query = $this->getPdo()->query("SELECT COUNT($champ) as nb FROM $table WHERE $champ LIKE '$value' AND $id_table != $id");
 			}
 
@@ -94,9 +92,10 @@ 
 					$nb = $obj["nb"];
 				}
 
-				if ((isset($nb)) && ($nb != 0)) return true;
-			}
-			else {
+				if ((isset($nb)) && ($nb != 0)) {
+					return true;
+				}
+			} else {
 				return false;
 			}
 		}
@@ -113,8 +112,7 @@ 
 
 			if ($query->rowCount() > 0) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}

core/admin/contenus/gestion/modifier_contenus.php

Braces +4 added lines, -8 removed lines

@@ -10,8 +10,7 @@ 
 			$meta_description = $_POST['meta_description'];
 			$titre_page = $_POST['titre_page'];
 			$parent = $_POST['parent_texte'];
-		}
-		else {
+		} else {
 			$contenu_class->getHeadPage($_POST['id_page']);
 			$contenu_class->getContenuPage($_POST['id_page']);
 
@@ -19,8 +18,7 @@ 
 				$balise_title = $_POST['balise_title'];
 				$url = $_POST['url'];
 				$meta_description = $_POST['meta_description'];
-			}
-			else {
+			} else {
 				$balise_title = $contenu_class->getBaliseTitle();
 				$url = $contenu_class->getUrl();
 				$meta_description = $contenu_class->getMetaDescription();
@@ -29,8 +27,7 @@ 
 			if ($droit_acces->getModifNavigation() != 0) {
 				$titre_page = $_POST['titre_page'];
 				$parent = $_POST['parent_texte'];
-			}
-			else {
+			} else {
 				$titre_page = $contenu_class->getTitre();
 				$parent = $contenu_class->getParent();
 			}
@@ -41,8 +38,7 @@ 
 		if ((\core\App::getErreur() !== true) && ($gestion_contenu->getErreur() !== true)) {
 			\core\HTML\flashmessage\FlashMessage::setFlash("La page ".$_POST['titre_page']." a été mise à jour", "success");
 		}
-	}
-	else {
+	} else {
 		\core\HTML\flashmessage\FlashMessage::setFlash("Vous n'avez pas l'autorisation de modifier cette page !");
 	}
 

core/auth/Inscription.php

Braces +9 added lines, -18 removed lines

@@ -22,8 +22,7 @@ 
 
 				if (isset($datas[$i][2])) {
 					$this->$function($datas[$i][1], $datas[$i][2]);
-				}
-				else {
+				} else {
 					$this->$function($datas[$i][1]);
 				}
 			}
@@ -56,8 +55,7 @@ 
 		protected function getTestRequired($value) {
 			if (($value == "") || ($value == null) || (strlen($value) == 0)) {
 				return false;
-			}
-			else {
+			} else {
 				return true;
 			}
 		}
@@ -70,8 +68,7 @@ 
 		protected function getTestLongueur($value, $longeur) {
 			if (strlen($value) > $longeur) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -83,8 +80,7 @@ 
 		protected function getTestInt($value) {
 			if (is_numeric($value)) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -102,12 +98,10 @@ 
 			if (($required != null) && ($this->getTestRequired($value) === false)) {
 				$this->erreur .= "<li>$erreur</li>";
 				return false;
-			}
-			else if (($value != "") && ($this->getTestLongueur($value, 2) === false)) {
+			} else if (($value != "") && ($this->getTestLongueur($value, 2) === false)) {
 				$this->erreur .= "<li>$erreur_long</li>";
 				return false;
-			}
-			else {
+			} else {
 				$this->$varaible = $value;
 				return true;
 			}
@@ -155,8 +149,7 @@ 
 		protected function setVerifRetapeMdp($value) {
 			if ($this->mdp == $value) {
 				return true;
-			}
-			else {
+			} else {
 				$this->erreur .= "<li>Les mots de passent ne correspondent pas</li>";
 				$this->mdp = null;
 				return false;
@@ -186,12 +179,10 @@ 
 			if (($required != null) && ($this->getTestRequired($value) === false)) {
 				$this->erreur .= "<li>Le champs E-mail ne peut pas être vide</li>";
 				return false;
-			}
-			else if (!$validator->isValid($value)) {
+			} else if (!$validator->isValid($value)) {
 				$this->erreur .= "<li>Le champs E-mail doit être une adresse E-mail valide</li>";
 				return false;
-			}
-			else {
+			} else {
 				$this->mail = $value;
 				return true;
 			}

core/admin/navigation/AdminNavigation.php

Spacing +4 added lines, -4 removed lines

@@ -5,20 +5,20 @@
 	use core\HTML\flashmessage\FlashMessage;
 	use core\Navigation;
 
-	class AdminNavigation extends Navigation{
+	class AdminNavigation extends Navigation {
 
 		public function setOrdreNavigation($nav) {
 			$dbc = App::getDb();
 			$count_nav = count($nav);
 
-			for ($i=0 ; $i<$count_nav ; $i++) {
+			for ($i = 0; $i < $count_nav; $i++) {
 				$lien = explode(".", $nav[$i]);
 
 				if ($lien[1] == "page") {
-					$dbc->update("ordre", $i+1)->from("navigation")->where("ID_page", "=", $lien[0])->set();
+					$dbc->update("ordre", $i + 1)->from("navigation")->where("ID_page", "=", $lien[0])->set();
 				}
 				else {
-					$dbc->update("ordre", $i+1)->from("navigation")->where("ID_module", "=", $lien[0])->set();
+					$dbc->update("ordre", $i + 1)->from("navigation")->where("ID_module", "=", $lien[0])->set();
 				}
 			}
 

Braces +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
 
 				if ($lien[1] == "page") {
 					$dbc->update("ordre", $i+1)->from("navigation")->where("ID_page", "=", $lien[0])->set();
-				}
-				else {
+				} else {
 					$dbc->update("ordre", $i+1)->from("navigation")->where("ID_module", "=", $lien[0])->set();
 				}
 			}

core/auth/Membre.php

Braces +4 added lines, -8 removed lines

@@ -87,12 +87,10 @@ 
 			if ((strlen($new_pseudo) < 5) || (strlen($new_pseudo) > 15)) {
 				$err = "Votre pseudo doit être entre 5 et 15 caractères";
 				$this->erreur = $err;
-			}
-			else if ($dbc->rechercherEgalite("identite", "pseudo", $new_pseudo) == false) {
+			} else if ($dbc->rechercherEgalite("identite", "pseudo", $new_pseudo) == false) {
 				$err = "Ce pseudo est déjà utilisé, veuillez en choisir un autre";
 				$this->erreur = $err;
-			}
-			else {
+			} else {
 				$dbc->update("pseudo", $new_pseudo)->from("identite")->where("ID_identite", "=", $_SESSION["idlogin".CLEF_SITE])->set();
 				$this->pseudo = $new_pseudo;
 			}
@@ -112,12 +110,10 @@ 
 			if (md5($old_mdp) != $mdp) {
 				$err = "Votre mot de passe est incorrect";
 				$this->erreur = $err;
-			}
-			else if ($new_mdp != $verif_new_mdp) {
+			} else if ($new_mdp != $verif_new_mdp) {
 				$err = "Vos mots de passe sont différents";
 				$this->erreur = $err;
-			}
-			else {
+			} else {
 				$mdpok = Encrypt::setEncryptMdp($new_mdp, $this->id_identite);
 				//le nouveau mdp est bon on update
 				$dbc->update("mdp", $mdpok)->from("identite")->where("ID_identite", "=", $this->id_identite)->set();

core/admin/navigation/menu/gestion.php

Braces +2 added lines, -4 removed lines

@@ -5,11 +5,9 @@
 
 		if ($menu_active == "plie") {
 			$_SESSION["menu_plie".CLEF_SITE] = "deplie";
-		}
-		else {
+		} else {
 			$_SESSION["menu_plie".CLEF_SITE] = "plie";
 		}
-	}
-	else {
+	} else {
 		$_SESSION["menu_plie".CLEF_SITE] = "plie";
 	}
\ No newline at end of file

core/HTML/flashmessage/FlashMessage.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 					//definit le chemin sachant que l'on part de index.php
 					$chemin = str_replace("\\", "/", str_replace("index.php", "", $_SERVER['SCRIPT_NAME']).__NAMESPACE__."/view/");
 				}
-				else if  (strstr($_SERVER['SCRIPT_NAME'], "installation.php")) {
+				else if (strstr($_SERVER['SCRIPT_NAME'], "installation.php")) {
 					//definit le chemin sachant que l'on part de admin.php
 					$chemin = str_replace("\\", "/", str_replace("installation.php", "", $_SERVER['SCRIPT_NAME']).__NAMESPACE__."/view/");
 				}

Braces +4 added lines, -8 removed lines

@@ -17,11 +17,9 @@ 
 
 			if ($type == "error") {
 				$icone = "<i class='fa fa-close'></i>";
-			}
-			else if ($type == "success") {
+			} else if ($type == "success") {
 				$icone = "<i class='fa fa-check'></i>";
-			}
-			else {
+			} else {
 				$icone = "<i class='fa fa-info'></i>";
 			}
 
@@ -43,12 +41,10 @@ 
 				if (strstr($_SERVER['SCRIPT_NAME'], "index.php")) {
 					//definit le chemin sachant que l'on part de index.php
 					$chemin = str_replace("\\", "/", str_replace("index.php", "", $_SERVER['SCRIPT_NAME']).__NAMESPACE__."/view/");
-				}
-				else if  (strstr($_SERVER['SCRIPT_NAME'], "installation.php")) {
+				} else if  (strstr($_SERVER['SCRIPT_NAME'], "installation.php")) {
 					//definit le chemin sachant que l'on part de admin.php
 					$chemin = str_replace("\\", "/", str_replace("installation.php", "", $_SERVER['SCRIPT_NAME']).__NAMESPACE__."/view/");
-				}
-				else {
+				} else {
 					//definit le chemin sachant que l'on part de admin.php
 					$chemin = str_replace("\\", "/", str_replace("admin.php", "", $_SERVER['SCRIPT_NAME']).__NAMESPACE__."/view/");
 				}