Passed
Push — master ( bcd94f...358575 )
by Anthony
02:51
created
admin/controller/initialise_all.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -39,8 +39,7 @@  discard block
 block discarded – undo
39 39
 			$acces_admin = $_SESSION['acces_admin'];
40 40
 
41 41
 			unset($_SESSION['err_ajout_utilisateur']);
42
-		}
43
-		else {
42
+		} else {
44 43
 			$nom = null;
45 44
 			$prenom = null;
46 45
 			$pseudo = null;
@@ -67,8 +66,7 @@  discard block
 block discarded – undo
67 66
 			$contenu_page = $_SESSION['contenu'];
68 67
 
69 68
 			unset($_SESSION['err_modification_contenu']);
70
-		}
71
-		else if (($page == "gestion-contenus/modifier-contenu") || ($page == "gestion-contenus/inline")) {
69
+		} else if (($page == "gestion-contenus/modifier-contenu") || ($page == "gestion-contenus/inline")) {
72 70
 			$id_page_courante = $_GET['id'];
73 71
 
74 72
 			$contenu->getHeadPage($id_page_courante);
@@ -85,8 +83,7 @@  discard block
 block discarded – undo
85 83
 			if ($url == "") {
86 84
 				$url = "index";
87 85
 			}
88
-		}
89
-		else {
86
+		} else {
90 87
 			$balise_title = null;
91 88
 			$url = null;
92 89
 			$meta_description = null;
@@ -124,8 +121,7 @@  discard block
 block discarded – undo
124 121
 			$contenu_dynamique = $config->getContenusDynamique();
125 122
 			$responsive = $config->getResponsive();
126 123
 			$cache_config = $config->getCache();
127
-		}
128
-		else {
124
+		} else {
129 125
 			$config = new \core\Configuration();
130 126
 			$nom_site = $config->getNomSite();
131 127
 			$url_site = $config->getUrlSite();
@@ -161,8 +157,7 @@  discard block
 block discarded – undo
161 157
 			$db_host_prod = $_SESSION["db_host_prod"];
162 158
 
163 159
 			unset($_SESSION['err_modification_configini']);
164
-		}
165
-		else {
160
+		} else {
166 161
 			$developpement = $ini["developpment"];
167 162
 
168 163
 			$db_type_dev = $ini["dev"]["DB_TYPE"];
Please login to merge, or discard this patch.
core/admin/contenus/gestion/contenus_inline.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 	$gestion_contenu = new \core\admin\contenus\GestionContenus();
3 3
 	$droit_acces = new \core\admin\droitsacces\DroitAcces();
4 4
 
5
-	if ((($droit_acces->getDroitAccesContenu("GESTION CONTENU PAGE", $_POST['id_page']) == true) &&  ($droit_acces->getModifContenu() != 0)) || ($droit_acces->getSuperAdmin() == 1)) {
5
+	if ((($droit_acces->getDroitAccesContenu("GESTION CONTENU PAGE", $_POST['id_page']) == true) && ($droit_acces->getModifContenu() != 0)) || ($droit_acces->getSuperAdmin() == 1)) {
6 6
 
7 7
 		$gestion_contenu->setModifierContenu($_GET['id_page'], $_GET['contenu']);
8 8
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,7 @@
 block discarded – undo
24 24
 		$_SESSION['acces_admin'] = $inscription->getAccesAdministration();
25 25
 		//$id_liste_droit_acces = $_SESSION['id_liste_droit_acces'];
26 26
 		\core\HTML\flashmessage\FlashMessage::setFlash("<ul>".$inscription->getErreur()."</ul>");
27
-	}
28
-	else {
27
+	} else {
29 28
 		\core\HTML\flashmessage\FlashMessage::setFlash("L'utilisateur ".$inscription->getNom()." ".$inscription->getPrenom()."a bien été inscrit", "success");
30 29
 		$inscription->setInscrireUtilisateur();
31 30
 	}
Please login to merge, or discard this patch.
admin/views/gestion-contenus/inline.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 <button id="supprimer-page-contenu" type="button" class="submit-contenu supprimer-page supprimer open-popup" popup="supprimer-page" href="<?=ADMWEBROOT?>gestion-contenus/modifier-contenu?id=<?=$id_page_courante?>"><i class="fa fa-times"></i>Annuler</button>
20 20
 
21 21
 
22
-<?php if ($config->getResponsive() == 1){?>
22
+<?php if ($config->getResponsive() == 1) {?>
23 23
 	<link rel="stylesheet" type="text/css" href="<?=WEBROOT?>admin/views/template/css/foundation-inline.css">
24 24
 <?php }?>
25 25
 <link rel="stylesheet" type="text/css" href="<?=TPLWEBROOT?>css/page.css">
@@ -35,9 +35,9 @@  discard block
 block discarded – undo
35 35
 <script>
36 36
 	CKEDITOR.disableAutoInline = true;
37 37
 
38
-	<?php for($i=0 ; $i<$bloc_editable ; $i++):?>
38
+	<?php for ($i = 0; $i < $bloc_editable; $i++):?>
39 39
 		var editor<?=$i?> = CKEDITOR.inline("editor<?=$i?>", { customConfig: "<?=WEBROOT?>config/config_ckeditor.js" });
40 40
 		CKFinder.setupCKEditor( editor<?=$i?>, "<?=LIBSWEBROOT?>ckfinder/" );
41
-	<?php endfor;?>
41
+	<?php endfor; ?>
42 42
 </script>
43
-<?php require_once(ROOT."admin/views/gestion-contenus/js/inline.php");?>
44 43
\ No newline at end of file
44
+<?php require_once(ROOT."admin/views/gestion-contenus/js/inline.php"); ?>
45 45
\ No newline at end of file
Please login to merge, or discard this patch.
core/admin/contenus/gestion/modifier_contenus.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,8 +10,7 @@  discard block
 block discarded – undo
10 10
 			$meta_description = $_POST['meta_description'];
11 11
 			$titre_page = $_POST['titre_page'];
12 12
 			$parent = $_POST['parent_texte'];
13
-		}
14
-		else {
13
+		} else {
15 14
 			$contenu_class->getHeadPage($_POST['id_page']);
16 15
 			$contenu_class->getContenuPage($_POST['id_page']);
17 16
 
@@ -19,8 +18,7 @@  discard block
 block discarded – undo
19 18
 				$balise_title = $_POST['balise_title'];
20 19
 				$url = $_POST['url'];
21 20
 				$meta_description = $_POST['meta_description'];
22
-			}
23
-			else {
21
+			} else {
24 22
 				$balise_title = $contenu_class->getBaliseTitle();
25 23
 				$url = $contenu_class->getUrl();
26 24
 				$meta_description = $contenu_class->getMetaDescription();
@@ -29,8 +27,7 @@  discard block
 block discarded – undo
29 27
 			if ($droit_acces->getModifNavigation() != 0) {
30 28
 				$titre_page = $_POST['titre_page'];
31 29
 				$parent = $_POST['parent_texte'];
32
-			}
33
-			else {
30
+			} else {
34 31
 				$titre_page = $contenu_class->getTitre();
35 32
 				$parent = $contenu_class->getParent();
36 33
 			}
@@ -41,8 +38,7 @@  discard block
 block discarded – undo
41 38
 		if ((\core\App::getErreur() !== true) && ($gestion_contenu->getErreur() !== true)) {
42 39
 			\core\HTML\flashmessage\FlashMessage::setFlash("La page ".$_POST['titre_page']." a été mise à jour", "success");
43 40
 		}
44
-	}
45
-	else {
41
+	} else {
46 42
 		\core\HTML\flashmessage\FlashMessage::setFlash("Vous n'avez pas l'autorisation de modifier cette page !");
47 43
 	}
48 44
 
Please login to merge, or discard this patch.
core/form/support/envoyer_message.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,7 @@
 block discarded – undo
24 24
 		$_SESSION['acces_admin'] = $inscription->getAccesAdministration();
25 25
 		//$id_liste_droit_acces = $_SESSION['id_liste_droit_acces'];
26 26
 		\core\HTML\flashmessage\FlashMessage::setFlash("<ul>".$inscription->getErreur()."</ul>");
27
-	}
28
-	else {
27
+	} else {
29 28
 		\core\HTML\flashmessage\FlashMessage::setFlash("L'utilisateur ".$inscription->getNom()." ".$inscription->getPrenom()."a bien été inscrit", "success");
30 29
 		$inscription->setInscrireUtilisateur();
31 30
 	}
Please login to merge, or discard this patch.
core/auth/Inscription.php 1 patch
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -22,8 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
 				if (isset($datas[$i][2])) {
24 24
 					$this->$function($datas[$i][1], $datas[$i][2]);
25
-				}
26
-				else {
25
+				} else {
27 26
 					$this->$function($datas[$i][1]);
28 27
 				}
29 28
 			}
