From 8c3dda36c1dc8e40e0c25b7cfc3771a1a7a1b29a Mon Sep 17 00:00:00 2001
From: Safak <safak.hazinedar@startmail.com>
Date: Mon, 2 Dec 2024 10:20:46 +0100
Subject: [PATCH 1/9] erste Version Login Fenster und Mock-Login.php

---
 webseite/index.php | 38 ++++++++++++++++++++++++++++++++++++++
 webseite/login.php | 30 ++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 webseite/login.php

diff --git a/webseite/index.php b/webseite/index.php
index 75facc9..fa7126a 100644
--- a/webseite/index.php
+++ b/webseite/index.php
@@ -29,10 +29,31 @@
                 <img src="assets/images/hsgg-logo.png" alt="HSGG Logo" class="h-10 mr-3">
                 <span class="text-2xl font-bold text-[var(--primary-color)]">HSGG</span>
             </a>
+            <!-- Login Button -->
+            <button id="loginButton">Login</button>
         </div>
     </div>
 </nav>
 
+<!-- Login Popup -->
+<div id="loginPopup" class="hidden fixed inset-0 bg-black/50 flex items-center justify-center z-50">
+    <div class="bg-white p-8 rounded-lg shadow-lg w-full max-w-sm relative">
+        <button id="closePopupButton" class="absolute top-2 right-2 text-gray-500 text-xl">&times;</button>
+        <h2 class="text-2xl font-bold mb-6 text-center">Login</h2>
+        <form id="loginForm" action="login.php" method="POST">
+            <div class="mb-4">
+                <label for="username" class="block text-gray-700 mb-2">Benutzername:</label>
+                <input type="text" id="username" name="username" class="w-full p-2 border rounded-lg" required>
+            </div>
+            <div class="mb-4">
+                <label for="password" class="block text-gray-700 mb-2">Passwort:</label>
+                <input type="password" id="password" name="password" class="w-full p-2 border rounded-lg" required>
+            </div>
+            <button type="submit" class="w-full bg-[var(--primary-color)] text-white px-4 py-2 rounded-lg hover:bg-[var(--accent-color)] transition duration-300">Login</button>
+        </form>
+    </div>
+</div>
+
 <!-- Hero Section -->
 <div class="hidden md:block pt-24 px-4">
     <div class="max-w-7xl mx-auto">
@@ -100,5 +121,22 @@
     </div>
 </footer>
 
+<script>
+    // JavaScript to handle opening and closing of the login popup
+    document.getElementById('loginButton').addEventListener('click', function() {
+        document.getElementById('loginPopup').classList.remove('hidden');
+    });
+
+    document.getElementById('closePopupButton').addEventListener('click', function() {
+        document.getElementById('loginPopup').classList.add('hidden');
+    });
+
+    window.addEventListener('click', function(event) {
+        if (event.target === document.getElementById('loginPopup')) {
+            document.getElementById('loginPopup').classList.add('hidden');
+        }
+    });
+</script>
+
 </body>
 </html>
diff --git a/webseite/login.php b/webseite/login.php
new file mode 100644
index 0000000..5308f58
--- /dev/null
+++ b/webseite/login.php
@@ -0,0 +1,30 @@
+<?php
+
+// Mock credentials for the login
+$validUsername = 'admin';
+$validPassword = 'password';
+
+// Check if the form was submitted
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    // Get the submitted username and password
+    $username = isset($_POST['username']) ? $_POST['username'] : '';
+    $password = isset($_POST['password']) ? $_POST['password'] : '';
+
+    // Validate credentials
+    if ($username === $validUsername && $password === $validPassword) {
+        echo "Login erfolgreich";
+        // Redirect to dashboard or any other page
+        header("Location: index.php");
+        exit;
+    } else {
+        // Set an error message in the session to show on the login page
+        $_SESSION['errorMessage'] = "Login fehlgeschlagen: Falscher Benutzername oder Passwort.";
+        header("Location: index.php");
+        exit;
+    }
+} else {
+    echo "Bitte benutzen Sie das Login-Formular.";
+}
+
+
+?>

