cleaning files

Merge branch 'pre-master'
Project finished 💕
5 changed files with 6 additions and 16 deletions
--- a/fluxRSS/src/controleur/Controleur.php
+++ b/fluxRSS/src/controleur/Controleur.php
@ -3,7 +3,7 @@ namespace controleur;

 use model\ArticleModel;

-class UserControleur
+class erControleur
 {
    public function __construct()
    {
--- a/fluxRSS/src/model/AdminModel.php
+++ b/fluxRSS/src/model/AdminModel.php
@ -21,7 +21,7 @@ class AdminModel
        }
        if(Validation::validationMdp($mdp)){
            foreach ($lmdp as $motDePasse){
-                if (password_verify($mdp,$motDePasse['password']) or $mdp == $motDePasse['password']){
+                if (password_verify($mdp,$motDePasse['password']) or $mdp == $motDePasse['password']){ //Si ajout d'admin on créer avec password_hash(string $mdp)
                    $_SESSION['role'] = 'admin';
                    $_SESSION['pseudo'] = $username;
                    return new Admin($username,$motDePasse['mail']);
--- a/fluxRSS/templates/Connection.html
+++ b/fluxRSS/templates/Connection.html
@ -51,12 +51,3 @@
 </div>
 </body>
 </html>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Login</title>
-</head>
-<body>
--- a/fluxRSS/templates/listArticle.html
+++ b/fluxRSS/templates/listArticle.html
@ -36,11 +36,10 @@
    <p class="d-flex justify-content-center enTitre"> Pas d'articles à afficher</p>
 {% endif %}
 <script>
-    // Actualiser la page toutes les 5 secondes
+    // Actualiser la page toutes les 3 heures
    setTimeout(function(){
        location.reload();
-    }, 50000000);
+    }, 10800000);
 </script>
-
 </body>
 </html>
--- a/fluxRSS/templates/listArticleAdmin.html
+++ b/fluxRSS/templates/listArticleAdmin.html
@ -30,10 +30,10 @@
    <p class="d-flex justify-content-center enTitre">Pas d'articles à afficher</p>
 {% endif %}
 <script>
-    // Actualiser la page toutes les 5 secondes
+    // Actualiser la page toutes les 3 heures
    setTimeout(function(){
        location.reload();
-    }, 50000);
+    }, 10800000);
 </script>
 </body>
 </html>
Author	SHA1	Message	Date
Roxane ROSSETTO	f03789b05e	cleaning files	1 year ago
Roxane ROSSETTO	a2bdaf2c12	Merge branch 'pre-master'	1 year ago
Roxane ROSSETTO	0121031e4b	Project finished 💕	1 year ago
Roxane ROSSETTO	008a899a90	Merge branch 'master' of https://codefirst.iut.uca.fr/git/roxane.rossetto/Php_RSS	1 year ago
Maxime POINT	99ea3e181f	Merge pull request 'vueArticle' (#16 ) from vueArticle into master Reviewed-on: #16	1 year ago
Maxime POINT	b6a46d2f5f	Merge pull request 'feature/Connection' (#6 ) from feature/Connection into master Reviewed-on: #6	1 year ago