From 168f30e3ba446c7f9eb4c8d359a0886005a98004 Mon Sep 17 00:00:00 2001
From: Rossetto <roxane.rossetto@etu.uca.fr>
Date: Mon, 20 Nov 2023 16:20:52 +0100
Subject: [PATCH] resolution of some problem with vue and password

---
 fluxRSS/src/config/Validation.php       |  1 +
 fluxRSS/src/model/AdminModel.php        |  2 +-
 fluxRSS/templates/listArticle.html      | 20 ++++++++++++--------
 fluxRSS/templates/listArticleAdmin.html | 10 +++++++---
 fluxRSS/templates/listFlux.html         |  4 ++++
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/fluxRSS/src/config/Validation.php b/fluxRSS/src/config/Validation.php
index 058290e..e01c142 100755
--- a/fluxRSS/src/config/Validation.php
+++ b/fluxRSS/src/config/Validation.php
@@ -31,4 +31,5 @@ class Validation
             $age         = 0;
         }
     }
+    
 }
diff --git a/fluxRSS/src/model/AdminModel.php b/fluxRSS/src/model/AdminModel.php
index dcace24..ec74fc9 100755
--- a/fluxRSS/src/model/AdminModel.php
+++ b/fluxRSS/src/model/AdminModel.php
@@ -19,7 +19,7 @@ class AdminModel
         $lmdp = $gwArticle->login($username);
 
         foreach ($lmdp as $motDePasse){
-            if (true){//password_verify($mdp,$motDePasse['password']) or $mdp == $motDePasse['password']){
+            if (password_verify($mdp,$motDePasse['password']) or $mdp == $motDePasse['password']){
                 $_SESSION['role'] = 'admin';
                 $_SESSION['pseudo'] = $username;
                 return new Admin($username,$motDePasse['mail']);
diff --git a/fluxRSS/templates/listArticle.html b/fluxRSS/templates/listArticle.html
index dca136e..68a627f 100755
--- a/fluxRSS/templates/listArticle.html
+++ b/fluxRSS/templates/listArticle.html
@@ -23,14 +23,18 @@
         <button type="submit">Change number of articles</button>
     </form>
 </div>
-{% for article in dVue.data %}
-<p class="caseInfo">
-    {{article.dateStr()}}<br>
-    <img class="img-thumbnail imgArticle"  src="{{ article.getMediaContent }}"/>
-    <a class="modal-content enTitre" href="{{ article.getLink() }}" target="_blank">{{ article.getTitle() }}</a>
-    {{ article.getDescription() }}
-</p>
-{% endfor %}
+{% if dVue.data is defined %}
+    {% for article in dVue.data %}
+    <p class="caseInfo">
+        {{article.dateStr()}}<br>
+        <img class="img-thumbnail imgArticle"  src="{{ article.getMediaContent }}"/>
+        <a class="modal-content enTitre" href="{{ article.getLink() }}" target="_blank">{{ article.getTitle() }}</a>
+        {{ article.getDescription() }}
+    </p>
+    {% endfor %}
+{% else %}
+    <p class="d-flex justify-content-center enTitre"> Pas d'articles à afficher</p>
+{% endif %}
 <script>
     // Actualiser la page toutes les 5 secondes
     setTimeout(function(){
diff --git a/fluxRSS/templates/listArticleAdmin.html b/fluxRSS/templates/listArticleAdmin.html
index 440ddda..0b0e01c 100755
--- a/fluxRSS/templates/listArticleAdmin.html
+++ b/fluxRSS/templates/listArticleAdmin.html
@@ -14,17 +14,21 @@
     <h1 class="d-flex justify-content-center entete">Vue des articles</h1>
 </div>
 <form class="margOp" method="POST" action="changeNbArticle">
-    <input name="nbArticle" type="number" min="0">
+    <input name="nbArticleAdmin" type="number" min="0">
     <button type="submit">Change number of articles</button>
 </form>
-{% for article in dVue.data %}
+{% if dVue.data is defined %}
+    {% for article in dVue.data %}
     <p class="caseInfo">
         {{article.dateStr()}}<br>
         <img class="imgArticle" src="{{ article.getMediaContent }}"/><br>
         <a class="modal-content enTitre" href="{{ article.getLink() }}"target="_blank">{{ article.getTitle() }}</a>
         {{ article.getDescription() }}
     </p>
-{% endfor %}
+    {% endfor %}
+{% else %}
+    <p class="d-flex justify-content-center enTitre">Pas d'articles à afficher</p>
+{% endif %}
 <script>
     // Actualiser la page toutes les 5 secondes
     setTimeout(function(){
diff --git a/fluxRSS/templates/listFlux.html b/fluxRSS/templates/listFlux.html
index ce6b6e4..5923837 100755
--- a/fluxRSS/templates/listFlux.html
+++ b/fluxRSS/templates/listFlux.html
@@ -12,6 +12,7 @@
 <div class="margOp">
     <h1 class="d-flex justify-content-center entete">Liste flux</h1>
 </div>
+{% if dVue.data is defined %}
     {% for value in dVue.data %}
     <div class="margOp enTitre caseInfo">
         {{ value.getFlux() }}
@@ -21,6 +22,9 @@
         </form>
     </div>
     {% endfor %}
+{% else %}
+    <p class="justify-content-center d-flex enTitre">Pas de flux présent</p>
+{% endif %}
     <form method="POST" action="ajoutFlux">
         <input name="fluxAdd" type="text">
         <button type="submit">Ajouter Flux</button>