From 88b652a87e6b5dcef3de77f6133a9c4533e6ef7e Mon Sep 17 00:00:00 2001
From: Matthias Grief <matthias.grief@alumni.fh-aachen.de>
Date: Sun, 1 Dec 2024 14:18:18 +0100
Subject: [PATCH 2/9] Dokumentation der Akzentfarbe angepasst

---
 webseite/classes/SubjectData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webseite/classes/SubjectData.php b/webseite/classes/SubjectData.php
index 87c9db0..71bbd27 100644
--- a/webseite/classes/SubjectData.php
+++ b/webseite/classes/SubjectData.php
@@ -24,7 +24,7 @@ class SubjectData
     public string $description;
 
     /**
-     * @var string Themenfarbe des Faches, entweder als hexcode oder CSS-Klasse, noch nicht spezifiziert
+     * @var string Themenfarbe des Faches als hexcode
      */
     public string $color;
 

From ed6ce6d8b76afc5a20e9ae362298c548b0d995a5 Mon Sep 17 00:00:00 2001
From: Matthias Grief <matthias.grief@alumni.fh-aachen.de>
Date: Sun, 1 Dec 2024 21:09:34 +0100
Subject: [PATCH 3/9] Loginschnittstelle eingebaut

---
 webseite/classes/User.php | 172 ++++++++++++++++++++++++++++++++++++++
 webseite/classes/Util.php |   9 ++
 webseite/test.php         |   1 +
 3 files changed, 182 insertions(+)
 create mode 100644 webseite/classes/User.php
 create mode 100644 webseite/test.php

