@@ -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,10 +114,11 @@ |
||
| 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 | ?> |
@@ -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) |
@@ -60,8 +60,7 @@ discard block |
||
| 60 | 60 | $this->reload_cache = $obj->reload_cache; |
| 61 | 61 | $this->no_cache = $obj->no_cache; |
| 62 | 62 | } |
| 63 | - } |
|
| 64 | - else { |
|
| 63 | + } else { |
|
| 65 | 64 | $dbc->insert("nom_fichier", $this->page)->insert("reload_cache", 0)->into("cache")->set(); |
| 66 | 65 | |
| 67 | 66 | $this->reload_cache = 0; |
@@ -107,16 +106,14 @@ discard block |
||
| 107 | 106 | require_once($this->chemin_cache); |
| 108 | 107 | |
| 109 | 108 | return true; |
| 110 | - } |
|
| 111 | - else { |
|
| 109 | + } else { |
|
| 112 | 110 | if ($this->no_cache == null) { |
| 113 | 111 | ob_start(); |
| 114 | 112 | } |
| 115 | 113 | |
| 116 | 114 | return false; |
| 117 | 115 | } |
| 118 | - } |
|
| 119 | - else { |
|
| 116 | + } else { |
|
| 120 | 117 | return false; |
| 121 | 118 | } |
| 122 | 119 | } |
@@ -44,8 +44,7 @@ discard block |
||
| 44 | 44 | public static function FindInString($string, $find) { |
| 45 | 45 | if (strpos($string, $find) !== false) { |
| 46 | 46 | return true; |
| 47 | - } |
|
| 48 | - else { |
|
| 47 | + } else { |
|
| 49 | 48 | return false; |
| 50 | 49 | } |
| 51 | 50 | } |
@@ -58,8 +57,7 @@ discard block |
||
| 58 | 57 | public static function alphaNumeric($string) { |
| 59 | 58 | if (!preg_match('/^[a-zA-Z0-9]+$/', $string)) { |
| 60 | 59 | return false; |
| 61 | - } |
|
| 62 | - else { |
|
| 60 | + } else { |
|
| 63 | 61 | return true; |
| 64 | 62 | } |
| 65 | 63 | } |