Piou-piou / ribs-framework

core/modules/RouterModule.php

Braces +2 added lines, -4 removed lines

@@ -59,12 +59,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];
 				}
 			}

core/App.php

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 			if (strlen(utf8_decode($value)) > $limit_char) {
 				self::$erreur = true;
 				return "<li>$err_char</li>";
-			}
-			else if ($dbc->rechercherEgalite($nom_table, $champ, $value, $nom_id_table, $value_id_table) == true) {
+			} else if ($dbc->rechercherEgalite($nom_table, $champ, $value, $nom_id_table, $value_id_table) == true) {
 				self::$erreur = true;
 				return "<li>$err_egalite</li>";
 			}

core/RedirectError.php

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/auth/Inscription.php

Braces +9 added lines, -18 removed lines

@@ -20,8 +20,7 @@ 
 
 				if (isset($datas[$i][2])) {
 					$this->$function($datas[$i][1], $datas[$i][2]);
-				}
-				else {
+				} else {
 					$this->$function($datas[$i][1]);
 				}
 			}
@@ -54,8 +53,7 @@ 
 		protected function getTestRequired($value) {
 			if (($value == "") || ($value == null) || (strlen($value) == 0)) {
 				return false;
-			}
-			else {
+			} else {
 				return true;
 			}
 		}
