From 27c38e0ca72a2606778212ece7f78cbb429087fc Mon Sep 17 00:00:00 2001
From: Poty Thomas <thomaspoty6@gmail.com>
Date: Mon, 8 Jun 2026 14:16:59 +0200
Subject: [PATCH 1/4] modification de l'authentification

---
 controllers/auth_ctrl2.php  | 13 ++++------
 controllers/auth_ctrl2.php~ | 48 +++++++++++++++++++++++++++++++++++++
 models/connection.php       |  2 +-
 models/connection.php~      | 14 +++++++++++
 models/user_crud.php        | 15 ++++++++----
 views/login_views.php       | 18 +++++++-------
 6 files changed, 88 insertions(+), 22 deletions(-)
 create mode 100644 controllers/auth_ctrl2.php~
 create mode 100644 models/connection.php~

diff --git a/controllers/auth_ctrl2.php b/controllers/auth_ctrl2.php
index 5ea9b0b..875b914 100644
--- a/controllers/auth_ctrl2.php
+++ b/controllers/auth_ctrl2.php
@@ -1,11 +1,9 @@
 <?php
-
 function login_ctrl() {
     $ask_route = null;
     if (isset($_GET['ask'])) {
         $ask_route = htmlentities($_GET['ask']);
     }
-
     if ($_SERVER['REQUEST_METHOD'] == 'POST') {
         verify_login_ctrl($ask_route);
     } else {
@@ -14,16 +12,14 @@ function login_ctrl() {
 }
 
 function verify_login_ctrl(?string $route) {
+    require('models/connection.php');
+    require('models/user_crud.php');
     $login  = isset($_POST['login']) ? htmlentities($_POST['login']) : '';
     $passwd = isset($_POST['password']) ? $_POST['password'] : '';
-
-    require('models/connection.php');
     $c = connection();
-    require('models/user_crud.php');
-
     $user = recuperation_auth($c, $login);
-
     if ($user && password_verify($passwd, $user['passwd'])) {
+        session_regenerate_id(true);
         $_SESSION['login'] = $user['login'];
         $_SESSION['role']  = $user['type'];
         header('Location: index.php?route=' . $route);
@@ -40,7 +36,8 @@ function login_form_ctrl(?string $route) {
 }
 
 function logout_ctrl() {
-    unset($_SESSION);
+    session_unset();
     session_destroy();
+    setcookie(session_name(), '', time() - 3600, '/');
     require('views/welcome_view.php');
 }
diff --git a/controllers/auth_ctrl2.php~ b/controllers/auth_ctrl2.php~
new file mode 100644
index 0000000..22bf620
--- /dev/null
+++ b/controllers/auth_ctrl2.php~
@@ -0,0 +1,48 @@
+<?php
+
+function login_ctrl() {
+    $ask_route = null;
+    if (isset($_GET['ask'])) {
+        $ask_route = htmlentities($_GET['ask']);
+    }
+
+    if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+        verify_login_ctrl($ask_route);
+    } else {
+        login_form_ctrl($ask_route);
+    }
+}
+
+function verify_login_ctrl(?string $route) {
+    $login  = isset($_POST['login']) ? htmlentities($_POST['login']) : '';
+    $passwd = isset($_POST['password']) ? $_POST['password'] : '';
+    
+    require('models/connection.php');
+	 require('models/user_crud.php');
+	
+    $c = connection();
+    $user = recuperation_auth($c, $login);
+
+    
+
+    if ($user && password_verify($passwd, $user['passwd'])) {
+        $_SESSION['login'] = $user['login'];
+        $_SESSION['role']  = $user['type'];
+        header('Location: index.php?route=' . $route);
+        exit;
+    } else {
+        echo 'Erreur d\'authentification.';
+        exit;
+    }
+}
+
+function login_form_ctrl(?string $route) {
+    require('views/login_views.php');
+    login_form_view($route);
+}
+
+function logout_ctrl() {
+    unset($_SESSION);
+    session_destroy();
+    require('views/welcome_view.php');
+}
diff --git a/models/connection.php b/models/connection.php
index 22116bc..d6afbab 100644
--- a/models/connection.php
+++ b/models/connection.php
@@ -11,4 +11,4 @@ function connection() {
     //Db connection
     $connex = new PDO('mysql:host=' . HOST . ';dbname=' . DB,USER , PASSWORD);
     return $connex;
-}
\ No newline at end of file
+}
diff --git a/models/connection.php~ b/models/connection.php~
new file mode 100644
index 0000000..22116bc
--- /dev/null
+++ b/models/connection.php~
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * Create a PDO connection
+ * @return PDO
+ */
+function connection() {
+    //Loads config from file config.php
+    require('config/config.php');
+    
+    //Db connection
+    $connex = new PDO('mysql:host=' . HOST . ';dbname=' . DB,USER , PASSWORD);
+    return $connex;
+}
\ No newline at end of file
diff --git a/models/user_crud.php b/models/user_crud.php
index 88d2eab..54969c3 100644
--- a/models/user_crud.php
+++ b/models/user_crud.php
@@ -1,11 +1,16 @@
 <?php
 
-function recuperation_auth(PDO $c, string $login): ?array {
+
+
+function recuperation_auth(PDO $connex, int $id):array {
+	 require('config/config.php');
     $req = "SELECT login, passwd, type FROM Utilisateur WHERE login = :login";
-    $prep = $c->prepare($req);
-    $prep->bindValue(':login', $login);
+    
+    $prep = $connex->prepare($req);
+    $prep->bindValue(':id', $id);
     $prep->execute();
     $auth = $prep->fetch(PDO::FETCH_ASSOC);
     $prep->closeCursor();
-    return $auth ?: null;
-}
+    return $auth;
+ }
+  
\ No newline at end of file
diff --git a/views/login_views.php b/views/login_views.php
index 9e676cc..c55206c 100644
--- a/views/login_views.php
+++ b/views/login_views.php
@@ -1,15 +1,17 @@
+
 <?php
+#ceci est la partie "view" de la page de login, le header et le footer ne sont pour l'instant pas actif
+error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
+ini_set('display_errors', 1);
 
 function login_form_view(?string $route) {
-    require('views/header.php');
+    #require('header.php');
 
     echo '<h2>Page d\'authentification</h2>';
-    echo '<p>Merci de vous authentifier pour accéder à cette fonctionnalité.</p>';
     echo '<form action="index.php?route=auth&ask=' . $route . '" method="post">';
-    echo '<p><label>Login :</label> <input type="text" name="login"></p>';
-    echo '<p><label>Mot de passe :</label> <input type="password" name="password"></p>';
-    echo '<p><input type="submit" value="Valider"></p>';
-    echo '</form>';
+    echo '<p>Login<input type="text" name="login" /></p>';
+    echo '<p>Mot de passe<input type="passwd" name="password" /></p>';
+    echo '<p><input type="submit" value="Valider" /></form>';
 
-    require('views/footer.php');
-}
+    #require('footer.php');
+}
\ No newline at end of file

From 8cf66e54ba49abe72577721bf6f6c4ec148f08a6 Mon Sep 17 00:00:00 2001
From: ryana <ryana.dealmeida1@gmail.com>
Date: Mon, 8 Jun 2026 14:21:28 +0200
Subject: [PATCH 2/4] modif tous

---
 config.php         | 5 -----
 lecture_page_model | 1 -
 2 files changed, 6 deletions(-)
 delete mode 100644 config.php
 delete mode 100644 lecture_page_model

diff --git a/config.php b/config.php
deleted file mode 100644
index 2187112..0000000
--- a/config.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-define('HOST', '192.168.156.221');
-define('DB', 'projet3_tp1');
-define('USER', 'rdealmei');
-define('PASSWORD', 'RT2026');
\ No newline at end of file
diff --git a/lecture_page_model b/lecture_page_model
deleted file mode 100644
index 8b13789..0000000
--- a/lecture_page_model
+++ /dev/null
@@ -1 +0,0 @@
-

From eb9017e5f55ee331ee30d0effbea7a30d15bfa3d Mon Sep 17 00:00:00 2001
From: ryana <ryana.dealmeida1@gmail.com>
Date: Mon, 8 Jun 2026 14:31:09 +0200
Subject: [PATCH 3/4] modif tous

---
 controllers/lecture_page_ctrl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/lecture_page_ctrl.php b/controllers/lecture_page_ctrl.php
index 3553e0c..441e5e6 100644
--- a/controllers/lecture_page_ctrl.php
+++ b/controllers/lecture_page_ctrl.php
@@ -2,7 +2,7 @@
 
 function planning_afficher_ctrl() {
     require('models/connection.php');
-    $c = connection();
+    $co = connection();
     require('models/planning_model.php');
 
     $date       = $_GET['date'] ?? date('Y-m-d');

From 34b4eb2996dd159d0101eda3946b1f0f5a4762bc Mon Sep 17 00:00:00 2001
From: ryana <ryana.dealmeida1@gmail.com>
Date: Mon, 8 Jun 2026 14:37:23 +0200
Subject: [PATCH 4/4] modif tous

---
 index.php              | 7 -------
 views/lecture_page.php | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/index.php b/index.php
index 4ac413c..36b2c37 100644
--- a/index.php
+++ b/index.php
@@ -70,12 +70,6 @@
             operations_form_ctrl();
             break;
 
-<<<<<<< HEAD
-        case 'add_operation':
-            require('controllers/operation_ctrl.php');
-            add_operation_write_ctrl();
-            break;
-=======
         case 'lecture':
             require('views/lecture_page.php');
             break;
@@ -84,7 +78,6 @@
             require('controllers/lecture_page_ctrl.php');
             break;
 
->>>>>>> c98d36d6ee22b1cc45aaf2d55c29677ea8c56d65
         default:
             require('views/404_view.php');
             break;
diff --git a/views/lecture_page.php b/views/lecture_page.php
index 96bec03..f667c13 100644
--- a/views/lecture_page.php
+++ b/views/lecture_page.php
@@ -1,5 +1,8 @@
 <?php
 
+error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
+ini_set('display_errors', 1);
+
 function planning_view(array $sauveteurs, array $creneaux, array $grille, string $date) {
 ?>
 <!DOCTYPE html>