Inspection of "update install script" - Piou-piou/ribs-framework - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( acc660...2c4e8f )

by Anthony

created 2017-03-17 22:49 UTC

Status

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -6,7 +6,6 @@
 block discarded – undo
 	if ((\core\App::getErreur() !== true) && ($gestion_contenu->getErreur() !== true)) {
 		\core\HTML\flashmessage\FlashMessage::setFlash("La page ".$_POST['titre_page']." a bien été crée", "success");
 		header("location:".ADMWEBROOT."gestion-contenus/modifier-contenu?id=".$gestion_contenu->getIdPage());
-	}
-	else {
+	} else {
 		header("location:".ADMWEBROOT."gestion-contenus/creer-une-page");
 	}
\ No newline at end of file

Please login to merge, or discard this patch.

core/Configuration.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -70,7 +70,7 @@
 block discarded – undo
 			return $this->cache;
 		}
 		public function getDesactiverNavigation(){
-		    return $this->desactiver_navigation;
+			return $this->desactiver_navigation;
 		}
 
 		//pour la configuration des comptes

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -69,7 +69,7 @@
 block discarded – undo
 		public function getCache() {
 			return $this->cache;
 		}
-		public function getDesactiverNavigation(){
+		public function getDesactiverNavigation() {
 		    return $this->desactiver_navigation;
 		}
 

Please login to merge, or discard this patch.

admin/views/template/principal.php 2 patches

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

@@ -114,10 +114,11 @@
 block discarded – undo
 
 		<?php
 			if ($twig_page === true) {
-				if (!isset($arr)) $arr = [];
+				if (!isset($arr)) {
+					$arr = [];
+				}
 				echo $twig->render($page.".html", array_merge(array_merge(array_merge($arr, $constant), $_REQUEST), $_SESSION));
-			}
-			else {
+			} else {
 				require("admin/views/".$page.".php");
 			}
 		?>

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
 		<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 		<link rel="stylesheet" type="text/css" href="<?=WEBROOT?>admin/views/template/css/style.css">
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-		<?php require_once(ROOT."admin/views/template/js/menu.php");?>
+		<?php require_once(ROOT."admin/views/template/js/menu.php"); ?>
 
 		<!-- Les librairies utlisées -->
 		<link rel="stylesheet" type="text/css" href="<?=LIBSWEBROOT?>popup/css/style.css">
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
 	</head>
 	<?=\core\HTML\flashmessage\FlashMessage::getFlash(); ?>
 	<body>
-		<nav class="menu <?php if (($_SESSION["menu_plie".CLEF_SITE] == "deplie") || (!isset($_SESSION["menu_plie".CLEF_SITE]))):?>active<?php endif;?>">
+		<nav class="menu <?php if (($_SESSION["menu_plie".CLEF_SITE] == "deplie") || (!isset($_SESSION["menu_plie".CLEF_SITE]))):?>active<?php endif; ?>">
 			<div class="titre">
 				<h1>Ribs V0.1</h1>
 				<i class="fa fa-bars"></i>
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 										<a href="<?=ADMWEBROOT?>notifications"><i class="fa fa-bell  <?php if ($admin->getNotification() == 1):?> animated infinite swing<?php endif; ?>"></i></a>
 									</div>
 								</div>
-							<?php endif;?>
+							<?php endif; ?>
 							<div class="colonne">
 								<div class="config">
 									<a href="<?=ADMWEBROOT?>configuration/index"><i class="fa fa-gear"></i></a>
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 							<ul>
 								<?php if ($droit_acces->getDroitAcces("CREATION COMPTE ADMIN")):?>
 									<li><i class="fa fa-user"></i><a href="<?=ADMWEBROOT?>gestion-comptes/creer-utilisateur">Créer un utilisateur</a></li>
-								<?php endif;?>
+								<?php endif; ?>
 							</ul>
 						</li>
 					<?php endif; ?>

Please login to merge, or discard this patch.

core/admin/droitsacces/DroitAcces.php 1 patch

Braces +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -80,7 +80,9 @@  discard block
 block discarded – undo
 				->get();
 
 			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;
@@ -131,8 +133,7 @@  discard block
 block discarded – undo
 			//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;
 			}
 		}
