Inspection of "refactoring router of app to simplify it" - Piou-piou/ribs-framework - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 2bafbc...e0b597 )

by Anthony

created 2017-03-25 22:59 UTC

Status

Spacing +3 added lines, -3 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>

Please login to merge, or discard this patch.

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

@@ -91,7 +91,9 @@  discard block
 block discarded – undo
 				</div>
 				
 				<?php
-					if (!isset($arr)) $arr = [];
+					if (!isset($arr)) {
+						$arr = [];
+					}
 					//echo $twig->render("template/left-navigation.html", array_merge(array_merge(array_merge(array_merge($arr, $constant), $_REQUEST), $_SESSION), $arr_admin));
 				?>
 				
@@ -105,8 +107,7 @@  discard block
 block discarded – undo
 		<?php
 			if ($twig_page === true) {
 				echo $twig->render($page.".html", array_merge(array_merge(array_merge(array_merge($arr, $constant), $_REQUEST), $_SESSION), $arr_admin));
-			}
-			else {
+			} else {
 				require("admin/views/".$page.".php");
 			}
 		?>

Please login to merge, or discard this patch.

admin.php 1 patch

Braces +8 added lines, -16 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 {
 				$admin = new Admin($_SESSION["idlogin".CLEF_SITE]);
 				$router_module = new \core\modules\RouterModule();
 				if ($router_module->getRouteModuleExist($page)) {
@@ -96,8 +91,7 @@  discard block
 block discarded – undo
 					
 					$page = $router_module->getPage();
 					$twig_page = true;
-				}
-				else {
+				} else {
 					//pour les pages normales
 					//pour l'acces a la gestion des comptes, si pas activée oin renvoi une erreur
 					$twig_ok_page = [
@@ -122,14 +116,12 @@  discard block
 block discarded – undo
 				require(ROOT."admin/views/template/principal.php");
 			}
 		}
-	}
-	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.

core/admin/droitsacces/DroitAcces.php 1 patch

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

@@ -77,7 +77,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;
+				}
 			}
 			
 			App::setValues(["droit_acces_user" => $liste_droit_acces]);
@@ -136,8 +138,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;
 			}
 		}

Please login to merge, or discard this patch.

core/admin/Admin.php 1 patch

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

@@ -147,8 +147,7 @@
 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/admin/comptes/creer_utilisateur.php 1 patch

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

@@ -22,8 +22,7 @@
 block discarded – undo
 		$_SESSION['mail'] = $_POST['mail'];
 
 		\core\HTML\flashmessage\FlashMessage::setFlash("<ul>".$inscription->getErreur()."</ul>");
-	}
-	else {
+	} else {
 		\core\HTML\flashmessage\FlashMessage::setFlash("L'utilisateur ".$inscription->getNom()." ".$inscription->getPrenom()."a bien été inscrit", "success");
 		$inscription->setInscrireUtilisateur();
 	}

Please login to merge, or discard this patch.

core/admin/contenus/gestion/creer_page.php 1 patch

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

@@ -6,7 +6,6 @@
 block discarded – undo
 	if ($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.

index.php 1 patch

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

@@ -66,17 +66,14 @@  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]."/app/controller/".$explode[2].".php");
-		}
-		else {
+		} else {
 			require_once("app/controller/".$lien.".php");
 		}
-	}
-	else {
+	} else {
 		$cache = new \core\Cache($page);
 		
 		$router_module = new RouterModule();
@@ -91,8 +88,7 @@  discard block
 block discarded – undo
 			$twig = new Twig_Environment($loader);
 			$arr_page = \core\App::getValues();
 			$page = $router_module->getPage();
-		}
-		else {
+		} else {
 			$contenu->getContenuPage();
 			$contenu_page = $contenu->getContenu();
 			

Please login to merge, or discard this patch.

admin/controller/initialise_all.php 1 patch

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

@@ -66,8 +66,7 @@  discard block
 block discarded – undo
 			unset($_SESSION['meta_description']);
 			unset($_SESSION['titre_page']);
 			unset($_SESSION['parent']);
-		}
-		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'];
 
 			$gestion_contenu->getHeadPage($id_page_courante);
@@ -114,8 +113,7 @@  discard block
 block discarded – undo
 			$db_host_dev = $_SESSION["db_host_dev"];
 
 			unset($_SESSION['err_modification_configini']);
-		}
-		else {
+		} else {
 			\core\App::setValues(["bdd" => $ini]);
 		}
 	}

Please login to merge, or discard this patch.

		@@ -77,7 +77,9 @@ discard block
		block discarded – undo
77	77	->get();
78	78
79	79	if ((is_array($query)) && (count($query) > 0)) {
80		- foreach ($query as $obj) $liste_droit_acces[] = $obj->droit_acces;
	80	+ foreach ($query as $obj) {
	81	+ $liste_droit_acces[] = $obj->droit_acces;
	82	+ }
81	83	}
82	84
83	85	App::setValues(["droit_acces_user" => $liste_droit_acces]);
		@@ -136,8 +138,7 @@ discard block
		block discarded – undo
136	138	//si les trois sont différent de 0 on renvoit true soinon false
137	139	if (($this->super_admin == 1) \|\| ((in_array($droit, $liste_droit_acces)) && in_array(1, $array_modif))) {
138	140	return true;
139		- }
140		- else {
	141	+ } else {
141	142	return false;
142	143	}
143	144	}

		@@ -147,8 +147,7 @@
		block discarded – undo