diff --git a/webseite/classes/User.php b/webseite/classes/User.php
new file mode 100644
index 0000000..dba2246
--- /dev/null
+++ b/webseite/classes/User.php
@@ -0,0 +1,172 @@
+<?php
+
+require_once("Util.php");
+
+/**
+ * Repräsentiert einen Nutzer inklusive aller Nutzerdaten
+ */
+class User
+{
+    /**
+     * @var string Pfad zum Verzeichnis der Nutzerdaten
+     */
+    private static string $userdataDirectory = "./users/";
+
+    /**
+     * @var string Dateiname der Benutzerdaten
+     */
+    private static string $userdataFile = "users.csv";
+
+    /**
+     * @var string Benutzername, darf A-Z, a-z, 0-9 sowie - und _ enthalten, max. 100 Zeichen
+     */
+    private string $username;
+
+    /**
+     * @var string Passwort, max. 100 Zeichen
+     */
+    private string $passwordHash;
+
+
+    /**
+     * Erstellt einen neuen Benutzer
+     * @param string $username Benutzername, darf A-Z, a-z, 0-9 sowie - und _ enthalten, max. 100 Zeichen
+     * @param string $password Passwort, max. 100 Zeichen
+     * @return User|false Den neu erstellten Benutzer oder false, wenn der Benutzer nicht erstellt werden konnte
+     */
+    public static function createUser(string $username, string $password): User|false
+    {
+        if(strlen($username) > 100) {
+            return false;
+        }
+        if(strlen($password) > 100) {
+            return false;
+        }
+
+        if (Util::containsIllegalCharacters($username)) {
+            return false;
+        }
+
+        $passwordHash = password_hash($password, PASSWORD_ARGON2I);
+
+        if(!is_dir(self::$userdataDirectory)) {
+            mkdir(self::$userdataDirectory);
+        }
+
+        $file = fopen(self::$userdataDirectory . self::$userdataFile, "a");
+        if (!$file) {
+            return false;
+        }
+
+        fputcsv($file, array($username, $passwordHash));
+        fclose($file);
+
+        return self::getFromUsername($username);
+    }
+
+    /**
+     * Gibt einen Benutzer anhand eines Benutzernamen zurück
+     * @param string $username Benutzername nach dem gesucht wird
+     * @return User|false Der gefundene Besucher oder false, wenn der Benutzer nicht gefunden wurde
+     */
+    public static function getFromUsername(string $username): User|false
+    {
+        if (!file_exists(self::$userdataDirectory . self::$userdataFile)) {
+            return false;
+        }
+
+        $file = fopen(self::$userdataDirectory . self::$userdataFile, "r");
+        if (!$file) {
+            return false;
+        }
+
+        while (($data = fgetcsv($file, 300)) !== false) {
+            if (count($data) != 2) {
+                continue;
+            }
+            if ($data[0] !== $username) {
+                continue;
+            }
+
+            $user = new User();
+            $user->username = $data[0];
+            $user->passwordHash = $data[1];
+            return $user;
+        }
+
+        fclose($file);
+
+        return false;
+    }
+
+    /**
+     * Meldet den Benutzer an, wenn das Passwort richtig ist
+     * @param string $password Passwort
+     * @return bool true, wenn erfolgreich, sonst false
+     */
+    public function login(string $password): bool
+    {
+        if(!password_verify($password, $this->passwordHash)) {
+            return false;
+        }
+
+        if($this->isLoggedIn()) {
+            return false;
+        }
+
+        $_SESSION["user"] = $this;
+        $_SESSION["login_time"] = time();
+
+        return true;
+    }
+
+    /**
+     * Prüft, ob ein Benutzer angemeldet ist
+     * @return bool true, wenn angemeldet, sonst false
+     */
+    public function isLoggedIn(): bool
+    {
+        if(!isset($_SESSION["user"])) {
+            return false;
+        }
+
+        if($_SESSION["user"] != $this) {
+            return false;
+        }
+
+        if(time() - $_SESSION["login_time"] > 86400 * 5) {
+            session_unset();
+            session_destroy();
+            return false;
+        }
+
+        $_SESSION["login_time"] = time();
+
+        return true;
+    }
+
+    /**
+     * Meldet den Benutzer ab
+     * @return bool true, wenn erfolgreich abgemeldet, false, wenn vorher schon abgemeldet
+     */
+    public function logout(): bool
+    {
+        if(!$this->isLoggedIn()) {
+            return false;
+        }
+
+        session_unset();
+        session_destroy();
+
+        return true;
+    }
+
+    /**
+     * Gibt den Benutzernamen zurück
+     * @return string Benutzername
+     */
+    public function getUsername(): string
+    {
+        return $this->username;
+    }
+}
\ No newline at end of file
diff --git a/webseite/classes/Util.php b/webseite/classes/Util.php
index e83349f..f118056 100644
--- a/webseite/classes/Util.php
+++ b/webseite/classes/Util.php
@@ -15,6 +15,15 @@ class Util
         return preg_replace("/[^a-zA-Z0-9_-]/", "", $string);
     }
 