@@ -147,8 +148,7 @@  discard block
 block discarded – undo
 
 			if (($this->super_admin == 1) || (in_array($droit_acces, $liste_droit_acces))) {
 				return true;
-			}
-			else {
+			} else {
 				return false;
 			}
 		}

Please login to merge, or discard this patch.

admin/controller/initialise_all.php 1 patch

Braces +5 added lines, -10 removed lines patch added patch discarded remove patch

@@ -36,8 +36,7 @@  discard block
 block discarded – undo
 			$acces_admin = $_SESSION['acces_admin'];
 
 			unset($_SESSION['err_ajout_utilisateur']);
-		}
-		else {
+		} else {
 			$nom = null;
 			$prenom = null;
 			$pseudo = null;
@@ -63,8 +62,7 @@  discard block
 block discarded – undo
 			$parent_courant = $_SESSION['parent'];
 
 			unset($_SESSION['err_modification_contenu']);
-		}
-		else if (($page == "gestion-contenus/modifier-contenu") || ($page == "gestion-contenus/inline")) {
+		} else if (($page == "gestion-contenus/modifier-contenu") || ($page == "gestion-contenus/inline")) {
 			$id_page_courante = $_GET['id'];
 
 			$contenu->getHeadPage($id_page_courante);
@@ -78,8 +76,7 @@  discard block
 block discarded – undo
 			$texte_parent_courant = $gestion_contenu->getParentTexte($parent_courant);
 			$contenu_page = $contenu->getContenu();
 			$bloc_editable = $gestion_contenu->getBlocEditable($id_page_courante);
-		}
-		else {
+		} else {
 			$balise_title = null;
 			$url = null;
 			$meta_description = null;
@@ -115,8 +112,7 @@  discard block
 block discarded – undo
 			$config = new \core\Configuration();
 			$contenu_dynamique = $config->getContenusDynamique();
 			$cache_config = $config->getCache();
-		}
-		else {
+		} else {
 			$config = new \core\Configuration();
 			$nom_site = $config->getNomSite();
 			$gerant_site = $config->getGerantSite();
@@ -150,8 +146,7 @@  discard block
 block discarded – undo
 			$db_host_prod = $_SESSION["db_host_prod"];
 
 			unset($_SESSION['err_modification_configini']);
-		}
-		else {
+		} else {
 			$developpement = $ini["developpment"];
 
 			$db_type_dev = $ini["dev"]["DB_TYPE"];

Please login to merge, or discard this patch.

admin/views/gestion-contenus/inline.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -31,13 +31,13 @@
 block discarded – undo
 <script>
 	CKEDITOR.disableAutoInline = true;
 
-	<?php for($i=0 ; $i<$bloc_editable ; $i++):?>
+	<?php for ($i = 0; $i < $bloc_editable; $i++):?>
 		$(document).ready(function() {
 			console.log("editor<?=$i?>");
 			$("#editor<?=$i?>").attr("contenteditable", true);
 		})
 		var editor<?=$i?> = CKEDITOR.inline("editor<?=$i?>", { customConfig: "<?=WEBROOT?>config/config_ckeditor.js" });
 		CKFinder.setupCKEditor( editor<?=$i?>, "<?=LIBSWEBROOT?>ckfinder/" );
-	<?php endfor;?>
+	<?php endfor; ?>
 </script>
-<?php require_once(ROOT."admin/views/gestion-contenus/js/inline.php");?>
\ No newline at end of file
+<?php require_once(ROOT."admin/views/gestion-contenus/js/inline.php"); ?>
\ No newline at end of file

Please login to merge, or discard this patch.

core/admin/Admin.php 1 patch

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

@@ -84,8 +84,7 @@  discard block
 block discarded – undo
 
 			if (($config->getValiderInscription() == 1) && ($valide == 0)) {
 				return "<a href=".ADMWEBROOT."controller/core/admin/comptes/valider_compte?id_identite=$id_identite>Valider cet utilisateur</a>";
-			}
-			else {
+			} else {
 				return "Utilisateur validé";
 			}
 		}