@@ -56,8 +55,7 @@  discard block
 block discarded – undo
56 55
 		protected function getTestRequired($value) {
57 56
 			if (($value == "") || ($value == null) || (strlen($value) == 0)) {
58 57
 				return false;
59
-			}
60
-			else {
58
+			} else {
61 59
 				return true;
62 60
 			}
63 61
 		}
@@ -70,8 +68,7 @@  discard block
 block discarded – undo
70 68
 		protected function getTestLongueur($value, $longeur) {
71 69
 			if (strlen($value) > $longeur) {
72 70
 				return true;
73
-			}
74
-			else {
71
+			} else {
75 72
 				return false;
76 73
 			}
77 74
 		}
@@ -83,8 +80,7 @@  discard block
 block discarded – undo
83 80
 		protected function getTestInt($value) {
84 81
 			if (is_numeric($value)) {
85 82
 				return true;
86
-			}
87
-			else {
83
+			} else {
88 84
 				return false;
89 85
 			}
90 86
 		}
@@ -102,12 +98,10 @@  discard block
 block discarded – undo
102 98
 			if (($required != null) && ($this->getTestRequired($value) === false)) {
103 99
 				$this->erreur .= "<li>$erreur</li>";
104 100
 				return false;
105
-			}
106
-			else if (($value != "") && ($this->getTestLongueur($value, 2) === false)) {
101
+			} else if (($value != "") && ($this->getTestLongueur($value, 2) === false)) {
107 102
 				$this->erreur .= "<li>$erreur_long</li>";
108 103
 				return false;
109
-			}
110
-			else {
104
+			} else {
111 105
 				$this->$varaible = $value;
112 106
 				return true;
113 107
 			}