+    static function containsIllegalCharacters(string $string): bool
+    {
+        if(preg_match("/[^a-zA-Z0-9_-]/", $string)) {
+            return true;
+        }
+
+        return false;
+    }
+
     static function readFileContent(string $filename): string|null
     {
         if (!file_exists($filename)) {
diff --git a/webseite/test.php b/webseite/test.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/webseite/test.php
@@ -0,0 +1 @@
+<?php

From 331adbcd5bae4e208bb3c11c22b810c5eaf4d6eb Mon Sep 17 00:00:00 2001
From: Matthias Grief <matthias.grief@alumni.fh-aachen.de>
Date: Mon, 2 Dec 2024 13:25:32 +0100
Subject: [PATCH 4/9] =?UTF-8?q?Passwortpr=C3=BCfung=20eingebaut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webseite/classes/User.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/webseite/classes/User.php b/webseite/classes/User.php
index dba2246..84278fe 100644
--- a/webseite/classes/User.php
+++ b/webseite/classes/User.php
@@ -99,6 +99,16 @@ class User
         return false;
     }
 
+    /**
+     * Prüft, ob ein Passwort für diesen Benutzer korrekt ist
+     * @param string $password Zu prüfendes Passwort
+     * @return bool true, wenn korrekt, sonst false
+     */
+    public function isPasswordCorrect(string $password): bool
+    {
+        return password_verify($password, $this->passwordHash);
+    }
+
     /**
      * Meldet den Benutzer an, wenn das Passwort richtig ist
      * @param string $password Passwort
@@ -106,7 +116,7 @@ class User
      */
     public function login(string $password): bool
     {
-        if(!password_verify($password, $this->passwordHash)) {
+        if(!$this->isPasswordCorrect($password)) {
             return false;
         }
 

From 50813b1a0d83774169fd10a5157a4cbe40131a8a Mon Sep 17 00:00:00 2001
From: Matthias Grief <matthias.grief@alumni.fh-aachen.de>
Date: Mon, 2 Dec 2024 13:54:15 +0100
Subject: [PATCH 5/9] =?UTF-8?q?L=C3=B6schen=20von=20User=20eingef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webseite/classes/User.php | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/webseite/classes/User.php b/webseite/classes/User.php
index 84278fe..0608b41 100644
--- a/webseite/classes/User.php
+++ b/webseite/classes/User.php
@@ -99,6 +99,51 @@ class User
         return false;
     }
 
+    /**
+     * Löscht einen Benutzer
+     * @param string $password Richtiges Passwort zu diesem Nutzer
+     * @return bool true, wenn erfolgreich gelöscht, sonst false
+     */
+    public function delete(string $password): bool
+    {
+        if(!$this->isPasswordCorrect($password)) {
+            return false;
+        }
+
+        if(!$this->logout()) {
+            return false;
+        }
+
+        $file = fopen(self::$userdataDirectory . self::$userdataFile, "r");
+        if(!$file) {
+            return false;
+        }
+
+        $newCsv = array();
+
+        while (($data = fgetcsv($file, 300)) !== false) {
+            if (count($data) != 2) {
+                continue;
+            }
+            if ($data[0] !== $this->username) {
+                $newCsv[] = $data;
+            }
+        }
+        fclose($file);
+
+        $file = fopen(self::$userdataDirectory . self::$userdataFile, "w");
+        if(!$file) {
+            return false;
+        }
+
+        foreach ($newCsv as $newCsvData) {
+            fputcsv($file, $newCsvData);
+        }
+        fclose($file);
+
+        return true;
+    }
+
     /**
      * Prüft, ob ein Passwort für diesen Benutzer korrekt ist
      * @param string $password Zu prüfendes Passwort

From 82cea98aa0db383d65fcc63fb34315cf79a31570 Mon Sep 17 00:00:00 2001
From: Matthias Grief <matthias.grief@alumni.fh-aachen.de>
Date: Mon, 2 Dec 2024 14:58:07 +0100
Subject: [PATCH 6/9] =?UTF-8?q?Passwort=20=C3=A4ndern=20eingef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webseite/classes/User.php | 54 +++++++++++++++++++++++++++++++++++++--
 webseite/test.php         |  1 -
 webseite/users/users.csv  |  1 +
 3 files changed, 53 insertions(+), 3 deletions(-)
 delete mode 100644 webseite/test.php
 create mode 100644 webseite/users/users.csv

diff --git a/webseite/classes/User.php b/webseite/classes/User.php
index 0608b41..fecff9d 100644
--- a/webseite/classes/User.php
+++ b/webseite/classes/User.php
@@ -36,6 +36,10 @@ class User
      */
     public static function createUser(string $username, string $password): User|false
     {
+        if(self::getFromUsername($username) !== false) {
+            return false;
+        }
+
         if(strlen($username) > 100) {
             return false;
         }
@@ -141,6 +145,54 @@ class User
         }
         fclose($file);
 
+        unset($this->username);
+        unset($this->passwordHash);
+
+        return true;
+    }
+
+    /**
+     * Ändert das Passwort des Accounts
+     * @param string $oldPassword altes Passwort
+     * @param string $newPassword Neues Passwort
+     * @return bool true, wenn erfolgreich geändert, sonst false
+     */
+    public function changePassword(string $oldPassword, string $newPassword): bool
+    {
+        if(!$this->isPasswordCorrect($oldPassword)) {
+            return false;
+        }
+
+        if(!$this->logout()) {
+            return false;
+        }
+
+        $file = fopen(self::$userdataDirectory . self::$userdataFile, "c+");
+        if(!$file) {
+            return false;
+        }
+
+        $this->passwordHash = password_hash($newPassword, PASSWORD_ARGON2I);
+
+        $lastLine = ftell($file);
+        while (($data = fgetcsv($file, 300)) !== false) {
+            if (count($data) != 2) {
+
+            } else if ($data[0] !== $this->username) {
+
+            } else {
+                $data[1] = $this->passwordHash;
+
+                fseek($file, $lastLine);
+
+                fputcsv($file, $data);
+                break;
+            }
+
+            $lastLine = ftell($file);
+        }
+        fclose($file);
+
         return true;
     }
 
@@ -191,7 +243,6 @@ class User
 
         if(time() - $_SESSION["login_time"] > 86400 * 5) {
             session_unset();
-            session_destroy();
             return false;
         }
 
@@ -211,7 +262,6 @@ class User
         }
 
         session_unset();
