@@ -41,25 +41,25 @@ discard block |
||
41 | 41 | |
42 | 42 | |
43 | 43 | //-------------------------- GETTER ----------------------------------------------------------------------------// |
44 | - public function getLogged(){ |
|
44 | + public function getLogged() { |
|
45 | 45 | return $this->logged; |
46 | 46 | } |
47 | - public function getSuperAdmin(){ |
|
47 | + public function getSuperAdmin() { |
|
48 | 48 | return $this->super_admin; |
49 | 49 | } |
50 | - public function getIdListeDroitAcces(){ |
|
50 | + public function getIdListeDroitAcces() { |
|
51 | 51 | return $this->id_liste_droit_acces; |
52 | 52 | } |
53 | - public function getModifSeo(){ |
|
53 | + public function getModifSeo() { |
|
54 | 54 | return $this->modif_seo; |
55 | 55 | } |
56 | - public function getModifContenu(){ |
|
56 | + public function getModifContenu() { |
|
57 | 57 | return $this->modif_contenu; |
58 | 58 | } |
59 | - public function getModifNavigation(){ |
|
59 | + public function getModifNavigation() { |
|
60 | 60 | return $this->modif_navigation; |
61 | 61 | } |
62 | - public function getSupprimerPage(){ |
|
62 | + public function getSupprimerPage() { |
|
63 | 63 | return $this->supprimer_page; |
64 | 64 | } |
65 | 65 | |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | //page sans droit dans admin |
142 | 142 | $all_access = array("gestion-comptes/mon-compte", "index"); |
143 | 143 | |
144 | - if (($this->super_admin == 1) || (in_array($this->getListeDroitPage($page), $this->getListeDroitAcces()))|| (in_array($page, $all_access))) { |
|
144 | + if (($this->super_admin == 1) || (in_array($this->getListeDroitPage($page), $this->getListeDroitAcces())) || (in_array($page, $all_access))) { |
|
145 | 145 | return true; |
146 | 146 | } |
147 | 147 | else { |
@@ -78,7 +78,9 @@ discard block |
||
78 | 78 | "); |
79 | 79 | |
80 | 80 | if ((is_array($query)) && (count($query) > 0)) { |
81 | - foreach ($query as $obj) $liste_droit_acces[] = $obj->droit_acces; |
|
81 | + foreach ($query as $obj) { |
|
82 | + $liste_droit_acces[] = $obj->droit_acces; |
|
83 | + } |
|
82 | 84 | } |
83 | 85 | |
84 | 86 | return $liste_droit_acces; |
@@ -93,7 +95,9 @@ discard block |
||
93 | 95 | |
94 | 96 | $query = $dbc->query("SELECT droit_acces FROM droit_acces WHERE page LIKE '%$page%'"); |
95 | 97 | if ((is_array($query)) && (count($query) > 0)) { |
96 | - foreach ($query as $obj) $droit_acces = $obj->droit_acces; |
|
98 | + foreach ($query as $obj) { |
|
99 | + $droit_acces = $obj->droit_acces; |
|
100 | + } |
|
97 | 101 | } |
98 | 102 | |
99 | 103 | return $droit_acces; |
@@ -143,8 +147,7 @@ discard block |
||
143 | 147 | |
144 | 148 | if (($this->super_admin == 1) || (in_array($this->getListeDroitPage($page), $this->getListeDroitAcces()))|| (in_array($page, $all_access))) { |
145 | 149 | return true; |
146 | - } |
|
147 | - else { |
|
150 | + } else { |
|
148 | 151 | return false; |
149 | 152 | } |
150 | 153 | } |
@@ -169,8 +172,7 @@ discard block |
||
169 | 172 | //si les trois sont différent de 0 on renvoit true soinon false |
170 | 173 | if (($this->super_admin == 1) || ((in_array($droit, $liste_droit_acces)) && in_array(1, $array_modif))) { |
171 | 174 | return true; |
172 | - } |
|
173 | - else { |
|
175 | + } else { |
|
174 | 176 | return false; |
175 | 177 | } |
176 | 178 | } |
@@ -185,8 +187,7 @@ discard block |
||
185 | 187 | |
186 | 188 | if (($this->super_admin == 1) || (in_array($droit_acces, $liste_droit_acces))) { |
187 | 189 | return true; |
188 | - } |
|
189 | - else { |
|
190 | + } else { |
|
190 | 191 | return false; |
191 | 192 | } |
192 | 193 | } |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | foreach ($query as $obj) { |
22 | 22 | $params = $obj->mdp_params; |
23 | 23 | } |
24 | - } |
|
25 | - else { |
|
24 | + } else { |
|
26 | 25 | $params = self::$params; |
27 | 26 | } |
28 | 27 | |
@@ -74,8 +73,7 @@ discard block |
||
74 | 73 | |
75 | 74 | if ($id_identite != null) { |
76 | 75 | self::setSaveParams("$taille_bout1, $debut_bout2, $nb_aleatoire_mdp, $taille_bout2, $debut_bout1, ".ChaineCaractere::random(20), $id_identite); |
77 | - } |
|
78 | - else { |
|
76 | + } else { |
|
79 | 77 | self::$params = "$taille_bout1, $debut_bout2, $nb_aleatoire_mdp, $taille_bout2, $debut_bout1, ".ChaineCaractere::random(20); |
80 | 78 | } |
81 | 79 |
@@ -76,8 +76,7 @@ |
||
76 | 76 | |
77 | 77 | if ($id_page != 0) { |
78 | 78 | $query = $dbc->query("SELECT balise_title, meta_description, ID_page FROM page WHERE ID_page=".$id_page); |
79 | - } |
|
80 | - else { |
|
79 | + } else { |
|
81 | 80 | $query = $dbc->query("SELECT balise_title, meta_description, ID_page FROM page WHERE url LIKE '$url'"); |
82 | 81 | } |
83 | 82 |
@@ -51,8 +51,7 @@ discard block |
||
51 | 51 | if ($query) { |
52 | 52 | $obj = $query->fetchAll(PDO::FETCH_OBJ); |
53 | 53 | return $obj; |
54 | - } |
|
55 | - else { |
|
54 | + } else { |
|
56 | 55 | FlashMessage::setFlash("Une erreur est survenue en executant cette requette : ".$req); |
57 | 56 | } |
58 | 57 | } |
@@ -71,8 +70,7 @@ discard block |
||
71 | 70 | $err = true; |
72 | 71 | } |
73 | 72 | } |
74 | - } |
|
75 | - else { |
|
73 | + } else { |
|
76 | 74 | if (!$query->execute($value)) { |
77 | 75 | $err = true; |
78 | 76 | } |
@@ -94,8 +92,7 @@ discard block |
||
94 | 92 | public function rechercherEgalite($table, $champ, $value, $id_table = null, $id = null) { |
95 | 93 | if ($id == null) { |
96 | 94 | $query = $this->getPdo()->query("SELECT COUNT($champ) as nb FROM $table WHERE $champ LIKE '$value'"); |
97 | - } |
|
98 | - else { |
|
95 | + } else { |
|
99 | 96 | $query = $this->getPdo()->query("SELECT COUNT($champ) as nb FROM $table WHERE $champ LIKE '$value' AND $id_table != $id"); |
100 | 97 | } |
101 | 98 | |
@@ -104,9 +101,10 @@ discard block |
||
104 | 101 | $nb = $obj["nb"]; |
105 | 102 | } |
106 | 103 | |
107 | - if ((isset($nb)) && ($nb != 0)) return true; |
|
108 | - } |
|
109 | - else { |
|
104 | + if ((isset($nb)) && ($nb != 0)) { |
|
105 | + return true; |
|
106 | + } |
|
107 | + } else { |
|
110 | 108 | return false; |
111 | 109 | } |
112 | 110 | } |
@@ -123,8 +121,7 @@ discard block |
||
123 | 121 | |
124 | 122 | if ($query->rowCount() > 0) { |
125 | 123 | return true; |
126 | - } |
|
127 | - else { |
|
124 | + } else { |
|
128 | 125 | return false; |
129 | 126 | } |
130 | 127 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * pour intialiser la ou les clauses where d'une requete |
112 | 112 | */ |
113 | 113 | public function where($champ, $cond, $champ_test, $closure = null) { |
114 | - if ( $closure === null) { |
|
114 | + if ($closure === null) { |
|
115 | 115 | $this->conditions[] = $champ.$cond.$champ_test; |
116 | 116 | } |
117 | 117 | else { |
@@ -127,10 +127,10 @@ discard block |
||
127 | 127 | * fonction qui permet de récupérer un select fait sur une table |
128 | 128 | */ |
129 | 129 | public function get() { |
130 | - $requete = $this->req_beginning . implode(",", $this->champs) . " FROM " . implode(",", $this->table); |
|
130 | + $requete = $this->req_beginning.implode(",", $this->champs)." FROM ".implode(",", $this->table); |
|
131 | 131 | |
132 | 132 | if (!empty($this->conditions)) { |
133 | - $requete .= " WHERE ". implode(" ", $this->conditions); |
|
133 | + $requete .= " WHERE ".implode(" ", $this->conditions); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | $this->unsetQueryBuilder(); |
@@ -145,15 +145,15 @@ discard block |
||
145 | 145 | |
146 | 146 | $datas = []; |
147 | 147 | $count = count($this->champs); |
148 | - for ($i=0 ; $i<$count ; $i++) { |
|
148 | + for ($i = 0; $i < $count; $i++) { |
|
149 | 149 | $datas[] = $this->champs[$i]."=:".$this->champs[$i]; |
150 | 150 | } |
151 | 151 | |
152 | 152 | //si on a des conditions alors on sera dans un insert |
153 | - $requete = $this->req_beginning . implode(",", $this->table) . " SET " . implode(", ", $datas); |
|
153 | + $requete = $this->req_beginning.implode(",", $this->table)." SET ".implode(", ", $datas); |
|
154 | 154 | |
155 | 155 | if (!empty($this->conditions)) { |
156 | - $requete .= " WHERE " . implode(" ", $this->conditions); |
|
156 | + $requete .= " WHERE ".implode(" ", $this->conditions); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | $this->prepare($requete, $values); |
@@ -164,10 +164,10 @@ discard block |
||
164 | 164 | * fonction utilisée pour finir un delete |
165 | 165 | */ |
166 | 166 | public function del() { |
167 | - $requete = $this->req_beginning . implode(",", $this->table); |
|
167 | + $requete = $this->req_beginning.implode(",", $this->table); |
|
168 | 168 | |
169 | 169 | if (!empty($this->conditions)) { |
170 | - $requete .= " WHERE " . implode(" ", $this->conditions); |
|
170 | + $requete .= " WHERE ".implode(" ", $this->conditions); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | $this->query($requete); |
@@ -76,8 +76,7 @@ |
||
76 | 76 | |
77 | 77 | if ($id_page != 0) { |
78 | 78 | $query = $dbc->query("SELECT balise_title, meta_description, ID_page FROM page WHERE ID_page=".$id_page); |
79 | - } |
|
80 | - else { |
|
79 | + } else { |
|
81 | 80 | $query = $dbc->query("SELECT balise_title, meta_description, ID_page FROM page WHERE url LIKE '$url'"); |
82 | 81 | } |
83 | 82 |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
83 | - * @param $table |
|
83 | + * @param string $table |
|
84 | 84 | * @return $this |
85 | 85 | * |
86 | 86 | * pour initialiser la les listes des tables ou il faudra aler chercher les données |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | } |
93 | 93 | |
94 | 94 | /** |
95 | - * @param $table |
|
95 | + * @param string $table |
|
96 | 96 | * |
97 | 97 | * pour initialiser la table dans laquelle on va insérer les données |
98 | 98 | */ |
@@ -104,9 +104,9 @@ discard block |
||
104 | 104 | |
105 | 105 | /** |
106 | 106 | * @param $champ |
107 | - * @param $cond |
|
107 | + * @param string $cond |
|
108 | 108 | * @param $champ_test |
109 | - * @param null $closure |
|
109 | + * @param string $closure |
|
110 | 110 | * @return $this |
111 | 111 | * |
112 | 112 | * pour intialiser la ou les clauses where d'une requete |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | /** |
126 | - * @param $order |
|
126 | + * @param string $order |
|
127 | 127 | */ |
128 | 128 | public function orderBy($order) { |
129 | 129 | $this->order_by = " ORDER BY ".$order; |
@@ -132,8 +132,7 @@ |
||
132 | 132 | foreach ($query as $obj) { |
133 | 133 | if ($obj->activer == 1) { |
134 | 134 | return true; |
135 | - } |
|
136 | - else { |
|
135 | + } else { |
|
137 | 136 | return false; |
138 | 137 | } |
139 | 138 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | if (is_array($query) && (count($query) > 0)) { |
70 | 70 | foreach ($query as $obj) { |
71 | - $sous_menu[] = [$obj->ID_page, $obj->titre, $obj->url, $obj->balise_title,]; |
|
71 | + $sous_menu[] = [$obj->ID_page, $obj->titre, $obj->url, $obj->balise_title, ]; |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | if (is_array($query) && (count($query) > 0)) { |
91 | 91 | foreach ($query as $obj) { |
92 | - return [$obj->nom_module,$obj->url]; |
|
92 | + return [$obj->nom_module, $obj->url]; |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $dbc = App::getDb(); |
107 | 107 | |
108 | 108 | if ($afficher != null) { |
109 | - $dbc->insert($id, $value_id)->insert("ordre", $this->last_ordre+1)->into("navigation")->set(); |
|
109 | + $dbc->insert($id, $value_id)->insert("ordre", $this->last_ordre + 1)->into("navigation")->set(); |
|
110 | 110 | } |
111 | 111 | } |
112 | 112 |
@@ -129,7 +129,7 @@ |
||
129 | 129 | |
130 | 130 | $dbc->prepare("INSERT INTO page (titre, contenu, url, meta_description, balise_title, ordre, parent, affiche) VALUES (:titre, :contenu, :url, :meta_description, :balise_title, :ordre, :parent, :affiche)", $value); |
131 | 131 | $this->id_page = $dbc->lastInsertId(); |
132 | - $this->setAjoutLienNavigation("ID_page", $this->id_page , 1); |
|
132 | + $this->setAjoutLienNavigation("ID_page", $this->id_page, 1); |
|
133 | 133 | } |
134 | 134 | else { |
135 | 135 | FlashMessage::setFlash("Impossible de créer cette page, veuillez réeseyer dans un moment. Si le problème persiste contactez votre administrateur."); |
@@ -71,6 +71,14 @@ discard block |
||
71 | 71 | |
72 | 72 | |
73 | 73 | //-------------------------- SETTER ----------------------------------------------------------------------------// |
74 | + |
|
75 | + /** |
|
76 | + * @param string $url |
|
77 | + * @param string $err_balise_title |
|
78 | + * @param string $err_url |
|
79 | + * @param string $err_meta_description |
|
80 | + * @param string $err_titre_page |
|
81 | + */ |
|
74 | 82 | private function setErreurContenus($balise_title, $url, $meta_description, $titre_page, $parent, $contenu, $err_balise_title, $err_url, $err_meta_description, $err_titre_page) { |
75 | 83 | $_SESSION['balise_title'] = $balise_title; |
76 | 84 | $_SESSION['url'] = $url; |
@@ -265,6 +273,10 @@ discard block |
||
265 | 273 | } |
266 | 274 | } |
267 | 275 | |
276 | + /** |
|
277 | + * @param string $id |
|
278 | + * @param integer $affiche |
|
279 | + */ |
|
268 | 280 | private function setModifierLienNavigation($id, $id_page, $parent, $affiche) { |
269 | 281 | if ($parent != "") { |
270 | 282 | $nav = new Navigation(); |
@@ -3,7 +3,6 @@ |
||
3 | 3 | |
4 | 4 | use core\App; |
5 | 5 | use core\contenus\Contenus; |
6 | - use core\admin\droitsacces\DroitAcces; |
|
7 | 6 | use core\functions\ChaineCaractere; |
8 | 7 | use core\HTML\flashmessage\FlashMessage; |
9 | 8 | use core\Navigation; |
@@ -31,7 +31,9 @@ discard block |
||
31 | 31 | |
32 | 32 | $query = $dbc->query("SELECT titre FROM page WHERE ID_page=".$parent); |
33 | 33 | if ((is_array($query)) && (count($query) > 0)) { |
34 | - foreach ($query as $obj) $this->parent_texte = $obj->titre; |
|
34 | + foreach ($query as $obj) { |
|
35 | + $this->parent_texte = $obj->titre; |
|
36 | + } |
|
35 | 37 | } |
36 | 38 | |
37 | 39 | return $this->parent_texte; |
@@ -137,13 +139,11 @@ discard block |
||
137 | 139 | $dbc->prepare("INSERT INTO page (titre, contenu, url, meta_description, balise_title, ordre, parent, affiche) VALUES (:titre, :contenu, :url, :meta_description, :balise_title, :ordre, :parent, :affiche)", $value); |
138 | 140 | $this->id_page = $dbc->lastInsertId(); |
139 | 141 | $this->setAjoutLienNavigation("ID_page", $this->id_page , 1); |
140 | - } |
|
141 | - else { |
|
142 | + } else { |
|
142 | 143 | FlashMessage::setFlash("Impossible de créer cette page, veuillez réeseyer dans un moment. Si le problème persiste contactez votre administrateur."); |
143 | 144 | $this->erreur = true; |
144 | 145 | } |
145 | - } |
|
146 | - else { |
|
146 | + } else { |
|
147 | 147 | $this->setErreurContenus($balise_title, $url, $meta_description, $titre_page, $parent, $contenu, $err_balise_title, $err_url, $err_meta_description, $err_titre_page); |
148 | 148 | } |
149 | 149 | } |
@@ -207,8 +207,7 @@ discard block |
||
207 | 207 | |
208 | 208 | $dbc->prepare("UPDATE page SET titre=:titre_page, contenu=:contenu, url=:url, meta_description=:meta_description, balise_title=:balise_title, parent=:parent, affiche=:affiche WHERE ID_page=:id_page", $value); |
209 | 209 | $this->setModifierLienNavigation("ID_page", $id_page, $this->getParentId($parent), $affiche); |
210 | - } |
|
211 | - else { |
|
210 | + } else { |
|
212 | 211 | $this->setErreurContenus($balise_title, $url, $meta_description, $titre_page, $parent, $contenu, $err_balise_title, $err_url, $err_meta_description, $err_titre_page); |
213 | 212 | } |
214 | 213 | } |
@@ -251,8 +250,7 @@ discard block |
||
251 | 250 | FlashMessage::setFlash("Impossible de supprimer cette page, veuillez contacter votre administrateur pour corriger ce problème"); |
252 | 251 | $this->erreur = true; |
253 | 252 | } |
254 | - } |
|
255 | - else { |
|
253 | + } else { |
|
256 | 254 | FlashMessage::setFlash("Impossible de supprimer cette page, veuillez contacter votre administrateur pour corriger ce problème"); |
257 | 255 | $this->erreur = true; |
258 | 256 | } |
@@ -269,8 +267,7 @@ discard block |
||
269 | 267 | if ($parent != "") { |
270 | 268 | $nav = new Navigation(); |
271 | 269 | $nav->setSupprimerLien($id, $id_page); |
272 | - } |
|
273 | - else if (($affiche == 1) && ($parent == "")) { |
|
270 | + } else if (($affiche == 1) && ($parent == "")) { |
|
274 | 271 | $this->setAjoutLienNavigation($id, $id_page, $affiche); |
275 | 272 | } |
276 | 273 | } |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <nav class="nav-page"> |
2 | 2 | <div class="inner"> |
3 | 3 | <ul> |
4 | - <?php $nav = new \core\Navigation();foreach ($nav->getNavigation() as $nav):?> |
|
4 | + <?php $nav = new \core\Navigation(); foreach ($nav->getNavigation() as $nav):?> |
|
5 | 5 | <li><a href="<?=ADMWEBROOT?>gestion-contenus/modifier-contenu?id=<?=$nav[0]?>" title="<?=$nav[3]?>"><?=$nav[1]?></a> |
6 | 6 | <?php if (count($nav[4]) > 0):?> |
7 | 7 | <ul> |
8 | 8 | <?php foreach ($nav[4] as $snav):?> |
9 | 9 | <li><a href="<?=ADMWEBROOT?>gestion-contenus/modifier-contenu?id=<?=$snav[0]?>" title="<?=$snav[3]?>"><?=$snav[1]?></a></li> |
10 | - <?php endforeach;?> |
|
10 | + <?php endforeach; ?> |
|
11 | 11 | </ul> |
12 | - <?php endif;?> |
|
12 | + <?php endif; ?> |
|
13 | 13 | </li> |
14 | - <?php endforeach;?> |
|
14 | + <?php endforeach; ?> |
|
15 | 15 | </ul> |
16 | 16 | </div> |
17 | 17 | </nav> |