From 66c9aba0dec896b0a87fcacdc3c021d9ef24147a Mon Sep 17 00:00:00 2001
From: owe5 <113665003+owe5@users.noreply.github.com>
Date: Sun, 8 Oct 2023 16:51:05 +0200
Subject: [PATCH 01/14] modif feof

---
 type_juggling/server/public_html/{login.html => index.html} | 0
 type_juggling/server/public_html/index.php                  | 5 +++--
 type_juggling/server/public_html/users.txt.lock             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename type_juggling/server/public_html/{login.html => index.html} (100%)

diff --git a/type_juggling/server/public_html/login.html b/type_juggling/server/public_html/index.html
similarity index 100%
rename from type_juggling/server/public_html/login.html
rename to type_juggling/server/public_html/index.html
diff --git a/type_juggling/server/public_html/index.php b/type_juggling/server/public_html/index.php
index ae5f933..76c4502 100644
--- a/type_juggling/server/public_html/index.php
+++ b/type_juggling/server/public_html/index.php
@@ -4,7 +4,8 @@ function readUsersFile($filename) {
     $users = [];
     $file = fopen($filename, "r");
     if ($file) {
-        while (($line = fgets($file)) !== false) {
+        while (!feof($file)) {
+            $line = fgets($file);
             list($username, $password) = explode(':', trim($line));
             $users[$username] = $password;
         }
@@ -19,7 +20,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 
     $users = readUsersFile('users.txt.lock');
 
-    if (isset($users[$username]) && $users[$username] ==md5($password) ){
+    if (isset($users[$username]) && $users[$username] == md5($password) ){
         echo "Bienvenue, $username ! Vous êtes connecté.";
     } else {
         echo "Identifiants invalides. Veuillez réessayer.";
diff --git a/type_juggling/server/public_html/users.txt.lock b/type_juggling/server/public_html/users.txt.lock
index 8b0f71f..3e8c8f0 100644
--- a/type_juggling/server/public_html/users.txt.lock
+++ b/type_juggling/server/public_html/users.txt.lock
@@ -1 +1 @@
-Admin:hello9323512300
\ No newline at end of file
+Admin:0e904310212375757042757551233487
\ No newline at end of file

From 1b50ac0ec38cf46787e294ac52b1712ed5fc7584 Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:19:38 +0200
Subject: [PATCH 02/14] test

---
 type_juggling/server/public_html/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/type_juggling/server/public_html/index.php b/type_juggling/server/public_html/index.php
index 76c4502..05b5fd3 100644
--- a/type_juggling/server/public_html/index.php
+++ b/type_juggling/server/public_html/index.php
@@ -19,7 +19,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
     $password = $_POST['password'];
 
     $users = readUsersFile('users.txt.lock');
-
+    pritnr("test");
     if (isset($users[$username]) && $users[$username] == md5($password) ){
         echo "Bienvenue, $username ! Vous êtes connecté.";
     } else {

From e5edfe881d4a6c228b6e192098ec2a20e7b6fc01 Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:25:13 +0200
Subject: [PATCH 03/14] test

---
 type_juggling/server/public_html/index.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/type_juggling/server/public_html/index.php b/type_juggling/server/public_html/index.php
index 05b5fd3..ddb6149 100644
--- a/type_juggling/server/public_html/index.php
+++ b/type_juggling/server/public_html/index.php
@@ -1,4 +1,5 @@
 <?php
+printr("test1");
 
 function readUsersFile($filename) {
     $users = [];
@@ -17,9 +18,9 @@ function readUsersFile($filename) {
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     $username = $_POST['username'];
     $password = $_POST['password'];
-
+    printr("test2");
     $users = readUsersFile('users.txt.lock');
-    pritnr("test");
+    pritnr("test3");
     if (isset($users[$username]) && $users[$username] == md5($password) ){
         echo "Bienvenue, $username ! Vous êtes connecté.";
     } else {

From dcbf9f55696af35b517da2cfa9f6196fb5afdaae Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:30:42 +0200
Subject: [PATCH 04/14] test

---
 type_juggling/server/public_html/index.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/type_juggling/server/public_html/index.php b/type_juggling/server/public_html/index.php
index ddb6149..5647fe6 100644
--- a/type_juggling/server/public_html/index.php
+++ b/type_juggling/server/public_html/index.php
@@ -1,6 +1,5 @@
 <?php
-printr("test1");
-
+echo 'test';
 function readUsersFile($filename) {
     $users = [];
     $file = fopen($filename, "r");

From fadfd5c33354c4808f15ccc29d71227b213c85c4 Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:33:26 +0200
Subject: [PATCH 05/14] test

---
 type_juggling/server/public_html/index.html | 22 -------------------
 type_juggling/server/public_html/index.php  | 24 ++++++++++++++++++++-
 2 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 type_juggling/server/public_html/index.html

diff --git a/type_juggling/server/public_html/index.html b/type_juggling/server/public_html/index.html
deleted file mode 100644
index 4fcd657..0000000
--- a/type_juggling/server/public_html/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="fr">
-<head>
-    <meta charset="UTF-8">
-    <title>Login</title>
-</head>
-<body>
-
-<h2>Connexion</h2>
-
-<form method="post" action="index.php">
-    <label for="username">Nom d'utilisateur :</label>
-    <input type="text" id="username" name="username" required><br><br>
-
-    <label for="password">Mot de passe :</label>
-    <input type="password" id="password" name="password" required><br><br>
-
-    <input type="submit" value="Se connecter">
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/type_juggling/server/public_html/index.php b/type_juggling/server/public_html/index.php
index 5647fe6..e5eb64b 100644
--- a/type_juggling/server/public_html/index.php
+++ b/type_juggling/server/public_html/index.php
@@ -1,5 +1,27 @@
+<!DOCTYPE html>
+<html lang="fr">
+<head>
+    <meta charset="UTF-8">
+    <title>Login</title>
+</head>
+<body>
+
+<h2>Connexion</h2>
+
+<form method="post" action="">
+    <label for="username">Nom d'utilisateur :</label>
+    <input type="text" id="username" name="username" required><br><br>
+
+    <label for="password">Mot de passe :</label>
+    <input type="password" id="password" name="password" required><br><br>
+
+    <input type="submit" value="Se connecter">
+</form>
+
+</body>
+</html>
+
 <?php
-echo 'test';
 function readUsersFile($filename) {
     $users = [];
     $file = fopen($filename, "r");

From 3cf19979e5be4294a8ee00cc7983106fa5ee61e6 Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:35:57 +0200
Subject: [PATCH 06/14] test

---
 type_juggling/server/public_html/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/type_juggling/server/public_html/index.php b/type_juggling/server/public_html/index.php
index e5eb64b..b2f0cf3 100644
--- a/type_juggling/server/public_html/index.php
+++ b/type_juggling/server/public_html/index.php
@@ -22,6 +22,7 @@
 </html>
 
 <?php
+print_r('la maladie');
 function readUsersFile($filename) {
     $users = [];
     $file = fopen($filename, "r");

From b30f38a4ae5a7cef1d253950f1ccd4ba2dc88fd2 Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:42:47 +0200
Subject: [PATCH 07/14] test

---
 type_juggling/server/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/type_juggling/server/Dockerfile b/type_juggling/server/Dockerfile
index 7ab68ca..72bc3c2 100644
--- a/type_juggling/server/Dockerfile
+++ b/type_juggling/server/Dockerfile
@@ -1,3 +1,7 @@
-FROM httpd:alpine3.18
+FROM php:8.2-cli
 
-COPY ./public_html/ /usr/local/apache2/htdocs/
+COPY ./public_html/ /usr/src/app
+
+WORKDIR /usr/src/app
+
+CMD [ "php", "./app" ]

From 1d48c14d221845186e58472477f14ca438114d15 Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:44:16 +0200
Subject: [PATCH 08/14] test

---
 type_juggling/server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/type_juggling/server/Dockerfile b/type_juggling/server/Dockerfile
index 72bc3c2..073c494 100644
--- a/type_juggling/server/Dockerfile
+++ b/type_juggling/server/Dockerfile
@@ -4,4 +4,4 @@ COPY ./public_html/ /usr/src/app
 
 WORKDIR /usr/src/app
 
-CMD [ "php", "./app" ]
+CMD [ "php", "./app/index.php" ]

From 05b07b56c295a90f3a503c9f548011dc737a65ea Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:46:21 +0200
Subject: [PATCH 09/14] test

---
 type_juggling/server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/type_juggling/server/Dockerfile b/type_juggling/server/Dockerfile
index 073c494..24dbf01 100644
--- a/type_juggling/server/Dockerfile
+++ b/type_juggling/server/Dockerfile
@@ -4,4 +4,4 @@ COPY ./public_html/ /usr/src/app
 
 WORKDIR /usr/src/app
 
-CMD [ "php", "./app/index.php" ]
+CMD [ "php", "./index.php" ]

From 35fc8da793e97de24e802b4111b3152abf9707f4 Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:50:09 +0200
Subject: [PATCH 10/14] test

---
 type_juggling/server/Dockerfile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/type_juggling/server/Dockerfile b/type_juggling/server/Dockerfile
index 24dbf01..89e54df 100644
--- a/type_juggling/server/Dockerfile
+++ b/type_juggling/server/Dockerfile
@@ -1,7 +1,3 @@
-FROM php:8.2-cli
+FROM php:8.2-apache
 
-COPY ./public_html/ /usr/src/app
-
-WORKDIR /usr/src/app
-
-CMD [ "php", "./index.php" ]
+COPY ./public_html/ /var/www/html/

From 670408a8cb23fb2f507ae3f37f3c214ca31581c6 Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:51:36 +0200
Subject: [PATCH 11/14] test

---
 type_juggling/server/public_html/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/type_juggling/server/public_html/index.php b/type_juggling/server/public_html/index.php
index b2f0cf3..9eeb35e 100644
--- a/type_juggling/server/public_html/index.php
+++ b/type_juggling/server/public_html/index.php
@@ -40,9 +40,9 @@ function readUsersFile($filename) {
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     $username = $_POST['username'];
     $password = $_POST['password'];
-    printr("test2");
+    print_r("test2");
     $users = readUsersFile('users.txt.lock');
-    pritnr("test3");
+    pritn_r("test3");
     if (isset($users[$username]) && $users[$username] == md5($password) ){
         echo "Bienvenue, $username ! Vous êtes connecté.";
     } else {

From deb9ef500bee74edc19e973defe73b7ed6f44554 Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:52:36 +0200
Subject: [PATCH 12/14] test

---
 type_juggling/server/public_html/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/type_juggling/server/public_html/index.php b/type_juggling/server/public_html/index.php
index 9eeb35e..5f4d12b 100644
--- a/type_juggling/server/public_html/index.php
+++ b/type_juggling/server/public_html/index.php
@@ -42,7 +42,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
     $password = $_POST['password'];
     print_r("test2");
     $users = readUsersFile('users.txt.lock');
-    pritn_r("test3");
+    print_r("test3");
     if (isset($users[$username]) && $users[$username] == md5($password) ){
         echo "Bienvenue, $username ! Vous êtes connecté.";
     } else {

From 5c20105473ba35b7b7c6f9bcb51b6bf9dc54e959 Mon Sep 17 00:00:00 2001
From: owargout <Owen.ARGOUT@etu.uca.fr>
Date: Mon, 9 Oct 2023 08:53:56 +0200
Subject: [PATCH 13/14] fonctionnel mais pas ouf

---
 type_juggling/server/public_html/index.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/type_juggling/server/public_html/index.php b/type_juggling/server/public_html/index.php
index 5f4d12b..f4d9e4e 100644
--- a/type_juggling/server/public_html/index.php
+++ b/type_juggling/server/public_html/index.php
@@ -22,7 +22,6 @@
 </html>
 
 <?php
-print_r('la maladie');
 function readUsersFile($filename) {
     $users = [];
     $file = fopen($filename, "r");
@@ -40,9 +39,7 @@ function readUsersFile($filename) {
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     $username = $_POST['username'];
     $password = $_POST['password'];
-    print_r("test2");
     $users = readUsersFile('users.txt.lock');
-    print_r("test3");
     if (isset($users[$username]) && $users[$username] == md5($password) ){
         echo "Bienvenue, $username ! Vous êtes connecté.";
     } else {

From ee255d4cd06ade23f48e4cc1df743c7d33a8a820 Mon Sep 17 00:00:00 2001
From: "justin.carvalheiro" <justin.carvalheiro16@gmail.com>
Date: Mon, 9 Oct 2023 19:08:56 +0200
Subject: [PATCH 14/14] architecture change

---
 type_juggling/{server => }/Dockerfile                 | 0
 type_juggling/{server => }/public_html/index.php      | 0
 type_juggling/{server => }/public_html/users.txt.lock | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename type_juggling/{server => }/Dockerfile (100%)
 rename type_juggling/{server => }/public_html/index.php (100%)
 rename type_juggling/{server => }/public_html/users.txt.lock (100%)

diff --git a/type_juggling/server/Dockerfile b/type_juggling/Dockerfile
similarity index 100%
rename from type_juggling/server/Dockerfile
rename to type_juggling/Dockerfile
diff --git a/type_juggling/server/public_html/index.php b/type_juggling/public_html/index.php
similarity index 100%
rename from type_juggling/server/public_html/index.php
rename to type_juggling/public_html/index.php
diff --git a/type_juggling/server/public_html/users.txt.lock b/type_juggling/public_html/users.txt.lock
similarity index 100%
rename from type_juggling/server/public_html/users.txt.lock
rename to type_juggling/public_html/users.txt.lock