-        session_destroy();
 
         return true;
     }
diff --git a/webseite/test.php b/webseite/test.php
deleted file mode 100644
index b3d9bbc..0000000
--- a/webseite/test.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php
diff --git a/webseite/users/users.csv b/webseite/users/users.csv
new file mode 100644
index 0000000..761cc89
--- /dev/null
+++ b/webseite/users/users.csv
@@ -0,0 +1 @@
+admin,"$argon2i$v=19$m=65536,t=4,p=1$Wi9oVlZ2UjFFVUFTVDBYbg$fgYAK05urgS2+38wFPa9k1oO27O5B/J0CSWB7mUCYGU"

From 30823863f097015c929c3ebdd31bfe6b1436f7fe Mon Sep 17 00:00:00 2001
From: Matthias Grief <matthias.grief@alumni.fh-aachen.de>
Date: Mon, 2 Dec 2024 15:14:18 +0100
Subject: [PATCH 7/9] Dokumentation angepasst

---
 webseite/classes/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webseite/classes/User.php b/webseite/classes/User.php
index fecff9d..11ca1c7 100644
--- a/webseite/classes/User.php
+++ b/webseite/classes/User.php
@@ -23,7 +23,7 @@ class User
     private string $username;
 
     /**
-     * @var string Passwort, max. 100 Zeichen
+     * @var string Passworthash
      */
     private string $passwordHash;
 

From 953c2a21927e6bd08fd50a81df7c3af72e4e4e05 Mon Sep 17 00:00:00 2001
From: Safak <safak.hazinedar@startmail.com>
Date: Tue, 3 Dec 2024 17:06:02 +0100
Subject: [PATCH 8/9] =?UTF-8?q?Funktionsf=C3=A4higes=20Login=20/=20Logout?=
 =?UTF-8?q?=20=C3=BCber=20index.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fputcsv und fgetcsv mit ',', '"', '\\' ergänzt wegen neuer PHP version
---
 webseite/classes/User.php |  12 ++---
 webseite/index.php        | 109 +++++++++++++++++++++++++++++---------
 webseite/login.php        |  40 ++++++--------
 webseite/logout.php       |  22 ++++++++
 webseite/users/users.csv  |   3 +-
 5 files changed, 130 insertions(+), 56 deletions(-)
 create mode 100644 webseite/logout.php

diff --git a/webseite/classes/User.php b/webseite/classes/User.php
index 11ca1c7..308375d 100644
--- a/webseite/classes/User.php
+++ b/webseite/classes/User.php
@@ -62,7 +62,7 @@ class User
             return false;
         }
 
-        fputcsv($file, array($username, $passwordHash));
+        fputcsv($file, array($username, $passwordHash),",", '"', "\\");
         fclose($file);
 
         return self::getFromUsername($username);
@@ -84,7 +84,7 @@ class User
             return false;
         }
 
