Piou-piou / ribs-framework

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

installation.php

Braces +2 added lines, -4 removed lines

@@ -18,12 +18,10 @@
 
 			//si c'est un controleur de base on va cerhcer dans core/admin
 			require_once("installation/controller/".$lien.".php");
-		}
-		else {
+		} else {
 			require("installation/views/template/principal.php");
 		}
-	}
-	else {
+	} else {
 		$page = "installation/views/index";
 		require("installation/controller/initialise_all.php");
 		require("installation/views/template/principal.php");

installation/controller/InstallRibs.php

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
 
 			try {
 				$this->dbc = new \PDO($this->db_type.':host='.$this->db_host.';dbname='.$this->db_name, $this->db_user, $this->db_pass);
-			}
-			catch (\PDOException $e) {
+			} catch (\PDOException $e) {
 				//on tente de créer la bdd
 				$erreur = "getErreur".$e->getCode();
 				$this->$erreur();

Unused Use Statements -1 removed lines

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

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/");
 				}

installation/controller/bdd/install.php

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 
 	if (isset($_POST['admin'])) {
 		Connexion::setLogin($pseudo, $mdp, WEBROOT."administrator/login", WEBROOT."administrator");
-	}
-	else {
+	} else {
 		Connexion::setLogin($pseudo, $mdp, WEBROOT."login", WEBROOT."index.php");
 	}
 ?>
\ No newline at end of file

installation/controller/InstallUtilisateur.php

Braces +2 added lines, -4 removed lines

@@ -21,8 +21,7 @@ 
 				foreach ($query as $obj) {
 					$params = $obj->mdp_params;
 				}
-			}
-			else {
+			} else {
 				$params = self::$params;
 			}
 
@@ -74,8 +73,7 @@ 
 
 			if ($id_identite != null) {
 				self::setSaveParams("$taille_bout1, $debut_bout2, $nb_aleatoire_mdp, $taille_bout2, $debut_bout1, ".ChaineCaractere::random(20), $id_identite);
-			}
-			else {
+			} else {
 				self::$params = "$taille_bout1, $debut_bout2, $nb_aleatoire_mdp, $taille_bout2, $debut_bout1, ".ChaineCaractere::random(20);
 			}
 

installation/controller/initialise_all.php

Braces +3 added lines, -6 removed lines

@@ -9,8 +9,7 @@ 
 			$db_user = $_SESSION['db_user'];
 			$db_pass = $_SESSION['db_pass'];
 			unset($_SESSION['err_db']);
-		}
-		else {
+		} else {
 			$db_type = null;
 			$db_host = null;
 			$db_name = null;
@@ -28,8 +27,7 @@ 
 			$mail_administrateur = $_SESSION['mail_administrateur'];
 
 			unset($_SESSION['err_config']);
-		}
-		else {
+		} else {
 			$nom_site = null;
 			$url_site = null;
 			$gerant_site = null;
@@ -45,8 +43,7 @@ 
 			$pseudo = $_SESSION['pseudo'];
 
 			unset($_SESSION['err_user']);
-		}
-		else {
+		} else {
 			$nom = null;
 			$prenom = null;
 			$pseudo = null;