@@ -2,5 +2,5 @@ |
||
2 | 2 | include_once(ROOT.'libs/ckeditor/ckeditor.php'); |
3 | 3 | require_once(ROOT.'libs/ckfinder/ckfinder.php'); |
4 | 4 | $ckeditor = new CKEditor(); |
5 | - $ckeditor->basePath = WEBROOT.'libs/ckeditor/'; |
|
5 | + $ckeditor->basePath = WEBROOT.'libs/ckeditor/'; |
|
6 | 6 | CKFinder::SetupCKEditor($ckeditor, WEBROOT.'libs/ckfinder/'); |
7 | 7 | \ No newline at end of file |
@@ -36,8 +36,7 @@ discard block |
||
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 |
||
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 |
||
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; |
@@ -117,8 +114,7 @@ discard block |
||
117 | 114 | $contenu_dynamique = $config->getContenusDynamique(); |
118 | 115 | $responsive = $config->getResponsive(); |
119 | 116 | $cache_config = $config->getCache(); |
120 | - } |
|
121 | - else { |
|
117 | + } else { |
|
122 | 118 | $config = new \core\Configuration(); |
123 | 119 | $nom_site = $config->getNomSite(); |
124 | 120 | $url_site = $config->getUrlSite(); |
@@ -154,8 +150,7 @@ discard block |
||
154 | 150 | $db_host_prod = $_SESSION["db_host_prod"]; |
155 | 151 | |
156 | 152 | unset($_SESSION['err_modification_configini']); |
157 | - } |
|
158 | - else { |
|
153 | + } else { |
|
159 | 154 | $developpement = $ini["developpment"]; |
160 | 155 | |
161 | 156 | $db_type_dev = $ini["dev"]["DB_TYPE"]; |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | <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> |
18 | 18 | |
19 | 19 | |
20 | -<?php if ($config->getResponsive() == 1){?> |
|
20 | +<?php if ($config->getResponsive() == 1) {?> |
|
21 | 21 | <link rel="stylesheet" type="text/css" href="<?=WEBROOT?>admin/views/template/css/foundation-inline.css"> |
22 | 22 | <?php }?> |
23 | 23 | <link rel="stylesheet" type="text/css" href="<?=TPLWEBROOT?>css/page.css"> |
@@ -33,13 +33,13 @@ discard block |
||
33 | 33 | <script> |
34 | 34 | CKEDITOR.disableAutoInline = true; |
35 | 35 | |
36 | - <?php for($i=0 ; $i<$bloc_editable ; $i++):?> |
|
36 | + <?php for ($i = 0; $i < $bloc_editable; $i++):?> |
|
37 | 37 | $(document).ready(function() { |
38 | 38 | console.log("editor<?=$i?>"); |
39 | 39 | $("#editor<?=$i?>").attr("contenteditable", true); |
40 | 40 | }) |
41 | 41 | var editor<?=$i?> = CKEDITOR.inline("editor<?=$i?>", { customConfig: "<?=WEBROOT?>config/config_ckeditor.js" }); |
42 | 42 | CKFinder.setupCKEditor( editor<?=$i?>, "<?=LIBSWEBROOT?>ckfinder/" ); |
43 | - <?php endfor;?> |
|
43 | + <?php endfor; ?> |
|
44 | 44 | </script> |
45 | -<?php require_once(ROOT."admin/views/gestion-contenus/js/inline.php");?> |
|
46 | 45 | \ No newline at end of file |
46 | +<?php require_once(ROOT."admin/views/gestion-contenus/js/inline.php"); ?> |
|
47 | 47 | \ No newline at end of file |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | <link rel="stylesheet" type="text/css" href="<?=LIBSWEBROOT?>reset_css/reset.css"> |
10 | 10 | <link rel="stylesheet" type="text/css" href="<?=WEBROOT?>admin/views/template/css/style.css"> |
11 | 11 | <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script> |
12 | - <?php require_once(ROOT."admin/views/template/js/menu.php");?> |
|
12 | + <?php require_once(ROOT."admin/views/template/js/menu.php"); ?> |
|
13 | 13 | |
14 | 14 | <!-- Les librairies utlisées --> |
15 | 15 | <link rel="stylesheet" type="text/css" href="<?=LIBSWEBROOT?>popup/css/style.css"> |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | </head> |
20 | 20 | <?=\core\HTML\flashmessage\FlashMessage::getFlash(); ?> |
21 | 21 | <body> |
22 | - <nav class="menu <?php if (($_SESSION["menu_plie".CLEF_SITE] == "deplie") || (!isset($_SESSION["menu_plie".CLEF_SITE]))):?>active<?php endif;?>"> |
|
22 | + <nav class="menu <?php if (($_SESSION["menu_plie".CLEF_SITE] == "deplie") || (!isset($_SESSION["menu_plie".CLEF_SITE]))):?>active<?php endif; ?>"> |
|
23 | 23 | <div class="titre"> |
24 | 24 | <h1>Ribs V2.3.5.6</h1> |
25 | 25 | <i class="fa fa-bars"></i> |
@@ -41,14 +41,14 @@ discard block |
||
41 | 41 | <a href="<?=ADMWEBROOT?>notifications"><i class="fa fa-bell <?php if ($admin->getNotification() == 1):?> animated infinite swing<?php endif; ?>"></i></a> |
42 | 42 | </div> |
43 | 43 | </div> |
44 | - <?php endif;?> |
|
44 | + <?php endif; ?> |
|
45 | 45 | <?php if (($droit_acces->getSuperAdmin() == 1) || ($droit_acces->getDroitAccesPage("configuration/mon-compte"))):?> |
46 | 46 | <div class="colonne"> |
47 | 47 | <div class="config"> |
48 | 48 | <a href="<?=ADMWEBROOT?>configuration/index"><i class="fa fa-gear"></i></a> |
49 | 49 | </div> |
50 | 50 | </div> |
51 | - <?php endif;?> |
|
51 | + <?php endif; ?> |
|
52 | 52 | <div class="colonne"> |
53 | 53 | <div class="logout"> |
54 | 54 | <a href="<?=WEBROOT?>administrator/controller/core/auth/connexion/logout"><i class="fa fa-sign-out animated activate swing infinite"></i></a> |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | <ul> |
68 | 68 | <?php if ($droit_acces->getDroitAccesAction("CREATION COMPTE ADMIN")):?> |
69 | 69 | <li><i class="fa fa-user"></i><a href="<?=ADMWEBROOT?>gestion-comptes/creer-utilisateur">Créer un utilisateur</a></li> |
70 | - <?php endif;?> |
|
70 | + <?php endif; ?> |
|
71 | 71 | </ul> |
72 | 72 | </li> |
73 | 73 | <?php endif; ?> |
@@ -114,11 +114,12 @@ |
||
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 | |
119 | 121 | echo $twig->render($page, array_merge($arr, $constant)); |
120 | - } |
|
121 | - else { |
|
122 | + } else { |
|
122 | 123 | require("admin/views/".$page.".php"); |
123 | 124 | } |
124 | 125 | ?> |
@@ -18,13 +18,11 @@ |
||
18 | 18 | |
19 | 19 | //si c'est un controleur de base on va cerhcer dans core/admin |
20 | 20 | require_once("installation/controller/".$lien.".php"); |
21 | - } |
|
22 | - else { |
|
21 | + } else { |
|
23 | 22 | require("installation/controller/initialise_all.php"); |
24 | 23 | require("installation/views/template/principal.php"); |
25 | 24 | } |
26 | - } |
|
27 | - else { |
|
25 | + } else { |
|
28 | 26 | $page = "installation/views/index"; |
29 | 27 | require("installation/views/template/principal.php"); |
30 | 28 | } |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | |
22 | 22 | if ($this->erreur == true) { |
23 | 23 | FlashMessage::setFlash("<ul>".$this->nom.$this->prenom.$this->pseudo.$this->mdp."</ul>"); |
24 | - } |
|
25 | - else { |
|
24 | + } else { |
|
26 | 25 | $this->setInscrireUtilisateur(); |
27 | 26 | |
28 | 27 | FlashMessage::setFlash("Le compte super admin a bien été créé", "success"); |
@@ -64,8 +63,7 @@ discard block |
||
64 | 63 | if ($mdp != $verif_mdp) { |
65 | 64 | $this->erreur = true; |
66 | 65 | return "<li>Vos mots de passe sont différents</li>"; |
67 | - } |
|
68 | - else { |
|
66 | + } else { |
|
69 | 67 | return $mdp; |
70 | 68 | } |
71 | 69 | } |
@@ -8,8 +8,7 @@ |
||
8 | 8 | $_SESSION['err_user'] = true; |
9 | 9 | |
10 | 10 | header("location:".WEBROOT."installation-ribs/utilisateur"); |
11 | - } |
|
12 | - else { |
|
11 | + } else { |
|
13 | 12 | \core\App::supprimerDossier(ROOT."installation"); |
14 | 13 | |
15 | 14 | header("location:".WEBROOT."administrator"); |
@@ -10,7 +10,6 @@ |
||
10 | 10 | $_SESSION['err_db'] = true; |
11 | 11 | |
12 | 12 | header("location:".WEBROOT."installation-ribs/bdd"); |
13 | - } |
|
14 | - else { |
|
13 | + } else { |
|
15 | 14 | header("location:".WEBROOT."installation-ribs/configuration"); |
16 | 15 | } |
17 | 16 | \ No newline at end of file |
@@ -58,8 +58,7 @@ |
||
58 | 58 | ->from("page") |
59 | 59 | ->where("ID_page", "=", $id_page) |
60 | 60 | ->get(); |
61 | - } |
|
62 | - else { |
|
61 | + } else { |
|
63 | 62 | $query = $dbc->select("balise_title")->select("meta_description")->select("ID_page") |
64 | 63 | ->from("page") |
65 | 64 | ->where("url", " LIKE ", $url) |