Piou-piou /
ribs-framework
@@ -7,7 +7,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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"); |
@@ -77,7 +77,9 @@ discard block |
||
| 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 |
||
| 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 | } |