@@ -180,8 +179,7 @@  discard block
 block discarded – undo
 
 				$mail = new Mail();
 				$mail->setEnvoyerMail("Réinitialisation de votre E-mail effectuée", "Votre mot de passe a été réinitialisé", $this->mail);
-			}
-			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 = "le mot de passe de $this->pseudo ne peu pas être réinitialisé car il ne possède pas d'E-mail";
 			}

Please login to merge, or discard this patch.

core/modules/RouterModule.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
 		public function getPage() {
 			return $this->page;
 		}
-		public function getModule(){
+		public function getModule() {
 			return $this->module;
 		}
 		public function getController() {
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 		 * Permets de générer l'url pour aller charger la page concernee pour le module blog
 		 * appele également l'actoin à effectur dans la page
 		 */
-		public function getUrl($url, $admin="app") {
+		public function getUrl($url, $admin = "app") {
 			$explode = explode("/", $url);
 			$count = count($explode);
 			$debut_url = "";

Please login to merge, or discard this patch.

Braces +3 added lines, -6 removed lines patch added patch discarded remove patch

@@ -65,8 +65,7 @@  discard block
 block discarded – undo
 				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];
 				}
 			}
@@ -76,8 +75,7 @@  discard block
 block discarded – undo
 			
 			if ($centre_url == "") {
 				$this->page = "index";
-			}
-			else {
+			} else {
 				$file = ROOT."modules/".$debut_url."/".$admin."/views/".$centre_url;
 				
 				if (!file_exists($file.".html")) {
@@ -129,8 +127,7 @@  discard block
 block discarded – undo
 			//on require le fichier routes.php dans /modules/nom_module/router/routes.php
 			if ($this->admin !== "app") {
 				require_once(MODULEROOT.$this->module."/router/admin_routes.php");
-			}
-			else {
+			} else {
 				require_once(MODULEROOT.$this->module."/router/routes.php");
 			}
 		}

Please login to merge, or discard this patch.

admin.php 1 patch

Braces +9 added lines, -18 removed lines patch added patch discarded remove patch

@@ -32,8 +32,7 @@  discard block
 block discarded – undo
 	if (isset($_GET['page'])) {
 		$titre_page = "Administration du site";
 		$description_page = "Administration du site";
-	}
-	else {
+	} else {
 		$titre_page = "Administration du site";
 		$description_page = "Administration du site";
 	}
@@ -63,25 +62,21 @@  discard block
 block discarded – undo
 			//si c'est un controleur de base on va cerhcer dans core/admin
 			if ($core !== false) {
 				require_once(ROOT.$lien.".php");
-			}
-			else if ($module !== false) {
+			} else if ($module !== false) {
 				$explode = explode("/", $lien, 3);
 
 				require_once(ROOT.$explode[0]."/".$explode[1]."/admin/controller/".$explode[2].".php");
-			}
-			else {
+			} else {
 				require_once("admin/controller/".$lien.".php");
 			}
 		}
 		//pour la page de login
 		else if ($page == "login") {
 			require("admin/views/template/login_admin.php");
-		}
-		else {
+		} else {
 			if (!isset($_SESSION["idlogin".CLEF_SITE])) {
 				Connexion::setObgConnecte(WEBROOT."administrator/login");
-			}
-			else {
+			} else {
 				$router_module = new \core\modules\RouterModule();
 				if ($router_module->getRouteModuleExist($page)) {
 					$page = $router_module->getUrl($page, "admin");
@@ -103,12 +98,10 @@  discard block
 block discarded – undo
 				if (($droit_acces->getDroitAcces("GESTION COMPTES") === false) && ($page == "gestion-comptes")) {
 					FlashMessage::setFlash("L'accès à cette page n'est pas activé, veuillez contacter votre administrateur pour y avoir accès");
 					header("location:".WEBROOT."administrator");
-				}
-				else if (($droit_acces->getDroitAcces("GESTION DROIT ACCES") === false) && ($page == "gestion-droits-acces")) {
+				} else if (($droit_acces->getDroitAcces("GESTION DROIT ACCES") === false) && ($page == "gestion-droits-acces")) {
 					FlashMessage::setFlash("L'accès à cette page n'est pas activé, veuillez contacter votre administrateur pour y avoir accès");
 					header("location:".WEBROOT."administrator");
-				}
-				else {
+				} else {
 					$admin = new Admin($_SESSION["idlogin".CLEF_SITE]);
 					
 					require(ROOT."admin/controller/initialise_all.php");
@@ -116,14 +109,12 @@  discard block
 block discarded – undo
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		Connexion::setObgConnecte(WEBROOT."administrator/login");
 
 		if (!isset($_SESSION["idlogin".CLEF_SITE])) {
 			Connexion::setObgConnecte(WEBROOT."administrator/login");
-		}
-		else {
+		} else {
 			$page = "index";
 			$admin = new Admin($_SESSION["idlogin".CLEF_SITE]);
 			require(ROOT."admin/controller/initialise_all.php");

Please login to merge, or discard this patch.

		@@ -84,8 +84,7 @@ discard block
		block discarded – undo
84	84
85	85	if (($config->getValiderInscription() == 1) && ($valide == 0)) {
86	86	return "<a href=".ADMWEBROOT."controller/core/admin/comptes/valider_compte?id_identite=$id_identite>Valider cet utilisateur</a>";
87		- }
88		- else {
	87	+ } else {
89	88	return "Utilisateur validé";
90	89	}
91	90	}
		@@ -180,8 +179,7 @@ discard block
		block discarded – undo
180	179
181	180	$mail = new Mail();
182	181	$mail->setEnvoyerMail("Réinitialisation de votre E-mail effectuée", "Votre mot de passe a été réinitialisé", $this->mail);
183		- }
184		- else {
	182	+ } else {
185	183	FlashMessage::setFlash("le mot de passe de $this->pseudo ne peu pas être réinitialisé car il ne possède pas d'E-mail");
186	184	$this->erreur = "le mot de passe de $this->pseudo ne peu pas être réinitialisé car il ne possède pas d'E-mail";
187	185	}

		@@ -6,7 +6,6 @@
		block discarded – undo
6	6	if ((\core\App::getErreur() !== true) && ($gestion_contenu->getErreur() !== true)) {
7	7	\core\HTML\flashmessage\FlashMessage::setFlash("La page ".$_POST['titre_page']." a bien été crée", "success");
8	8	header("location:".ADMWEBROOT."gestion-contenus/modifier-contenu?id=".$gestion_contenu->getIdPage());
9		- }
10		- else {
	9	+ } else {
11	10	header("location:".ADMWEBROOT."gestion-contenus/creer-une-page");
12	11	}
13	12	\ No newline at end of file

		@@ -70,7 +70,7 @@
		block discarded – undo
70	70	return $this->cache;
71	71	}
72	72	public function getDesactiverNavigation(){
73		- return $this->desactiver_navigation;
	73	+ return $this->desactiver_navigation;
74	74	}
75	75
76	76	//pour la configuration des comptes

		@@ -69,7 +69,7 @@
		block discarded – undo
69	69	public function getCache() {
70	70	return $this->cache;
71	71	}
72		- public function getDesactiverNavigation(){
	72	+ public function getDesactiverNavigation() {
73	73	return $this->desactiver_navigation;
74	74	}
75	75

		@@ -114,10 +114,11 @@
		block discarded – undo
114	114
115	115	<?php
116	116	if ($twig_page === true) {
117		- if (!isset($arr)) $arr = [];
	117	+ if (!isset($arr)) {
	118	+ $arr = [];
	119	+ }
118	120	echo $twig->render($page.".html", array_merge(array_merge(array_merge($arr, $constant), $_REQUEST), $_SESSION));
119		- }
120		- else {
	121	+ } else {
121	122	require("admin/views/".$page.".php");
122	123	}
123	124	?>

		@@ -7,7 +7,7 @@ discard block
		block discarded – undo
7	7	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
8	8	<link rel="stylesheet" type="text/css" href="<?=WEBROOT?>admin/views/template/css/style.css">
9	9	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
10		- <?php require_once(ROOT."admin/views/template/js/menu.php");?>
	10	+ <?php require_once(ROOT."admin/views/template/js/menu.php"); ?>
11	11
12	12	<!-- Les librairies utlisées -->
13	13	<link rel="stylesheet" type="text/css" href="<?=LIBSWEBROOT?>popup/css/style.css">
		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	</head>
18	18	<?=\core\HTML\flashmessage\FlashMessage::getFlash(); ?>
19	19	<body>
20		- <nav class="menu <?php if (($_SESSION["menu_plie".CLEF_SITE] == "deplie") \|\| (!isset($_SESSION["menu_plie".CLEF_SITE]))):?>active<?php endif;?>">
	20	+ <nav class="menu <?php if (($_SESSION["menu_plie".CLEF_SITE] == "deplie") \|\| (!isset($_SESSION["menu_plie".CLEF_SITE]))):?>active<?php endif; ?>">
21	21	<div class="titre">
22	22	<h1>Ribs V0.1</h1>
23	23	<i class="fa fa-bars"></i>
		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	<a href="<?=ADMWEBROOT?>notifications"><i class="fa fa-bell <?php if ($admin->getNotification() == 1):?> animated infinite swing<?php endif; ?>"></i></a>
40	40	</div>
41	41	</div>
42		- <?php endif;?>
	42	+ <?php endif; ?>
43	43	<div class="colonne">
44	44	<div class="config">
45	45	<a href="<?=ADMWEBROOT?>configuration/index"><i class="fa fa-gear"></i></a>
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	<ul>
64	64	<?php if ($droit_acces->getDroitAcces("CREATION COMPTE ADMIN")):?>
65	65	<li><i class="fa fa-user"></i><a href="<?=ADMWEBROOT?>gestion-comptes/creer-utilisateur">Créer un utilisateur</a></li>
66		- <?php endif;?>
	66	+ <?php endif; ?>
67	67	</ul>
68	68	</li>
69	69	<?php endif; ?>

		@@ -80,7 +80,9 @@ discard block
		block discarded – undo
80	80	->get();
81	81
82	82	if ((is_array($query)) && (count($query) > 0)) {
83		- foreach ($query as $obj) $liste_droit_acces[] = $obj->droit_acces;
	83	+ foreach ($query as $obj) {
	84	+ $liste_droit_acces[] = $obj->droit_acces;
	85	+ }
84	86	}
85	87
86	88	return $liste_droit_acces;
		@@ -131,8 +133,7 @@ discard block
		block discarded – undo
131	133	//si les trois sont différent de 0 on renvoit true soinon false
132	134	if (($this->super_admin == 1) \|\| ((in_array($droit, $liste_droit_acces)) && in_array(1, $array_modif))) {
133	135	return true;
134		- }
135		- else {
	136	+ } else {
136	137	return false;
137	138	}
138	139	}
		@@ -147,8 +148,7 @@ discard block
		block discarded – undo
147	148
148	149	if (($this->super_admin == 1) \|\| (in_array($droit_acces, $liste_droit_acces))) {
149	150	return true;
150		- }
151		- else {
	151	+ } else {
152	152	return false;
153	153	}
154	154	}

		@@ -36,8 +36,7 @@ discard block
		block discarded – undo
36	36	$acces_admin = $_SESSION['acces_admin'];
37	37
38	38	unset($_SESSION['err_ajout_utilisateur']);
39		- }
40		- else {
	39	+ } else {
41	40	$nom = null;
42	41	$prenom = null;
43	42	$pseudo = null;
		@@ -63,8 +62,7 @@ discard block
		block discarded – undo
63	62	$parent_courant = $_SESSION['parent'];
64	63
65	64	unset($_SESSION['err_modification_contenu']);
66		- }
67		- else if (($page == "gestion-contenus/modifier-contenu") \|\| ($page == "gestion-contenus/inline")) {
	65	+ } else if (($page == "gestion-contenus/modifier-contenu") \|\| ($page == "gestion-contenus/inline")) {
68	66	$id_page_courante = $_GET['id'];
69	67
70	68	$contenu->getHeadPage($id_page_courante);
		@@ -78,8 +76,7 @@ discard block
		block discarded – undo
78	76	$texte_parent_courant = $gestion_contenu->getParentTexte($parent_courant);
79	77	$contenu_page = $contenu->getContenu();
80	78	$bloc_editable = $gestion_contenu->getBlocEditable($id_page_courante);
81		- }
82		- else {
	79	+ } else {
83	80	$balise_title = null;
84	81	$url = null;
85	82	$meta_description = null;
		@@ -115,8 +112,7 @@ discard block
		block discarded – undo
115	112	$config = new \core\Configuration();
116	113	$contenu_dynamique = $config->getContenusDynamique();
117	114	$cache_config = $config->getCache();
118		- }
119		- else {
	115	+ } else {
120	116	$config = new \core\Configuration();
121	117	$nom_site = $config->getNomSite();
122	118	$gerant_site = $config->getGerantSite();
		@@ -150,8 +146,7 @@ discard block
		block discarded – undo
150	146	$db_host_prod = $_SESSION["db_host_prod"];
151	147
152	148	unset($_SESSION['err_modification_configini']);
153		- }
154		- else {
	149	+ } else {
155	150	$developpement = $ini["developpment"];
156	151
157	152	$db_type_dev = $ini["dev"]["DB_TYPE"];

		@@ -31,13 +31,13 @@
		block discarded – undo
31	31	<script>
32	32	CKEDITOR.disableAutoInline = true;
33	33
34		- <?php for($i=0 ; $i<$bloc_editable ; $i++):?>
	34	+ <?php for ($i = 0; $i < $bloc_editable; $i++):?>
35	35	$(document).ready(function() {
36	36	console.log("editor<?=$i?>");
37	37	$("#editor<?=$i?>").attr("contenteditable", true);
38	38	})
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

		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23	public function getPage() {
24	24	return $this->page;
25	25	}
26		- public function getModule(){
	26	+ public function getModule() {
27	27	return $this->module;
28	28	}
29	29	public function getController() {
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	* Permets de générer l'url pour aller charger la page concernee pour le module blog
56	56	* appele également l'actoin à effectur dans la page
57	57	*/
58		- public function getUrl($url, $admin="app") {
	58	+ public function getUrl($url, $admin = "app") {
59	59	$explode = explode("/", $url);
60	60	$count = count($explode);
61	61	$debut_url = "";

		@@ -65,8 +65,7 @@ discard block
		block discarded – undo
65	65	if (in_array($explode[$i], $this->getAllModules())) {
66	66	$this->module = $explode[$i];
67	67	$debut_url = $explode[$i];
68		- }
69		- else if ($i >= 1) {
	68	+ } else if ($i >= 1) {
70	69	$centre_url[] = $explode[$i];
71	70	}
72	71	}
		@@ -76,8 +75,7 @@ discard block
		block discarded – undo
76	75
77	76	if ($centre_url == "") {
78	77	$this->page = "index";
79		- }
80		- else {
	78	+ } else {
81	79	$file = ROOT."modules/".$debut_url."/".$admin."/views/".$centre_url;
82	80
83	81	if (!file_exists($file.".html")) {
		@@ -129,8 +127,7 @@ discard block
		block discarded – undo
129	127	//on require le fichier routes.php dans /modules/nom_module/router/routes.php
130	128	if ($this->admin !== "app") {
131	129	require_once(MODULEROOT.$this->module."/router/admin_routes.php");
132		- }
133		- else {
	130	+ } else {
134	131	require_once(MODULEROOT.$this->module."/router/routes.php");
135	132	}
136	133	}

		@@ -32,8 +32,7 @@ discard block
		block discarded – undo
32	32	if (isset($_GET['page'])) {
33	33	$titre_page = "Administration du site";
34	34	$description_page = "Administration du site";
35		- }
36		- else {
	35	+ } else {
37	36	$titre_page = "Administration du site";
38	37	$description_page = "Administration du site";
39	38	}
		@@ -63,25 +62,21 @@ discard block
		block discarded – undo
63	62	//si c'est un controleur de base on va cerhcer dans core/admin
64	63	if ($core !== false) {
65	64	require_once(ROOT.$lien.".php");
66		- }
67		- else if ($module !== false) {
	65	+ } else if ($module !== false) {
68	66	$explode = explode("/", $lien, 3);
69	67
70	68	require_once(ROOT.$explode[0]."/".$explode[1]."/admin/controller/".$explode[2].".php");
71		- }
72		- else {
	69	+ } else {
73	70	require_once("admin/controller/".$lien.".php");
74	71	}
75	72	}
76	73	//pour la page de login
77	74	else if ($page == "login") {
78	75	require("admin/views/template/login_admin.php");
79		- }
80		- else {
	76	+ } else {
81	77	if (!isset($_SESSION["idlogin".CLEF_SITE])) {
82	78	Connexion::setObgConnecte(WEBROOT."administrator/login");
83		- }
84		- else {
	79	+ } else {
85	80	$router_module = new \core\modules\RouterModule();
86	81	if ($router_module->getRouteModuleExist($page)) {
87	82	$page = $router_module->getUrl($page, "admin");
		@@ -103,12 +98,10 @@ discard block
		block discarded – undo
103	98	if (($droit_acces->getDroitAcces("GESTION COMPTES") === false) && ($page == "gestion-comptes")) {
104	99	FlashMessage::setFlash("L'accès à cette page n'est pas activé, veuillez contacter votre administrateur pour y avoir accès");
105	100	header("location:".WEBROOT."administrator");
106		- }
107		- else if (($droit_acces->getDroitAcces("GESTION DROIT ACCES") === false) && ($page == "gestion-droits-acces")) {
	101	+ } else if (($droit_acces->getDroitAcces("GESTION DROIT ACCES") === false) && ($page == "gestion-droits-acces")) {
108	102	FlashMessage::setFlash("L'accès à cette page n'est pas activé, veuillez contacter votre administrateur pour y avoir accès");
109	103	header("location:".WEBROOT."administrator");
110		- }
111		- else {
	104	+ } else {
112	105	$admin = new Admin($_SESSION["idlogin".CLEF_SITE]);
113	106
114	107	require(ROOT."admin/controller/initialise_all.php");
		@@ -116,14 +109,12 @@ discard block
		block discarded – undo
116	109	}
117	110	}
118	111	}
119		- }
120		- else {
	112	+ } else {
121	113	Connexion::setObgConnecte(WEBROOT."administrator/login");
122	114
123	115	if (!isset($_SESSION["idlogin".CLEF_SITE])) {
124	116	Connexion::setObgConnecte(WEBROOT."administrator/login");
125		- }
126		- else {
	117	+ } else {
127	118	$page = "index";
128	119	$admin = new Admin($_SESSION["idlogin".CLEF_SITE]);
129	120	require(ROOT."admin/controller/initialise_all.php");

Piou-piou / ribs-framework

Push — master ( acc660...2c4e8f )

Status

Category

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Braces +5 added lines, -5 removed lines patch added patch discarded remove patch

Braces +5 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +3 added lines, -6 removed lines patch added patch discarded remove patch

Braces +9 added lines, -18 removed lines patch added patch discarded remove patch