147	147
148	148	$mail = new Mail();
149	149	$mail->setEnvoyerMail("Réinitialisation de votre E-mail effectuée", "Votre mot de passe a été réinitialisé", $this->mail);
150		- }
151		- else {
	150	+ } else {
152	151	FlashMessage::setFlash("le mot de passe de $this->pseudo ne peu pas être réinitialisé car il ne possède pas d'E-mail");
153	152	$this->erreur = "le mot de passe de $this->pseudo ne peu pas être réinitialisé car il ne possède pas d'E-mail";
154	153	}

		@@ -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>

		@@ -91,7 +91,9 @@ discard block
		block discarded – undo
91	91	</div>
92	92
93	93	<?php
94		- if (!isset($arr)) $arr = [];
	94	+ if (!isset($arr)) {
	95	+ $arr = [];
	96	+ }
95	97	//echo $twig->render("template/left-navigation.html", array_merge(array_merge(array_merge(array_merge($arr, $constant), $_REQUEST), $_SESSION), $arr_admin));
96	98	?>
97	99
		@@ -105,8 +107,7 @@ discard block
		block discarded – undo
105	107	<?php
106	108	if ($twig_page === true) {
107	109	echo $twig->render($page.".html", array_merge(array_merge(array_merge(array_merge($arr, $constant), $_REQUEST), $_SESSION), $arr_admin));
108		- }
109		- else {
	110	+ } else {
110	111	require("admin/views/".$page.".php");
111	112	}
112	113	?>

		@@ -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	$admin = new Admin($_SESSION["idlogin".CLEF_SITE]);
86	81	$router_module = new \core\modules\RouterModule();
87	82	if ($router_module->getRouteModuleExist($page)) {
		@@ -96,8 +91,7 @@ discard block
		block discarded – undo
96	91
97	92	$page = $router_module->getPage();
98	93	$twig_page = true;
99		- }
100		- else {
	94	+ } else {
101	95	//pour les pages normales
102	96	//pour l'acces a la gestion des comptes, si pas activée oin renvoi une erreur
103	97	$twig_ok_page = [
		@@ -122,14 +116,12 @@ discard block
		block discarded – undo
122	116	require(ROOT."admin/views/template/principal.php");
123	117	}
124	118	}
125		- }
126		- else {
	119	+ } else {
127	120	Connexion::setObgConnecte(WEBROOT."administrator/login");
128	121
129	122	if (!isset($_SESSION["idlogin".CLEF_SITE])) {
130	123	Connexion::setObgConnecte(WEBROOT."administrator/login");
131		- }
132		- else {
	124	+ } else {
133	125	$page = "index";
134	126	$admin = new Admin($_SESSION["idlogin".CLEF_SITE]);
135	127	require(ROOT."admin/controller/initialise_all.php");

		@@ -22,8 +22,7 @@
		block discarded – undo
22	22	$_SESSION['mail'] = $_POST['mail'];
23	23
24	24	\core\HTML\flashmessage\FlashMessage::setFlash("<ul>".$inscription->getErreur()."</ul>");
25		- }
26		- else {
	25	+ } else {
27	26	\core\HTML\flashmessage\FlashMessage::setFlash("L'utilisateur ".$inscription->getNom()." ".$inscription->getPrenom()."a bien été inscrit", "success");
28	27	$inscription->setInscrireUtilisateur();
29	28	}

		@@ -6,7 +6,6 @@
		block discarded – undo
6	6	if ($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

		@@ -66,17 +66,14 @@ discard block
		block discarded – undo
66	66	//si c'est un controleur de base on va cerhcer dans core/admin
67	67	if ($core !== false) {
68	68	require_once(ROOT.$lien.".php");
69		- }
70		- else if ($module !== false) {
	69	+ } else if ($module !== false) {
71	70	$explode = explode("/", $lien, 3);
72	71
73	72	require_once(ROOT.$explode[0]."/".$explode[1]."/app/controller/".$explode[2].".php");
74		- }
75		- else {
	73	+ } else {
76	74	require_once("app/controller/".$lien.".php");
77	75	}
78		- }
79		- else {
	76	+ } else {
80	77	$cache = new \core\Cache($page);
81	78
82	79	$router_module = new RouterModule();
		@@ -91,8 +88,7 @@ discard block
		block discarded – undo
91	88	$twig = new Twig_Environment($loader);
92	89	$arr_page = \core\App::getValues();
93	90	$page = $router_module->getPage();
94		- }
95		- else {
	91	+ } else {
96	92	$contenu->getContenuPage();
97	93	$contenu_page = $contenu->getContenu();
98	94

		@@ -66,8 +66,7 @@ discard block
		block discarded – undo
66	66	unset($_SESSION['meta_description']);
67	67	unset($_SESSION['titre_page']);
68	68	unset($_SESSION['parent']);
69		- }
70		- else if (($page == "gestion-contenus/modifier-contenu") \|\| ($page == "gestion-contenus/inline")) {
	69	+ } else if (($page == "gestion-contenus/modifier-contenu") \|\| ($page == "gestion-contenus/inline")) {
71	70	$id_page_courante = $_GET['id'];
72	71
73	72	$gestion_contenu->getHeadPage($id_page_courante);
		@@ -114,8 +113,7 @@ discard block
		block discarded – undo
114	113	$db_host_dev = $_SESSION["db_host_dev"];
115	114
116	115	unset($_SESSION['err_modification_configini']);
117		- }
118		- else {
	116	+ } else {
119	117	\core\App::setValues(["bdd" => $ini]);
120	118	}
121	119	}

Piou-piou / ribs-framework

Push — master ( 2bafbc...e0b597 )

Status

Category

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

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

Braces +8 added lines, -16 removed lines patch added patch discarded remove patch

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

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

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

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

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

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