@@ -155,8 +149,7 @@  discard block
 block discarded – undo
155 149
 		protected function setVerifRetapeMdp($value) {
156 150
 			if ($this->mdp == $value) {
157 151
 				return true;
158
-			}
159
-			else {
152
+			} else {
160 153
 				$this->erreur .= "<li>Les mots de passent ne correspondent pas</li>";
161 154
 				$this->mdp = null;
162 155
 				return false;
@@ -186,12 +179,10 @@  discard block
 block discarded – undo
186 179
 			if (($required != null) && ($this->getTestRequired($value) === false)) {
187 180
 				$this->erreur .= "<li>Le champs E-mail ne peut pas être vide</li>";
188 181
 				return false;
189
-			}
190
-			else if (!$validator->isValid($value)) {
182
+			} else if (!$validator->isValid($value)) {
191 183
 				$this->erreur .= "<li>Le champs E-mail doit être une adresse E-mail valide</li>";
192 184
 				return false;
193
-			}
194
-			else {
185
+			} else {
195 186
 				$this->mail = $value;
196 187
 				return true;
197 188
 			}
Please login to merge, or discard this patch.
core/admin/navigation/AdminNavigation.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,20 +5,20 @@
 block discarded – undo
5 5
 	use core\HTML\flashmessage\FlashMessage;
6 6
 	use core\Navigation;
7 7
 
8
-	class AdminNavigation extends Navigation{
8
+	class AdminNavigation extends Navigation {
9 9
 
10 10
 		public function setOrdreNavigation($nav) {
11 11
 			$dbc = App::getDb();
12 12
 			$count_nav = count($nav);
13 13
 
14
-			for ($i=0 ; $i<$count_nav ; $i++) {
14
+			for ($i = 0; $i < $count_nav; $i++) {
15 15
 				$lien = explode(".", $nav[$i]);
16 16
 
17 17
 				if ($lien[1] == "page") {
18
-					$dbc->update("ordre", $i+1)->from("navigation")->where("ID_page", "=", $lien[0])->set();
18
+					$dbc->update("ordre", $i + 1)->from("navigation")->where("ID_page", "=", $lien[0])->set();
19 19
 				}
20 20
 				else {
21
-					$dbc->update("ordre", $i+1)->from("navigation")->where("ID_module", "=", $lien[0])->set();
21
+					$dbc->update("ordre", $i + 1)->from("navigation")->where("ID_module", "=", $lien[0])->set();
22 22
 				}
23 23
 			}
24 24
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@
 block discarded – undo
16 16
 
17 17
 				if ($lien[1] == "page") {
18 18
 					$dbc->update("ordre", $i+1)->from("navigation")->where("ID_page", "=", $lien[0])->set();
19
-				}
20
-				else {
19
+				} else {
21 20
 					$dbc->update("ordre", $i+1)->from("navigation")->where("ID_module", "=", $lien[0])->set();
22 21
 				}
23 22
 			}
Please login to merge, or discard this patch.
core/auth/Membre.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -87,12 +87,10 @@  discard block
 block discarded – undo
87 87
 			if ((strlen($new_pseudo) < 5) || (strlen($new_pseudo) > 15)) {
88 88
 				$err = "Votre pseudo doit être entre 5 et 15 caractères";
89 89
 				$this->erreur = $err;
90
-			}
91
-			else if ($dbc->rechercherEgalite("identite", "pseudo", $new_pseudo) == false) {
90
+			} else if ($dbc->rechercherEgalite("identite", "pseudo", $new_pseudo) == false) {
92 91
 				$err = "Ce pseudo est déjà utilisé, veuillez en choisir un autre";
93 92
 				$this->erreur = $err;
94
-			}
95
-			else {
93
+			} else {
96 94
 				$dbc->update("pseudo", $new_pseudo)->from("identite")->where("ID_identite", "=", $_SESSION["idlogin".CLEF_SITE])->set();
97 95
 				$this->pseudo = $new_pseudo;
98 96
 			}
@@ -112,12 +110,10 @@  discard block
 block discarded – undo
112 110
 			if (md5($old_mdp) != $mdp) {
113 111
 				$err = "Votre mot de passe est incorrect";
114 112
 				$this->erreur = $err;
115
-			}
116
-			else if ($new_mdp != $verif_new_mdp) {
113
+			} else if ($new_mdp != $verif_new_mdp) {
117 114
 				$err = "Vos mots de passe sont différents";
118 115
 				$this->erreur = $err;
119
-			}
120
-			else {
116
+			} else {
121 117
 				$mdpok = Encrypt::setEncryptMdp($new_mdp, $this->id_identite);
122 118
 				//le nouveau mdp est bon on update
123 119
 				$dbc->update("mdp", $mdpok)->from("identite")->where("ID_identite", "=", $this->id_identite)->set();
Please login to merge, or discard this patch.
core/admin/navigation/menu/gestion.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,11 +5,9 @@
 block discarded – undo
5 5
 
6 6
 		if ($menu_active == "plie") {
7 7
 			$_SESSION["menu_plie".CLEF_SITE] = "deplie";
8
-		}
9
-		else {
8
+		} else {
10 9
 			$_SESSION["menu_plie".CLEF_SITE] = "plie";
11 10
 		}
12
-	}
13
-	else {
11
+	} else {
14 12
 		$_SESSION["menu_plie".CLEF_SITE] = "plie";
15 13
 	}
16 14
\ No newline at end of file
Please login to merge, or discard this patch.