Ré-écriture du JS pour le rendre CSP compliant

10 files changed, 21 insertions, 25 deletions

diff --git a/Template/Include/incl_form_admin.php b/Template/Include/incl_form_admin.php
index a366384..16385c0 100644
--- a/Template/Include/incl_form_admin.php
+++ b/Template/Include/incl_form_admin.php
@@ -32,9 +32,9 @@ echo('<!-- Division principale -->
 // ****************************************************************************
 echo('<!-- Bouttons de navigation -->
 <div id="adminButtons">
-    <button onclick="show(\'mainAdmin\', \'section\', \'secAdminJobs\',     \'show_flex\')">'.$text[basename(__FILE__, ".php")]["btManageJob"].'</button>
-    <button onclick="show(\'mainAdmin\', \'section\', \'secAdminUsers\',    \'show_flex\')">'.$text[basename(__FILE__, ".php")]["btManageUser"].'</button>
-    <button onclick="show(\'mainAdmin\', \'section\', \'secAdminMissions\', \'show_flex\')">'.$text[basename(__FILE__, ".php")]["btManageMission"].'</button>
+    <button id="btnAdminJobs">'.$text[basename(__FILE__, ".php")]["btManageJob"].'</button>
+    <button id="btnAdminUsers">'.$text[basename(__FILE__, ".php")]["btManageUser"].'</button>
+    <button id="btnAdminMissions">'.$text[basename(__FILE__, ".php")]["btManageMission"].'</button>
 </div>'.PHP_EOL);
 
 // ****************************************************************************
diff --git a/Template/Include/incl_form_register.php b/Template/Include/incl_form_register.php
index 8462e02..0d8af79 100644
--- a/Template/Include/incl_form_register.php
+++ b/Template/Include/incl_form_register.php
@@ -20,14 +20,14 @@ echo('<!-- Division principale -->
         <div>
             <label>
                 <i class="fas fa-envelope-square"></i>
-                <input type="email" name="email" id="email" maxlength="128" onkeyup="check_email()" placeholder="'.$text[basename(__FILE__, ".php")]["email"].'" maxlength="128" required>
+                <input type="email" name="email" id="email" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["email"].'" maxlength="128" required>
             </label>
             <p>
                 <span id="mailNotice" class="invalid">'.$text[basename(__FILE__, ".php")]["mailNotice"].'</span>
             </p>
             <label>
                 <i class="fas fa-lock"></i>
-                <input type="password" name="password" id="password" maxlength="128" onkeyup="check_pass()" placeholder="'.$text[basename(__FILE__, ".php")]["password"].'" maxlength="128" required>
+                <input type="password" name="password" id="password" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["password"].'" maxlength="128" required>
             </label>
             <p>
                 '.$text[basename(__FILE__, ".php")]["passNotice"].'
diff --git a/Template/Include/incl_form_userInfo.php b/Template/Include/incl_form_userInfo.php
index 1fd78d5..c5091c5 100644
--- a/Template/Include/incl_form_userInfo.php
+++ b/Template/Include/incl_form_userInfo.php
@@ -86,7 +86,7 @@ if ($_SESSION["userStatus"] == 1) {
         echo('                <option value="'.$allJobs[$i]["jobCategoryId"].'">'.$allJobs[$i]["jobCategoryName".ucwords($_SESSION["lang"])].'</option>'.PHP_EOL);
     }
     echo('            </select>
-            <button type="button" onclick="add()">'.$text[basename(__FILE__, ".php")]["jobsAdd"].'</button>
+            <button type="button" id="addButton">'.$text[basename(__FILE__, ".php")]["jobsAdd"].'</button>
         </div>
     </label>'.PHP_EOL);
 
@@ -121,10 +121,9 @@ if ($_SESSION["userStatus"] == 1) {
     </label>'.PHP_EOL);
 
     // ****************************************************************************
-    // CHARGEMENT ET DECLENCHEMENT DU JAVASCRIPT DEDIE A CETTE PAGE
+    // CHARGEMENT DU JAVASCRIPT DEDIE A CETTE PAGE UNIQUEMENT SI PRO
     // ****************************************************************************
-    echo('    <script src="/Static/Js/userinfo.js"></script>
-    <script>init()</script>');
+    echo('    <script src="/Static/Js/userinfo.js"></script>');
 }
 
 // ****************************************************************************
diff --git a/Template/Include/incl_global_message.php b/Template/Include/incl_global_message.php
index 1f8591f..bb9926c 100644
--- a/Template/Include/incl_global_message.php
+++ b/Template/Include/incl_global_message.php
@@ -34,10 +34,7 @@ if ($messageText[$name][$status]["success"]) {
 // ****************************************************************************
 echo('<!-- Texte principal -->
 <p>'.$messageText[$name][$status]["info"].'</p>
-<p id="redirect" class="info">'.$redirect.'</p></main>
-<!-- Chargement du javascript dédié à cette page -->
-<script src="/Static/Js/message.js"></script>
-<script src="/Static/Js/main.js"></script>');
+<p id="redirect" class="info">'.$redirect.'</p></main>');
 
 // ****************************************************************************
 // RECUPERATION DE LA PAGE VERS LAQUELLE REDIRIGER SI CE N'EST PAS L'INDEX
@@ -56,11 +53,11 @@ if ($messageText[$name][$status]["toSrc"]) {
 // DECLENCHEMENT DU JAVASCRIPT AVEC LA PAGE DE DESTINATION DONNEE EN ARGUMENT
 // ****************************************************************************
 if ($messageText[$name][$status]["timer"]) {
-    echo('<!-- Redirection avec timer -->
-    <script>start_timer("'.$dest.'");</script>');
+    echo('<!-- Info pour JS, redirection avec timer -->
+    <div id="rTimer" data-page="'.$dest.'"></div>');
 } else {
-    echo('<!-- Redirection sans timer -->
-    <script>redirect("'.$dest.'")</script>');
+    echo('<!-- Info pour JS, redirection sans timer -->
+    <div id="rNoTimer" data-page="'.$dest.'"></div>');
 }
 
 ?>
\ No newline at end of file
diff --git a/Template/Include/incl_global_navbar.php b/Template/Include/incl_global_navbar.php
index 26f5872..efcff81 100644
--- a/Template/Include/incl_global_navbar.php
+++ b/Template/Include/incl_global_navbar.php
@@ -16,7 +16,7 @@ require_once(dirname( __FILE__ )."/".$_SESSION["lang"]."/text.php");
 echo('<!-- Header -->
 <header>
     <!-- Titre -->
-    <a onclick="showNavButtons()"><i class="fas fa-bars"></i></a>
+    <a id="navButton"><i class="fas fa-bars"></i></a>
     <!-- Espace vide -->
     <div class="spacer"></div>
     <a id="navTitle" href="/"><h2>'.$text[basename(__FILE__, ".php")]["h2"].'</h2></a>
diff --git a/Template/Include/incl_global_notification.php b/Template/Include/incl_global_notification.php
index 5edc9bd..55be411 100644
--- a/Template/Include/incl_global_notification.php
+++ b/Template/Include/incl_global_notification.php
@@ -12,8 +12,8 @@ require_once(dirname( __FILE__ )."/".$_SESSION["lang"]."/text.php");
 // Partie html de la notification
 echo('<!-- Notification -->
 <aside id="notif">
-    <button type="button" onclick="toggle_notif()">&#10006;</button>
-    <a onclick="redirect(\'Template/myMission\')">
+    <button type="button" id="notifClose">&#10006;</button>
+    <a id="notifRedirect">
         <span>&#128276;</span>
         <h3>'.$text[basename(__FILE__, ".php")]["header"].'</h3>
         <p>'.$text[basename(__FILE__, ".php")]["info"].'</p>
diff --git a/Template/Include/incl_table_myMission.php b/Template/Include/incl_table_myMission.php
index 96182ae..922f5b6 100644
--- a/Template/Include/incl_table_myMission.php
+++ b/Template/Include/incl_table_myMission.php
@@ -66,9 +66,9 @@ echo('<!-- Mes missions -->
 // BOUTTONS DE NAVIGATION
 // ****************************************************************************
 echo('<div id="myMissionButtons">
-    <button onclick="show(\'mainMyMission\', \'section\', \'secPending\',  \'show_block\')">'.$text[basename(__FILE__, ".php")]["pendingMission"].'</button>
-    <button onclick="show(\'mainMyMission\', \'section\', \'secOngoing\',  \'show_block\')">'.$text[basename(__FILE__, ".php")]["ongoingMission"].'</button>
-    <button onclick="show(\'mainMyMission\', \'section\', \'secCompleted\',\'show_block\')">'.$text[basename(__FILE__, ".php")]["completedMission"].'</button>
+    <button id="btnMyMissionPending">'.$text[basename(__FILE__, ".php")]["pendingMission"].'</button>
+    <button id="btnMyMissionOngoing">'.$text[basename(__FILE__, ".php")]["ongoingMission"].'</button>
+    <button id="btnMyMissionCompleted">'.$text[basename(__FILE__, ".php")]["completedMission"].'</button>
 </div>'.PHP_EOL);
 
 // ****************************************************************************
diff --git a/Template/admin.php b/Template/admin.php
index b77ddf1..f302da7 100644
--- a/Template/admin.php
+++ b/Template/admin.php
@@ -41,6 +41,5 @@ if (!isset($_SESSION["loggedIn"], $_SESSION["userStatus"])
 <?php require_once(dirname( __FILE__ )."/Include/incl_form_admin.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Include/incl_global_footer.php"); ?>
     <script src="/Static/Js/main.js"></script>
-    <script>show('mainAdmin', 'section', 'secAdminJobs', 'show_flex')</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/Template/message.php b/Template/message.php
index 28fb116..b9bf58b 100644
--- a/Template/message.php
+++ b/Template/message.php
@@ -36,6 +36,8 @@ if (!isset($_SESSION["message"])) {
 <?php require_once(dirname( __FILE__ )."/Include/incl_global_navbar.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Include/incl_global_message.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Include/incl_global_footer.php"); ?>
+    <?php echo('<script src="/Static/Js/message.js"></script>'); ?>
+    <?php echo('<script src="/Static/Js/main.js"></script>'); ?>
 </body>
 </html>
 <?php unset($_SESSION["messageNumber"]); ?>
diff --git a/Template/myMission.php b/Template/myMission.php
index 9b28537..dc7b79f 100644
--- a/Template/myMission.php
+++ b/Template/myMission.php
@@ -44,6 +44,5 @@ $_SESSION["src"] = basename(__FILE__, ".php");
 <?php require_once(dirname( __FILE__ )."/Include/incl_table_myMission.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Include/incl_global_footer.php"); ?>
     <script src="/Static/Js/main.js"></script>
-    <script>show('mainMyMission', 'section', 'secPending', 'show_block')</script>
 </body>
 </html>
\ No newline at end of file