refactoring to be ok with code convetion

Piou-piou · Piou-piou · commit 2032057e8a6c · 2017-03-29T15:30:35.000+02:00
diff --git a/admin/views/template/principal.php b/admin/views/template/principal.php
@@ -7,7 +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">
 		<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 @@
 	</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 @@
 										<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>
@@ -58,7 +58,9 @@
 			<ul>
 				<div class="principal">
 					<?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));
 					?>
 					
diff --git a/config/initialise.php b/config/initialise.php
@@ -1,5 +1,7 @@
 <?php
-	if (!isset($page_root)) $page_root = "index.php";
+	if (!isset($page_root)) {
+		$page_root = "index.php";
+	}
 
 	//-------------------------- CONSTANTE POUR LES ROUTES ----------------------------------------------------------------------------//
 	//definit le chemin vers la racine du projet (depuis racine serveur web
diff --git a/core/App.php b/core/App.php
@@ -84,7 +84,12 @@ public static function supprimerDossier($url) {
 				$objects = scandir($url);
 				foreach ($objects as $object) {
 					if ($object != "." && $object != "..") {
-						if (filetype($url."/".$object) == "dir") App::supprimerDossier($url."/".$object); else unlink($url."/".$object);
+						if (filetype($url."/".$object) == "dir") {
+							App::supprimerDossier($url."/".$object);
+						}
+						else {
+							unlink($url."/".$object);
+						}
 					}
 				}
 				reset($objects);
diff --git a/core/Configuration.php b/core/Configuration.php
@@ -53,8 +53,8 @@ public function getContenusDynamique() {
 		public function getCache() {
 			return $this->cache;
 		}
-		public function getDesactiverNavigation(){
-		    return $this->desactiver_navigation;
+		public function getDesactiverNavigation() {
+			return $this->desactiver_navigation;
 		}
 
 		//pour la configuration des comptes
diff --git a/core/HTML/flashmessage/FlashMessage.php b/core/HTML/flashmessage/FlashMessage.php
@@ -44,7 +44,7 @@ public static function getFlash() {
 					//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/");
 				}
diff --git a/core/Navigation.php b/core/Navigation.php
@@ -161,7 +161,7 @@ public function setAjoutLien($id, $value_id) {
 			$dbc = App::getDb();
 
 			if ($this->getLienPageExist($id) === false) {
-				$dbc->insert($id, $value_id)->insert("ordre", $this->last_ordre + 1)->into("navigation")->set();
+				$dbc->insert($id, $value_id)->insert("ordre", $this->last_ordre+1)->into("navigation")->set();
 			}
 		}
 
diff --git a/core/RouterController.php b/core/RouterController.php
@@ -30,11 +30,11 @@ public function __construct($page, $admin = null) {
 		
 		
 		//-------------------------- GETTER ----------------------------------------------------------------------------//
-		public function getController(){
-		    return $this->controller;
+		public function getController() {
+			return $this->controller;
 		}
-		public function getErreur(){
-		    return $this->erreur;
+		public function getErreur() {
+			return $this->erreur;
 		}
 		
 		/**
diff --git a/core/admin/contenus/GestionContenus.php b/core/admin/contenus/GestionContenus.php
@@ -16,7 +16,11 @@ class GestionContenus extends Contenus {
 		public function getErreur() {
 			return $this->erreur;
 		}
-
+		
+		/**
+		 * @param $parent
+		 * @return int
+		 */
 		private function getOrdrePage($parent) {
 			if (($parent != "") || ($parent != 0)) {
 				$dbc = \core\App::getDb();
@@ -36,7 +40,9 @@ private function getOrdrePage($parent) {
 		private function getParentId($parent) {
 			$dbc = \core\App::getDb();
 
-			if ($parent == "") return 0;
+			if ($parent == "") {
+				return 0;
+			}
 
 			$query = $dbc->select("ID_page")->from("page")->where("titre", " LIKE ", '"%'.$parent.'%"', "", true)->get();
 
@@ -50,13 +56,13 @@ private function getParentId($parent) {
 		}
 
 		/**
-		 * @param $nom_table
-		 * @param $nom_id_table
-		 * @param $champ
+		 * @param string $nom_table
+		 * @param string $nom_id_table
+		 * @param string $champ
 		 * @param $value
-		 * @param $limit_char
-		 * @param $err_char
-		 * @param $err_egalite
+		 * @param integer $limit_char
+		 * @param string $err_char
+		 * @param string $err_egalite
 		 * @param null $value_id_table
 		 * @return string
 		 * fonction qui permet de vérifier qu'il n'y ait pas d'erreur dans le champ spécifié ni de doublons
@@ -310,7 +316,7 @@ public function setSupprimerPage() {
 
 		/**
 		 * @param string $id
-		 * @param $value_id
+		 * @param string $value_id
 		 * @param integer $affiche
 		 */
 		private function setAjoutLienNavigation($id, $value_id, $affiche) {
diff --git a/core/admin/contenus/ParentTexte.php b/core/admin/contenus/ParentTexte.php
@@ -16,7 +16,9 @@ public function getParentTexte($parent) {
 			$query = $dbc->select("titre")->from("page")->where("ID_page", "=", $parent)->get();
 
 			if ((is_array($query)) && (count($query) > 0)) {
-				foreach ($query as $obj) $this->parent_texte = $obj->titre;
+				foreach ($query as $obj) {
+					$this->parent_texte = $obj->titre;
+				}
 			}
 
 			return $this->parent_texte;
diff --git a/core/admin/droitsacces/DroitAcces.php b/core/admin/droitsacces/DroitAcces.php
@@ -59,8 +59,8 @@ public function getModifNavigation() {
 		public function getSupprimerPage() {
 			return $this->supprimer_page;
 		}
-		public function getListeDroitsAcces(){
-		    return $this->liste_droits_acces;
+		public function getListeDroitsAcces() {
+			return $this->liste_droits_acces;
 		}
 
 		/**
@@ -80,7 +80,9 @@ private function getListeDroitAcces() {
 				->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]);
diff --git a/core/admin/navigation/AdminNavigation.php b/core/admin/navigation/AdminNavigation.php
@@ -5,13 +5,13 @@
 	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") {
diff --git a/core/auth/Encrypt.php b/core/auth/Encrypt.php
@@ -55,9 +55,9 @@ public static function setEncryptMdp($mdp, $id_identite = null) {
 			$longeur_mdp = strlen($mdp);
 
 			//on va couper le mot de passe en 2 suivant un nombre aleatoire
-			$nb_aleatoire_mdp = rand(3, $longeur_mdp - 2);
-			$bout1_mdp = mb_substr($mdp, 0, $longeur_mdp / 2, "UTF-8");
-			$bout2_mdp = mb_substr($mdp, $longeur_mdp / 2, $longeur_mdp, "UTF-8");
+			$nb_aleatoire_mdp = rand(3, $longeur_mdp-2);
+			$bout1_mdp = mb_substr($mdp, 0, $longeur_mdp/2, "UTF-8");
+			$bout2_mdp = mb_substr($mdp, $longeur_mdp/2, $longeur_mdp, "UTF-8");
 
 			//on stock la taille des bouts pour pouvoir les décrypter
 			$taille_bout1 = strlen($bout1_mdp);
@@ -66,15 +66,15 @@ public static function setEncryptMdp($mdp, $id_identite = null) {
 			//on insere le premier bout aleatoirement dans le hashmdp
 			//on calcul sa longeur total (celle duhash + la logneur du mdp que l'on va rajouter dedans)
 			$longueur_hash = strlen($encrypt_str);
-			$debut_bout1 = rand(0, $longueur_hash / 2);
+			$debut_bout1 = rand(0, $longueur_hash/2);
 
 			//on rajouter le premier bout dans le mot de passe + recalcule de la longeur du hash avec le mdp add
 			$encrypt_str = mb_substr($encrypt_str, 0, $debut_bout1).$bout1_mdp.mb_substr($encrypt_str, $debut_bout1, $longueur_hash);
 
 			//on insere le second bout aleatoirement dans le hashmdp
 			//on calcul sa longeur total (celle duhash + la logneur premier bout du mdp que l'on va rajouter dedans)
 			$longueur_hash = strlen($encrypt_str);
-			$debut_bout2 = rand($longueur_hash / 2, $longueur_hash);
+			$debut_bout2 = rand($longueur_hash/2, $longueur_hash);
 
 			//on rajoute le deuxieme
 			$mdp_encrypt = mb_substr($encrypt_str, 0, $debut_bout2).$bout2_mdp.mb_substr($encrypt_str, $debut_bout2, $longueur_hash);
diff --git a/core/database/Database.php b/core/database/Database.php
@@ -96,7 +96,9 @@ public function rechercherEgalite($table, $champ, $value, $id_table = null, $id
 					$nb = $obj["nb"];
 				}
 
-				if ((isset($nb)) && ($nb != 0)) return true;
+				if ((isset($nb)) && ($nb != 0)) {
+					return true;
+				}
 			}
 			else {
 				return false;
diff --git a/core/database/Querybuilder.php b/core/database/Querybuilder.php
@@ -123,7 +123,9 @@ public function where($champ, $cond, $champ_test, $closure = "", $no_bind = fals
 		 * @param string $type
 		 */
 		public function orderBy($order, $type = null) {
-			if ($type === null) $type = "ASC";
+			if ($type === null) {
+				$type = "ASC";
+			}
 			
 			$this->order_by = " ORDER BY ".$order." ".$type." ";
 			
diff --git a/core/functions/ChaineCaractere.php b/core/functions/ChaineCaractere.php
@@ -15,7 +15,7 @@ class ChaineCaractere {
 		public static function random($longueur) {
 			$string = "";
 			$chaine = "abcdefghijklmnpqrstuvwxyz0123456789";
-			srand((double)microtime() * 1000000);
+			srand((double)microtime()*1000000);
 			for ($i = 0; $i < $longueur; $i++) {
 				$string .= $chaine[rand() % strlen($chaine)];
 			}
diff --git a/core/functions/DateHeure.php b/core/functions/DateHeure.php
@@ -42,9 +42,9 @@ public static function Heureenseconde($heure, $minute) {
 		 */
 		public static function Secondeenheure($seconde) {
 			if (is_numeric($seconde)) {
-				$heure = intval($seconde / 3600);
-				$minute = intval(($seconde % 3600) / 60);
-				$seconde = intval(($seconde % 3600) % 60);
+				$heure = intval($seconde/3600);
+				$minute = intval(($seconde%3600)/60);
+				$seconde = intval(($seconde%3600)%60);
 
 				$temps = $heure."h".$minute."m".$seconde;
 				return $temps;
diff --git a/core/modules/RouterModule.php b/core/modules/RouterModule.php
@@ -23,7 +23,7 @@ public function getParametre() {
 		public function getPage() {
 			return $this->page;
 		}
-		public function getModule(){
+		public function getModule() {
 			return $this->module;
 		}
 		public function getController() {
@@ -55,7 +55,7 @@ private function getAllModules() {
 		 * 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 = "";
diff --git a/installation/controller/InstallRibs.php b/installation/controller/InstallRibs.php
@@ -1,6 +1,5 @@
 <?php
 	namespace installation\controller;
-	use core\functions\ChaineCaractere;
 	use core\HTML\flashmessage\FlashMessage;
 	use core\iniparser\IniParser;
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,12 @@ public static function supprimerDossier($url) {`
`84`	`84`	`$objects = scandir($url);`
`85`	`85`	`foreach ($objects as $object) {`
`86`	`86`	`if ($object != "." && $object != "..") {`
`87`		`- if (filetype($url."/".$object) == "dir") App::supprimerDossier($url."/".$object); else unlink($url."/".$object);`
	`87`	`+ if (filetype($url."/".$object) == "dir") {`
	`88`	`+ App::supprimerDossier($url."/".$object);`
	`89`	`+ }`
	`90`	`+ else {`
	`91`	`+ unlink($url."/".$object);`
	`92`	`+ }`
`88`	`93`	`}`
`89`	`94`	`}`
`90`	`95`	`reset($objects);`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ public function getContenusDynamique() {`
`53`	`53`	`public function getCache() {`
`54`	`54`	`return $this->cache;`
`55`	`55`	`}`
`56`		`- public function getDesactiverNavigation(){`
`57`		`- return $this->desactiver_navigation;`
	`56`	`+ public function getDesactiverNavigation() {`
	`57`	`+ return $this->desactiver_navigation;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`//pour la configuration des comptes`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static function getFlash() {`
`44`	`44`	`//definit le chemin sachant que l'on part de index.php`
`45`	`45`	`$chemin = str_replace("\\", "/", str_replace("index.php", "", $_SERVER['SCRIPT_NAME']).__NAMESPACE__."/view/");`
`46`	`46`	`}`
`47`		`- else if (strstr($_SERVER['SCRIPT_NAME'], "installation.php")) {`
	`47`	`+ else if (strstr($_SERVER['SCRIPT_NAME'], "installation.php")) {`
`48`	`48`	`//definit le chemin sachant que l'on part de admin.php`
`49`	`49`	`$chemin = str_replace("\\", "/", str_replace("installation.php", "", $_SERVER['SCRIPT_NAME']).__NAMESPACE__."/view/");`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public function setAjoutLien($id, $value_id) {`
`161`	`161`	`$dbc = App::getDb();`
`162`	`162`
`163`	`163`	`if ($this->getLienPageExist($id) === false) {`
`164`		`- $dbc->insert($id, $value_id)->insert("ordre", $this->last_ordre + 1)->into("navigation")->set();`
	`164`	`+ $dbc->insert($id, $value_id)->insert("ordre", $this->last_ordre+1)->into("navigation")->set();`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ public function __construct($page, $admin = null) {`
`30`	`30`
`31`	`31`
`32`	`32`	`//-------------------------- GETTER ----------------------------------------------------------------------------//`
`33`		`- public function getController(){`
`34`		`- return $this->controller;`
	`33`	`+ public function getController() {`
	`34`	`+ return $this->controller;`
`35`	`35`	`}`
`36`		`- public function getErreur(){`
`37`		`- return $this->erreur;`
	`36`	`+ public function getErreur() {`
	`37`	`+ return $this->erreur;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@ public function getParentTexte($parent) {`
`16`	`16`	`$query = $dbc->select("titre")->from("page")->where("ID_page", "=", $parent)->get();`
`17`	`17`
`18`	`18`	`if ((is_array($query)) && (count($query) > 0)) {`
`19`		`- foreach ($query as $obj) $this->parent_texte = $obj->titre;`
	`19`	`+ foreach ($query as $obj) {`
	`20`	`+ $this->parent_texte = $obj->titre;`
	`21`	`+ }`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`return $this->parent_texte;`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@ public function getModifNavigation() {`
`59`	`59`	`public function getSupprimerPage() {`
`60`	`60`	`return $this->supprimer_page;`
`61`	`61`	`}`
`62`		`- public function getListeDroitsAcces(){`
`63`		`- return $this->liste_droits_acces;`
	`62`	`+ public function getListeDroitsAcces() {`
	`63`	`+ return $this->liste_droits_acces;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/**`
`@@ -80,7 +80,9 @@ private function getListeDroitAcces() {`
`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`	`App::setValues(["droit_acces_user" => $liste_droit_acces]);`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,9 @@ public function rechercherEgalite($table, $champ, $value, $id_table = null, $id`
`96`	`96`	`$nb = $obj["nb"];`
`97`	`97`	`}`
`98`	`98`
`99`		`- if ((isset($nb)) && ($nb != 0)) return true;`
	`99`	`+ if ((isset($nb)) && ($nb != 0)) {`
	`100`	`+ return true;`
	`101`	`+ }`
`100`	`102`	`}`
`101`	`103`	`else {`
`102`	`104`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class ChaineCaractere {`
`15`	`15`	`public static function random($longueur) {`
`16`	`16`	`$string = "";`
`17`	`17`	`$chaine = "abcdefghijklmnpqrstuvwxyz0123456789";`
`18`		`- srand((double)microtime() * 1000000);`
	`18`	`+ srand((double)microtime()*1000000);`
`19`	`19`	`for ($i = 0; $i < $longueur; $i++) {`
`20`	`20`	`$string .= $chaine[rand() % strlen($chaine)];`
`21`	`21`	`}`