@@ -68,8 +66,7 @@ 
 		protected function getTestLongueur($value, $longeur) {
 			if (strlen($value) > $longeur) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -81,8 +78,7 @@ 
 		protected function getTestInt($value) {
 			if (is_numeric($value)) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -100,12 +96,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;
 			}
@@ -153,8 +147,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;
@@ -182,12 +175,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 (($value != "") && (filter_var($value, FILTER_VALIDATE_EMAIL) == false)) {
+			} else if (($value != "") && (filter_var($value, FILTER_VALIDATE_EMAIL) == false)) {
 				$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/auth/Membre.php

Braces +5 added lines, -10 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->query("UPDATE identite set pseudo=$new_pseudo WHERE ID_identite=".$_SESSION["idlogin".CLEF_SITE]);
 				$this->pseudo = $new_pseudo;
 			}
@@ -112,16 +110,13 @@ 
 			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 if ($this->testpassword($new_mdp) == false) {
+			} else if ($this->testpassword($new_mdp) == false) {
 				$err = "Votre mot de passe est trop simple, il doit contenir 5 caractères et au moins un chiffre";
 				$this->erreur = $err;
-			}
-			else {
+			} else {
 				$mdpok = Encrypt::setEncryptMdp($new_mdp, $this->id_identite);
 				//le nouveau mdp est bon on update
 				$dbc->query("UPDATE identite SET mdp='$mdpok' WHERE ID_identite=".$this->id_identite);

core/admin/droitsacces/DroitAcces.php

Spacing +8 added lines, -8 removed lines

@@ -41,25 +41,25 @@ 
     
     
 		//-------------------------- GETTER ----------------------------------------------------------------------------//
-		public function getLogged(){
+		public function getLogged() {
 			return $this->logged;
 		}
-		public function getSuperAdmin(){
+		public function getSuperAdmin() {
 			return $this->super_admin;
 		}
-		public function getIdListeDroitAcces(){
+		public function getIdListeDroitAcces() {
 			return $this->id_liste_droit_acces;
 		}
-		public function getModifSeo(){
+		public function getModifSeo() {
 			return $this->modif_seo;
 		}
-		public function getModifContenu(){
+		public function getModifContenu() {
 			return $this->modif_contenu;
 		}
-		public function getModifNavigation(){
+		public function getModifNavigation() {
 			return $this->modif_navigation;
 		}
-		public function getSupprimerPage(){
+		public function getSupprimerPage() {
 			return $this->supprimer_page;
 		}
 
@@ -141,7 +141,7 @@ 
 			//page sans droit dans admin
 			$all_access = array("gestion-comptes/mon-compte", "index");
 
-			if (($this->super_admin == 1) || (in_array($this->getListeDroitPage($page), $this->getListeDroitAcces()))|| (in_array($page, $all_access))) {
+			if (($this->super_admin == 1) || (in_array($this->getListeDroitPage($page), $this->getListeDroitAcces())) || (in_array($page, $all_access))) {
 				return true;
 			}
 			else {

Braces +9 added lines, -8 removed lines

@@ -78,7 +78,9 @@ 
 				");
 
 			if ((is_array($query)) && (count($query) > 0)) {
-				foreach ($query as $obj) $liste_droit_acces[] = $obj->droit_acces;
+				foreach ($query as $obj) {
+					$liste_droit_acces[] = $obj->droit_acces;
+				}
 			}
 
 			return $liste_droit_acces;
@@ -93,7 +95,9 @@ 
 
 			$query = $dbc->query("SELECT droit_acces FROM droit_acces WHERE page LIKE '%$page%'");
 			if ((is_array($query)) && (count($query) > 0)) {
-				foreach ($query as $obj) $droit_acces = $obj->droit_acces;
+				foreach ($query as $obj) {
+					$droit_acces = $obj->droit_acces;
+				}
 			}
 
 			return $droit_acces;
@@ -143,8 +147,7 @@ 
 
 			if (($this->super_admin == 1) || (in_array($this->getListeDroitPage($page), $this->getListeDroitAcces()))|| (in_array($page, $all_access))) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -169,8 +172,7 @@ 
 			//si les trois sont différent de 0 on renvoit true soinon false
 			if (($this->super_admin == 1) || ((in_array($droit, $liste_droit_acces)) && in_array(1, $array_modif))) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -185,8 +187,7 @@ 
 
 			if (($this->super_admin == 1) || (in_array($droit_acces, $liste_droit_acces))) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}

core/admin/Admin.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);
 			}
 

core/admin/droitsacces/GestionDroitAcces.php

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/database/Querybuilder.php

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

Spacing +6 added lines, -6 removed lines

@@ -139,7 +139,7 @@ 
 		 */
 		public function get() {
 			$values = [];
-			$requete = $this->req_beginning . implode(",", $this->select_champ) . " FROM " . implode(",", $this->table);
+			$requete = $this->req_beginning.implode(",", $this->select_champ)." FROM ".implode(",", $this->table);
 
 			if ((!empty($this->conditions)) || (!empty($this->conditions_table))) {
 				$requete .= $this->getWhereConditions()[0];
@@ -162,12 +162,12 @@ 
 
 			$datas = [];
 			$count = count($this->champs);
-			for ($i=0 ; $i<$count ; $i++) {
+			for ($i = 0; $i < $count; $i++) {
 				$datas[] = $this->champs[$i]."=:".$this->champs[$i];
 			}
 
 			//si on a des conditions alors on sera dans un insert
-			$requete = $this->req_beginning . implode(",", $this->table) . " SET " . implode(", ", $datas);
+			$requete = $this->req_beginning.implode(",", $this->table)." SET ".implode(", ", $datas);
 
 			if ((!empty($this->conditions)) || (!empty($this->conditions_table))) {
 				$requete .= $this->getWhereConditions()[0];
@@ -184,7 +184,7 @@ 
 		 */
 		public function del() {
 			$values = [];
-			$requete = $this->req_beginning . implode(",", $this->table);
+			$requete = $this->req_beginning.implode(",", $this->table);
 
 			if (!empty($this->conditions)) {
 				$requete .= $this->getWhereConditions()[0];
@@ -238,7 +238,7 @@ 
 
 				$count = count($this->champs_where);
 
-				for ($i=0 ; $i<$count ; $i++) {
+				for ($i = 0; $i < $count; $i++) {
 					$datas[] = $this->champs_where[$i]." ".$this->conditions[$i]." :".str_replace(".", "", $this->champs_where[$i])." ".$this->closure[$i]." ";
 				}
 			}
@@ -249,7 +249,7 @@ 
 				}
 			}
 
-			return [" WHERE ". implode(" ", $datas), $values];
+			return [" WHERE ".implode(" ", $datas), $values];
 		}
 
 		/**

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 		}
 
 		/**
-		 * @param $champ
+		 * @param string $champ
 		 * @param $value
 		 * @return $this
 		 */