-        while (($data = fgetcsv($file, 300)) !== false) {
+        while (($data = fgetcsv($file, 300, ',', '"', '\\')) !== false) {
             if (count($data) != 2) {
                 continue;
             }
@@ -125,7 +125,7 @@ class User
 
         $newCsv = array();
 
-        while (($data = fgetcsv($file, 300)) !== false) {
+        while (($data = fgetcsv($file, 300, ',', '"', '\\')) !== false) {
             if (count($data) != 2) {
                 continue;
             }
@@ -141,7 +141,7 @@ class User
         }
 
         foreach ($newCsv as $newCsvData) {
-            fputcsv($file, $newCsvData);
+            fputcsv($file, $newCsvData, ',', '"', '\\');
         }
         fclose($file);
 
@@ -175,7 +175,7 @@ class User
         $this->passwordHash = password_hash($newPassword, PASSWORD_ARGON2I);
 
         $lastLine = ftell($file);
-        while (($data = fgetcsv($file, 300)) !== false) {
+        while (($data = fgetcsv($file, 300, ',', '"', '\\')) !== false) {
             if (count($data) != 2) {
 
             } else if ($data[0] !== $this->username) {
@@ -185,7 +185,7 @@ class User
 
                 fseek($file, $lastLine);
 
-                fputcsv($file, $data);
+                fputcsv($file, $data, ',', '"', '\\');
                 break;
             }
 
diff --git a/webseite/index.php b/webseite/index.php
index fa7126a..cfaad80 100644
--- a/webseite/index.php
+++ b/webseite/index.php
@@ -29,30 +29,63 @@
                 <img src="assets/images/hsgg-logo.png" alt="HSGG Logo" class="h-10 mr-3">
                 <span class="text-2xl font-bold text-[var(--primary-color)]">HSGG</span>
             </a>
-            <!-- Login Button -->
-            <button id="loginButton">Login</button>
+
+            <!-- Login/Logout Button -->
+            <div class="flex items-center space-x-4">
+                <?php
+                require_once("classes/User.php");
+                session_start();
+                if (isset($_SESSION['user']) && $_SESSION['user']->isLoggedIn()) {
+                    // Logout Button
+                    echo '<form id="logoutForm" action="logout.php" method="POST" style="display:inline;">
+                              <button id="logoutButton" type="submit" class="bg-[var(--primary-color)] text-white px-4 py-2 rounded-lg hover:bg-[var(--accent-color)] transition duration-300">Logout</button>
+                          </form>';
+                    // Username Dropdown - Weitere Funktionen implementierbar
+                    echo '<div class="relative">
+                              <button id="userDropdownButton" class="bg-[var(--primary-color)] text-white px-4 py-2 rounded-lg hover:bg-[var(--accent-color)] transition duration-300">' . htmlspecialchars($_SESSION['user']->getUsername()) . '</button>
+                          </div>';
+                } else {
+                    // Login Button
+                    echo '<button id="loginButton" class="bg-[var(--primary-color)] text-white px-4 py-2 rounded-lg hover:bg-[var(--accent-color)] transition duration-300">Login</button>';
+                }
+                ?>
+            </div>
         </div>
     </div>
 </nav>
 
-<!-- Login Popup -->
-<div id="loginPopup" class="hidden fixed inset-0 bg-black/50 flex items-center justify-center z-50">
-    <div class="bg-white p-8 rounded-lg shadow-lg w-full max-w-sm relative">
-        <button id="closePopupButton" class="absolute top-2 right-2 text-gray-500 text-xl">&times;</button>
-        <h2 class="text-2xl font-bold mb-6 text-center">Login</h2>
-        <form id="loginForm" action="login.php" method="POST">
-            <div class="mb-4">
-                <label for="username" class="block text-gray-700 mb-2">Benutzername:</label>
-                <input type="text" id="username" name="username" class="w-full p-2 border rounded-lg" required>
-            </div>
-            <div class="mb-4">
-                <label for="password" class="block text-gray-700 mb-2">Passwort:</label>
-                <input type="password" id="password" name="password" class="w-full p-2 border rounded-lg" required>
-            </div>
-            <button type="submit" class="w-full bg-[var(--primary-color)] text-white px-4 py-2 rounded-lg hover:bg-[var(--accent-color)] transition duration-300">Login</button>
-        </form>
+<!-- Login Popup | erscheint nur, wenn kein Nutzer eingeloggt ist -->
+<?php
+if (!isset($_SESSION['user']) || !$_SESSION['user']->isLoggedIn()) {
+    ?>
+    <div id="loginPopup" class="hidden fixed inset-0 bg-black/50 flex items-center justify-center z-50" role="dialog"
+         aria-labelledby="loginTitle" aria-hidden="true">
+        <div class="bg-white p-8 rounded-lg shadow-lg w-full max-w-sm relative">
+            <button id="closePopupButton" class="absolute top-2 right-2 text-gray-500 text-xl"
+                    aria-label="Close Login Popup">&times;
+            </button>
+            <h2 id="loginTitle" class="text-2xl font-bold mb-6 text-center">Login</h2>
+            <form id="loginForm" action="login.php" method="POST">
+                <div class="mb-4">
+                    <label for="username" class="block text-gray-700 mb-2">Benutzername:</label>
+                    <input type="text" id="username" name="username" class="w-full p-2 border rounded-lg" required
+                           autofocus>
+                </div>
+                <div class="mb-4">
+                    <label for="password" class="block text-gray-700 mb-2">Passwort:</label>
+                    <input type="password" id="password" name="password" class="w-full p-2 border rounded-lg" required>
+                </div>
+                <button type="submit"
+                        class="w-full bg-[var(--primary-color)] text-white px-4 py-2 rounded-lg hover:bg-[var(--accent-color)] transition duration-300">
+                    Login
+                </button>
+            </form>
+            <div id="errorMessage" class="hidden text-red-500 text-center mt-4">Falscher Benutzername oder Passwort</div>
+        </div>
     </div>
-</div>
+    <?php
+}
+?>
 
 <!-- Hero Section -->
 <div class="hidden md:block pt-24 px-4">
@@ -123,19 +156,43 @@
 
 <script>
     // JavaScript to handle opening and closing of the login popup
-    document.getElementById('loginButton').addEventListener('click', function() {
-        document.getElementById('loginPopup').classList.remove('hidden');
+    const loginButton = document.getElementById('loginButton');
+    const loginPopup = document.getElementById('loginPopup');
+    const closePopupButton = document.getElementById('closePopupButton');
+    const usernameInput = document.getElementById('username');
+    const errorMessage = document.getElementById('errorMessage');
+
+    loginButton.addEventListener('click', function () {
+        loginPopup.classList.remove('hidden');
+        usernameInput.focus(); // Set focus to username field
     });
 
-    document.getElementById('closePopupButton').addEventListener('click', function() {
-        document.getElementById('loginPopup').classList.add('hidden');
+    closePopupButton.addEventListener('click', function () {
+        loginPopup.classList.add('hidden');
     });
 
-    window.addEventListener('click', function(event) {
-        if (event.target === document.getElementById('loginPopup')) {
-            document.getElementById('loginPopup').classList.add('hidden');
+    window.addEventListener('click', function (event) {
+        if (event.target === loginPopup) {
+            loginPopup.classList.add('hidden');
         }
     });
+
+    // Schließe Popup mit ESC
+    document.addEventListener('keydown', function (event) {
+        if (event.key === "Escape" && !loginPopup.classList.contains('hidden')) {
+            loginPopup.classList.add('hidden');
+        }
+    });
+
+    // Zeige Fehlermeldung beim Login an
+    window.addEventListener('DOMContentLoaded', (event) => {
+        const urlParams = new URLSearchParams(window.location.search);
+        if (urlParams.has('error') && urlParams.get('error') === '1') {
+            loginPopup.classList.remove('hidden');
+            errorMessage.classList.remove('hidden');
+        }
+    });
+
 </script>
 
 </body>
diff --git a/webseite/login.php b/webseite/login.php
index 5308f58..b1f8cf2 100644
--- a/webseite/login.php
+++ b/webseite/login.php
@@ -1,30 +1,24 @@
 <?php
+require_once("classes/User.php");
 
-// Mock credentials for the login
-$validUsername = 'admin';
-$validPassword = 'password';
+session_start();
 
-// Check if the form was submitted
-if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-    // Get the submitted username and password
-    $username = isset($_POST['username']) ? $_POST['username'] : '';
-    $password = isset($_POST['password']) ? $_POST['password'] : '';
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+    $username = $_POST['username'];
+    $password = $_POST['password'];
+
+    // $testuser = User::createUser("MAX", "password");
+
+    // Try to retrieve the user from the username
+    $user = User::getFromUsername($username);
+
+    if ($user->login($password)) {
+        // Redirect to a protected page if login is successful
+        header("Location: index.php?login=success");
 
-    // Validate credentials
-    if ($username === $validUsername && $password === $validPassword) {
-        echo "Login erfolgreich";
-        // Redirect to dashboard or any other page
-        header("Location: index.php");
-        exit;
     } else {
-        // Set an error message in the session to show on the login page
-        $_SESSION['errorMessage'] = "Login fehlgeschlagen: Falscher Benutzername oder Passwort.";
-        header("Location: index.php");
-        exit;
+        // Redirect back to the login page with an error message
+        header("Location: index.php?error=1");
     }
-} else {
-    echo "Bitte benutzen Sie das Login-Formular.";
 }
-
-
-?>
+?>
\ No newline at end of file
diff --git a/webseite/logout.php b/webseite/logout.php
new file mode 100644
index 0000000..b588fae
--- /dev/null
+++ b/webseite/logout.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once("classes/User.php");
+session_start();
+
+if (isset($_SESSION['user']) && $_SESSION['user'] instanceof User) {
+    $user = $_SESSION['user'];
+    if ($user->logout()) {
+        // Logout successful, redirect to homepage
+        header("Location: index.php");
+        exit();
+    } else {
+        // Logout failed, handle error
+        echo "<script>alert('Logout failed. Please try again.'); window.location.href='index.php';</script>";
+    }
+} else {
+    // No user is logged in, redirect to homepage
+    header("Location: index.php");
+    exit();
+}
+
+?>
diff --git a/webseite/users/users.csv b/webseite/users/users.csv
index 761cc89..6c80327 100644
--- a/webseite/users/users.csv
+++ b/webseite/users/users.csv
@@ -1 +1,2 @@
-admin,"$argon2i$v=19$m=65536,t=4,p=1$Wi9oVlZ2UjFFVUFTVDBYbg$fgYAK05urgS2+38wFPa9k1oO27O5B/J0CSWB7mUCYGU"
+admin,"$argon2i$v=19$m=65536,t=4,p=1$UVN1S1loTmxVSEdqTjVFcQ$J2sL51VLx7Deg7xJRnbrKfIVqGduh+nrGOFGFGSZ4vw"
+MAX,"$argon2i$v=19$m=65536,t=4,p=1$UVN1S1loTmxVSEdqTjVFcQ$J2sL51VLx7Deg7xJRnbrKfIVqGduh+nrGOFGFGSZ4vw"

From 7b78b4865f43cc58b1d2207df2b73777f1c412c7 Mon Sep 17 00:00:00 2001
From: Safak <safak.hazinedar@startmail.com>
Date: Tue, 3 Dec 2024 17:14:43 +0100
Subject: [PATCH 9/9] =?UTF-8?q?Bugfix=20pr=C3=BCfen,=20ob=20$user=20!=3D?=
 =?UTF-8?q?=20false=20in=20login.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webseite/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webseite/login.php b/webseite/login.php
index b1f8cf2..666a787 100644
--- a/webseite/login.php
+++ b/webseite/login.php
@@ -12,7 +12,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
     // Try to retrieve the user from the username
     $user = User::getFromUsername($username);
 
-    if ($user->login($password)) {
+    if ($user && $user->login($password)) {
         // Redirect to a protected page if login is successful
         header("Location: index.php?login=success");