Design Anpassung der search in navbar

search function implementiert, search controller entsprechend angepasst und die results seite angepasst

.idea/php.xml

@@ -10,9 +10,7 @@
     <option name="highlightLevel" value="WARNING" />
     <option name="transferred" value="true" />
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.0">
-    <option name="suggestChangeDefaultLanguageLevel" value="false" />
-  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.5" />
   <component name="PhpStanOptionsConfiguration">
     <option name="transferred" value="true" />
   </component>

content/createArticle.php

@@ -1,5 +1,9 @@
 <?php
-session_start();
+$user = $user ?? null;
+if (!isset($_SESSION["user"])) {
+    header("Location: index.php?pfad=login");
+    exit();
+}
 ?>
 <!--
     Seite: Beitrag erstellen

content/deleteAccount.php

@@ -0,0 +1,19 @@
+<?php
+require_once "php/model/LocalUserDAO.php";
+
+$dao = new LocalUserDAO();
+
+/*
+    Deregistrierung
+    Funktion: Entfernt User aus Dummy-Daten und beendet Session
+*/
+
+if (isset($_SESSION["user_email"])) {
+    $dao->deleteUser($_SESSION["user_email"]);
+}
+
+$_SESSION = [];
+session_destroy();
+
+header("Location: index.php");
+exit();

content/login.php

@@ -1,32 +1,53 @@
+<?php
+$error = $error ?? null;
+?>
+
 <!--
     Form: Login-Bereich
     Funktion: Benutzerauthentifizierung und Zugang zum eigenen Profil, Erstellen von Beiträgen, etc.
 -->
 <main class="login-page">
     <div class="login-container">
-        
+
         <h1>Bitte anmelden</h1>
 
-        <form>
-            <label id ="inputEmail" class="screenreader-only">E-Mail Adresse / </label>
+        <?php if ($error): ?>
+            <p style="color:red;">
+                <?php echo htmlspecialchars($error); ?>
+            </p>
+        <?php endif; ?>
+
+        <form method="post" action="index.php?pfad=login">
 
             <p class="input-label">Benutzername/E-Mail-Adresse:</p>
-            <input type="email" name="email" class="login-input" placeholder="E-Mail-Adresse" required autofocus>
+            <input type="email"
+                   name="email"
+                   class="login-input"
+                   placeholder="E-Mail-Adresse"
+                   required
+                   autofocus>
 
             <p class="input-label">Passwort:</p>
-            <input type="password" name="password" class="login-input" placeholder="Passwort" required>
+            <input type="password"
+                   name="password"
+                   class="login-input"
+                   placeholder="Passwort"
+                   required>
 
-            <div class="checkbox-wrapper">
-                <label>
-                    <input type="checkbox" name="remember-me" value="1"> angemeldet bleiben
-                </label>
-            </div>
-
-            <button type="submit" value="anmelden" name="loginSubmit" class="login-button">anmelden</button>
+            <button type="submit"
+                    value="anmelden"
+                    name="loginSubmit"
+                    class="login-button">
+                anmelden
+            </button>
 
             <div class="register-link">
-                <a href="register.php">Noch keinen Account? Jetzt hier registrieren!</a>
+                <a href="index.php?pfad=register">
+                    Noch keinen Account? Jetzt hier registrieren!
+                </a>
             </div>
+
         </form>
+
     </div>
 </main>

content/logout.php

@@ -0,0 +1,6 @@
+<?php
+$_SESSION = [];
+session_destroy();
+
+header("Location: index.php");
+exit();

content/profile.php

@@ -1,42 +1,47 @@
+<?php
+include_once 'php/controller/profile-controller.php';
+$user = $user ?? null;
+?>
+
 <!--
     Content: Profil
     Inhalt: Das eigene Profil, wenn man angemeldet ist. Dort hat man die Möglichkeit seine Angaben zu ändern.
 -->
-<?php
-include_once 'php/controller/profileArticles-controller.php';
-?>
+
 <main class="form-page">
     <div class="flexbox">
         <!-- Linke Spalte: Profildaten -->
         <div class="container">
             <form>
-                <label class="input-label">Vorname</label>
-                <input type="text" name="Vorname" class="login-input" required
-                       placeholder="Vorname"
-                       value="<?php //DB-Daten ?>">
-
-                <label class="input-label">Nachname</label>
-                <input type="text" name="Nachname" class="login-input" required
-                       placeholder="Nachname"
-                       value="<?php //DB-Daten ?>">
+                <label class="input-label">Name</label>
+                <input type="text"
+                       class="login-input"
+                       readonly
+                       value="<?php echo htmlspecialchars($user["username"] ?? ""); ?>">
 
                 <label class="input-label">Email-Adresse</label>
-                <input type="email" name="Email" class="login-input" required
-                       placeholder="mustermann@web.de"
-                       value="<?php //DB-Daten ?>">
+                <input type="email"
+                       class="login-input"
+                       readonly
+                       value="<?php echo htmlspecialchars($user["email"] ?? ""); ?>">
 
                 <label class="input-label">Passwort</label>
-                <input type="password" name="Passwort" class="login-input"
-                       required placeholder="Passwort">
-
-                <button type="submit" class="login-button">
-                    Speichern
-                </button>
-
-                <button type="button" class="login-button delete-account-button">
-                    Account löschen
-                </button>
+                <input type="password"
+                       class="login-input"
+                       readonly
+                       value="********">
             </form>
+            <br>
+
+            <a href="index.php?pfad=deleteAccount" class="login-button">
+                Account löschen
+            </a>
+
+            <br><br>
+
+            <a href="index.php?pfad=logout" class="login-button">
+                Abmelden
+            </a>
         </div>
 
         <!-- Rechte Spalte: Eigene Beiträge -->

content/register.php

@@ -1,3 +1,9 @@
+<?php
+include_once 'php/controller/register-controller.php';
+
+$error = $error ?? null;
+?>
+
 <!--
     Form: Registrierung
     Funktion: Erstellung neuer Benutzerkonten
@@ -7,26 +13,50 @@
 
         <h1>Jetzt Registrieren!</h1>
 
-        <form>
+        <?php if ($error): ?>
+            <p style="color:red;">
+                <?php echo htmlspecialchars($error); ?>
+            </p>
+        <?php endif; ?>
+
+        <form method="post" action="index.php?pfad=register">
+
             <p class="input-label">Email:</p>
-            <input type="email" name="email" class="login-input" placeholder="mustermann@web.de" required>
+            <input type="email"
+                   name="email"
+                   class="login-input"
+                   placeholder="mustermann@web.de"
+                   required>
 
             <p class="input-label">Vorname:</p>
-            <input type="text" name="vorname" class="login-input" placeholder="Max" required>
+            <input type="text"
+                   name="vorname"
+                   class="login-input"
+                   placeholder="Max"
+                   required>
 
             <p class="input-label">Nachname:</p>
-            <input type="text" name="nachname" class="login-input" placeholder="Mustermann" required>
+            <input type="text"
+                   name="nachname"
+                   class="login-input"
+                   placeholder="Mustermann"
+                   required>
 
             <p class="input-label">Passwort:</p>
-            <input type="password" name="password" class="login-input" placeholder="Passwort" required>
+            <input type="password"
+                   name="password"
+                   class="login-input"
+                   placeholder="Passwort"
+                   required>
 
-            <div class="checkbox-wrapper">
-                <label>
-                    <input type="checkbox" value="remember-me"> angemeldet bleiben
-                </label>
-            </div>
+            <button type="submit"
+                    value="register"
+                    name="registerSubmit"
+                    class="login-button">
+                kostenlos registrieren
+            </button>
 
-            <button type="submit" value="anmelden" name="loginSubmit" class="login-button">kostenlos registrieren</button>
         </form>
+
     </div>
 </main>

content/search-results.php

@@ -1,5 +1,10 @@
 <?php
 session_start();
+ 
+$results = $_SESSION["search_results"] ?? [];
+$query = $_SESSION["search_query"] ?? "";
+$resultCount = count($results);
+
 ?>
 <!--
     Seite: Suchergebnisse
@@ -10,37 +15,40 @@ session_start();
     <!-- Links: Seitenleiste für Filter und Suche -->
     <aside class="s-res-sidebar">
 
-        <!-- Suchleiste Box -->
-        <div class="s-res-sidebar-box">
-            <h3 class="s-res-sidebar-title">Suche anpassen</h3>
-            <form action="#" method="GET" class="s-res-search-form">
-                <input type="search" id="site-search" name="q" placeholder="Suchen..." class="nav__search">
+        <!-- Sortierfuntion Box und Such Box-->
+         <form action="php/controller/search-results-controller.php" method="GET" class="s-res-sidebar-form">
+    
+            <div class="s-res-sidebar-box">
+                <h3 class="s-res-sidebar-title">Suche anpassen</h3>
+                <input type="search" id="site-search" name="q" placeholder="Suchen..." class="nav__search" value="<?php echo htmlspecialchars($query); ?>" maxlength="50" required>
                 <button type="submit" class="nav__search-button">Suchen</button>
-            </form>
-        </div>
-
-        <!-- Sortierfuntion Box -->
-        <div class="s-res-sidebar-box">
-            <h3 class="s-res-sidebar-title">Sortierung</h3>
-            <div class="s-res-filter-group">
-                <label class="s-res-filter-option">
-                    <input type="radio" name="sort" value="alphabet" checked>
-                    <span>Alphabetisch</span>
-                </label>
-                <label class="s-res-filter-option">
-                    <input type="radio" name="sort" value="likes">
-                    <span>Beliebtheit (Likes)</span>
-                </label>
-                <label class="s-res-filter-option">
-                    <input type="radio" name="sort" value="newest">
-                    <span>Neueste Beiträge</span>
-                </label>
-                <label class="s-res-filter-option">
-                    <input type="radio" name="sort" value="oldest">
-                    <span>Älteste Beiträge</span>
-                </label>
             </div>
-        </div>
+
+            <div class="s-res-sidebar-box">
+                <h3 class="s-res-sidebar-title">Sortierung</h3>
+                <?php $currentSort = $_SESSION['search_sort'] ?? 'alphabet'; ?>
+                <div class="s-res-filter-group">
+                    <label class="s-res-filter-option">
+                        <input type="radio" name="sort" value="alphabet" <?php echo $currentSort === 'alphabet' ? 'checked' : ''; ?> onchange="this.form.submit()">
+                        <span>Alphabetisch</span>
+                    </label>
+                    <!-- Noch disabled, da likes noch nicht implementiert-->
+                    <label class="s-res-filter-option">
+                        <input type="radio" name="sort" value="likes" <?php echo $currentSort === 'likes' ? 'checked' : ''; ?> disabled>
+                        <span style="color: #94a3b8;">Beliebtheit (Likes)</span>
+                    </label>
+                    <label class="s-res-filter-option">
+                        <input type="radio" name="sort" value="newest" <?php echo $currentSort === 'newest' ? 'checked' : ''; ?> onchange="this.form.submit()">
+                        <span>Neueste Beiträge</span>
+                    </label>
+                    <label class="s-res-filter-option">
+                        <input type="radio" name="sort" value="oldest" <?php echo $currentSort === 'oldest' ? 'checked' : ''; ?> onchange="this.form.submit()">
+                        <span>Älteste Beiträge</span>
+                    </label>
+                </div>
+            </div>
+
+        </form>
 
     </aside>
 
@@ -48,57 +56,40 @@ session_start();
 
         <div class="s-res-header">
             <h1 class="s-res-main-title">Suchergebnisse</h1>
-            <p class="s-res-meta">3 Treffer für Ihre Suchanfrage</p>
+            <p class="s-res-meta"><?php echo $resultCount; ?> Treffer für Ihre Suchanfrage "<?php echo htmlspecialchars($query); ?>"</p>
         </div>
 
         <!-- Ergebnisliste -->
         <div class="s-res-list">
+            <?php 
+            if (!empty($results)): ?>
+    
+                <?php foreach ($results as $item): ?>
+                    <div class="s-res-item">
+                        <div class="s-res-content">
+                            <h2 class="s-res-item-title">
+                                <a href="index.php?pfad=showArticle&id=<?php echo $item['id']; ?>" class="s-res-link">
+                                    <?php echo htmlspecialchars($item['title']); ?>
+                                </a>
+                            </h2>
+                            <p class="s-res-author">Von: <span class="s-res-author-name"><?php echo htmlspecialchars($item['author']); ?></span></p>
+                        </div>
+                        <div class="s-res-arrow">&rarr;</div>
+                    </div>
+                <?php endforeach; ?>
 
-            <?php
-            if(isset($_SESSION['message']) && $_SESSION['message'] == "new_search_results"): ?>
-            <!-- TODO: Hier die Beiträge ausgeben. -->
-            <?php elseif (isset($_SESSION["message"]) && $_SESSION["message"] == "missing_parameters"): ?>
-            <p>
-                Bitte überprüfe deine Sucheingabe und versuche es erneut!
-            </p>
+            <?php 
+            elseif (isset($_SESSION["search_query"]) && $_SESSION["search_query"] !== "" && $resultCount === 0): ?>
+                <p>Keine Beiträge zu diesem Suchbegriff gefunden.</p>  
+            <?php 
+            elseif (isset($_SESSION["message"]) && $_SESSION["message"] == "missing_parameters"): ?>
+                <p>Bitte überprüfe deine Sucheingabe und versuche es erneut!</p>
+                
             <?php endif; ?>
             <?php
             unset($_SESSION["message"]);
             ?>
 
-            <!-- Beispielbeitrag -->
-            <div class="s-res-item">
-                <div class="s-res-content">
-                    <h2 class="s-res-item-title">
-                        <a href="#" class="s-res-link">Pythagoras</a>
-                    </h2>
-                    <p class="s-res-author">Von: <span class="s-res-author-name">Max Mustermann</span></p>
-                </div>
-                <div class="s-res-arrow">&rarr;</div>
-            </div>
-
-            <!-- Beispielbeitrag -->
-            <div class="s-res-item">
-                <div class="s-res-content">
-                    <h2 class="s-res-item-title">
-                        <a href="#" class="s-res-link">Pythagoras</a>
-                    </h2>
-                    <p class="s-res-author">Von: <span class="s-res-author-name">Max Mustermann</span></p>
-                </div>
-                <div class="s-res-arrow">&rarr;</div>
-            </div>
-
-            <!-- Beispielbeitrag -->
-            <div class="s-res-item">
-                <div class="s-res-content">
-                    <h2 class="s-res-item-title">
-                        <a href="#" class="s-res-link">Pythagoras</a>
-                    </h2>
-                    <p class="s-res-author">Von: <span class="s-res-author-name">Max Mustermann</span></p>
-                </div>
-                <div class="s-res-arrow">&rarr;</div>
-            </div>
-
         </div>
         <div class="s-res-pagination-footer">
 

content/updateArticle.php

@@ -1,4 +1,9 @@
 <?php
+$user = $user ?? null;
+if (!isset($_SESSION["user"])) {
+    header("Location: index.php?pfad=login");
+    exit();
+}
 include_once 'php/controller/showArticle-controller.php';
 ?>
 <!--

css/navbar.css

@@ -152,7 +152,7 @@ CSS für die navbar
 }
 
 /* Responsive Anpassungen unter 760px (für z.B. Smartphones) */
-@media (max-width: 760px) {
+@media (max-width: 800px) {
     .nav {
         flex-direction: row;
         flex-wrap: wrap;

data/users.json

@@ -0,0 +1 @@
+[]

includes/navbar.php

@@ -1,27 +1,41 @@
+<?php
+session_start();
+?>
+
 <!--
 Globales Menü, wird via PHP später in alle Seiten eingebunden
 -->
 <nav class="nav">
     <div class="nav__left">
         <a href="index.php" class="nav__logo">
-	        <img src="images/logos/logo_full.png" alt="Logo">
-	    </a>
+            <img src="images/logos/logo_full.png" alt="Logo">
+        </a>
     </div>
 
     <!-- Mobile navbar mit Burger-Symbol -->
     <input type="checkbox" id="nav-toggle" class="nav__checkbox">
     <label for="nav-toggle" id="mobile-nav">
-        <span>☰</span> <!-- Burger Icon Symbol -->
+        <span>☰</span>
     </label>
 
     <ul id="mobile-nav" class="nav__mobile-menu">
         <li>
             <label for="nav-toggle" class="nav__close-btn">&times;</label>
         </li>
-        <li><a href="index.php?pfad=profile">Profil</a></li>
-        <li><a href="index.php?pfad=login">Anmelden</a></li>
-        <li><a href="index.php?pfad=register">Registrieren</a></li>
-        <li><a href="index.php?pfad=createArticle">Beitrag erstellen</a></li>
+
+        <?php if (isset($_SESSION['user'])): ?>
+
+            <li><a href="index.php?pfad=profile">Profil</a></li>
+            <li><a href="index.php?pfad=logout">Abmelden</a></li>
+            <li><a href="index.php?pfad=createArticle">Beitrag erstellen</a></li>
+
+        <?php else: ?>
+
+            <li><a href="index.php?pfad=login">Anmelden</a></li>
+            <li><a href="index.php?pfad=register">Registrieren</a></li>
+
+        <?php endif; ?>
+
         <li>
             <label class="nav__mobile-label">Sprachen</label>
             <ul class="nav__mobile-submenu">
@@ -39,7 +53,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
                 <li><a href="index.php?pfad=mathe">Mathematik</a></li>
                 <li><a href="index.php?pfad=biologie">Biologie</a></li>
                 <li><a href="index.php?pfad=chemie">Chemie</a></li>
-                <li><a href="index.php?pfad=englisch">Physik</a></li>
+                <li><a href="index.php?pfad=physik">Physik</a></li>
                 <li><a href="index.php?pfad=informatik">Informatik</a></li>
                 <li><a href="index.php?pfad=astronomie">Astronomie</a></li>
             </ul>
@@ -85,6 +99,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
                 <a href="index.php?pfad=literatur">Literatur</a>
             </div>
         </div>
+
         <div class="nav__item nav__dropdown">
             <button class="nav__dropdown-toggle">MINT</button>
             <div class="nav__dropdown-menu">
@@ -96,6 +111,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
                 <a href="index.php?pfad=astronomie">Astronomie</a>
             </div>
         </div>
+
         <div class="nav__item nav__dropdown">
             <button class="nav__dropdown-toggle">Gesellschaft & Werte</button>
             <div class="nav__dropdown-menu">
@@ -112,6 +128,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
                 <a href="index.php?pfad=theater">Theater</a>
             </div>
         </div>
+
         <div class="nav__item nav__dropdown">
             <button class="nav__dropdown-toggle">Technik & Praxis</button>
             <div class="nav__dropdown-menu">
@@ -124,14 +141,40 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
     </div>
 
     <div class="nav__right">
-        <a href="index.php?pfad=profile" class="nav_item nav__link">Profil</a>
-        <div class="nav__search">
-        <?php
-            include_once 'search.php';
-        ?>
-        </div>
-	    <a href="index.php?pfad=login" class="nav__item nav__button">Anmelden</a>
-	    <a href="index.php?pfad=register" class="nav__item nav__button">Registrieren</a>
-        <a href="index.php?pfad=createArticle" class="nav__item nav__button">Beitrag erstellen</a>
+
+        <?php if (isset($_SESSION['user'])): ?>
+
+            <a href="index.php?pfad=profile" class="nav__item nav__link">
+                Profil
+            </a>
+
+            <div class="nav__search">
+                <?php include_once 'search.php'; ?>
+            </div>
+
+            <a href="index.php?pfad=createArticle" class="nav__item nav__button">
+                Beitrag erstellen
+            </a>
+
+            <a href="index.php?pfad=logout" class="nav__item nav__button">
+                Abmelden
+            </a>
+
+        <?php else: ?>
+
+            <div class="nav__search">
+                <?php include_once 'search.php'; ?>
+            </div>
+
+            <a href="index.php?pfad=login" class="nav__item nav__button">
+                Anmelden
+            </a>
+
+            <a href="index.php?pfad=register" class="nav__item nav__button">
+                Registrieren
+            </a>
+
+        <?php endif; ?>
+
     </div>
 </nav>

includes/search.php

@@ -2,5 +2,10 @@
 Suchleiste. Wird via PHP später in alle Seiten eingebunden
 -->
 <!--<label for="site-search">Suche</label>-->
-<input type="search" id="site-search" name="q" placeholder="Suchen..." class="nav__search">
-<button type="submit" class="nav__search-button">Suchen</button>
+<form action="php/controller/search-results-controller.php" method="GET" class="search-form" style="display: flex; align-items: center; gap: 5px;">
+    
+    <input type="hidden" name="pfad" value="search-results">
+    
+    <input type="search" id="site-search" name="q" placeholder="Suchen..." class="nav__search" maxlength="50" required>
+    <button type="submit" class="nav__search-button">Suchen</button>
+</form>

index.php

@@ -1,52 +1,83 @@
 
 <?php
 session_start();
-if (!isset($abs_path)) {
-    require_once "path.php";
+ob_start();
+
+$pfad = $_GET["pfad"] ?? "home";
+
+/*
+    Controller für Aktionen werden vor der HTML-Ausgabe geladen,
+    damit Weiterleitungen mit header() funktionieren.
+*/
+if ($pfad === "login") {
+    include_once "php/controller/login-controller.php";
+}
+
+if ($pfad === "register") {
+    include_once "php/controller/register-controller.php";
+}
+
+if ($pfad === "logout") {
+    include_once "content/logout.php";
+    exit();
+}
+
+if ($pfad === "deleteAccount") {
+    include_once "content/deleteAccount.php";
+    exit();
 }
-require_once $abs_path . "/php/controller/index-controller.php";
 ?>
 
-<!--
-    Seite: Index der Lernplattform
-    Funktion: Webseitengerüst, Anzeigen von Content
--->
-<!DOCTYPE html>
-<html lang="de">
+    <!--
+        Seite: Index der Lernplattform
+        Funktion: Webseitengerüst, Anzeigen von Content
+    -->
+    <!DOCTYPE html>
+    <html lang="de">
 
-<head>
-    <meta charset="utf-8">
-    <meta name="description" content="EduForge">
-    <meta name="author" content="Niklas Ortmann">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" type="image/x-icon" href="images/logos/logo_icon.ico">
-    <link rel="stylesheet" href="css/main.css">
-    <link rel="stylesheet" href="css/navbar.css">
-    <link rel="stylesheet" href="css/footer.css">
-    <link rel="stylesheet" href="css/search-results.css">
-    <link rel="stylesheet" href="css/createArticle.css">
-    <link rel="stylesheet" href="css/profile.css">
-    <link rel="stylesheet" href="css/showArticle.css">
-    <link rel="stylesheet" href="css/message.css">
-    <title>EduForge</title>
-</head>
+    <head>
+        <meta charset="utf-8">
+        <meta name="description" content="EduForge">
+        <meta name="author" content="Niklas Ortmann">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <link rel="icon" type="image/x-icon" href="images/logos/logo_icon.ico">
+        <link rel="stylesheet" href="css/main.css">
+        <link rel="stylesheet" href="css/navbar.css">
+        <link rel="stylesheet" href="css/footer.css">
+        <link rel="stylesheet" href="css/search-results.css">
+        <link rel="stylesheet" href="css/createArticle.css">
+        <link rel="stylesheet" href="css/profile.css">
+        <link rel="stylesheet" href="css/showArticle.css">
+        <link rel="stylesheet" href="css/message.css">
+        <title>EduForge</title>
+    </head>
 
 
 <body>
     <?php
     include_once 'includes/navbar.php';
-	//Dynamischer Inhalt:
+
+    /*
+        Dynamischer Inhalt:
+        Je nach pfad-Parameter wird die passende Datei aus content geladen.
+    */
     if (isset($_GET["pfad"])) {
-        if (file_exists($abs_path . '/content/' . $_GET["pfad"] . '.php')) {
-            include_once $abs_path . '/content/' . $_GET["pfad"] . '.php';
+        if (file_exists('content/' . $_GET["pfad"] . '.php')) {
+            include_once 'content/' . $_GET["pfad"] . '.php';
         } else {
-            include_once $abs_path . '/content/404.php';
+            include_once 'content/404.php';
         }
     } else {
-        include_once $abs_path . '/content/home.php';
+        include_once 'content/home.php';
     }
-    include_once $abs_path . '/includes/footer.php';
-    ?>
-</body>
 
-</html>
+    include_once 'includes/footer.php';
+    ?>
+
+
+    </body>
+    </html>
+
+<?php
+ob_end_flush();
+?>

php/controller/createArticle-controller.php

@@ -1,86 +1,89 @@
 <?php
-session_start();
+SESSION_START();
 require_once '../model/LocalArticleManager.php';
 require_once '../model/ArticleManager.php';
 require_once '../validator/article-validator.php';
+require_once "../model/LocalUserDAO.php";
 
-if ($_SERVER["REQUEST_METHOD"] === "POST") {
-    $_SESSION["old_title"]    = $_POST["title"] ?? '';
-    $_SESSION["old_content"]  = $_POST["content"] ?? '';
-    $_SESSION["old_category"] = $_POST["category"] ?? '';
-    $_SESSION["old_tags"]     = $_POST["tags"] ?? '';
+    if ($_SERVER["REQUEST_METHOD"] === "POST") {
+        $_SESSION["old_title"]    = $_POST["title"] ?? '';
+        $_SESSION["old_content"]  = $_POST["content"] ?? '';
+        $_SESSION["old_category"] = $_POST["category"] ?? '';
+        $_SESSION["old_tags"]     = $_POST["tags"] ?? '';
 
-    if(!isset($_POST["title"]) ||!isset($_POST["content"]) || !isset($_POST["category"])){
-        $_SESSION["message"] = "missing_parameters";
-        header("location: ../../index.php?pfad=createArticle");
-        exit();
-    } else {
-        $title = $_POST["title"];
-        $content = $_POST["content"];
-        $author = "max.mustermann"; // TODO: später aus Session den angemeldeten Nutzer beziehen.
-        $category = $_POST["category"];
-        $tags = $_POST['tags'] ?? '';
-
-        // -------------------------------- Validierung der Daten: -------------------------
-        if (!articleAuthorValidator($author)) {
-            $_SESSION["message"] = "author_not_valid";
-            header("location: ../../index.php?pfad=createArticle");
-            exit();
-        }
-
-        if (!articleTitleValidator($title)) {
-            $_SESSION["message"] = "invalid_title";
-            header("location: ../../index.php?pfad=createArticle");
-            exit();
-        }
-
-        if (!articleContentValidator($content)) {
-            $_SESSION["message"] = "invalid_content";
-            header("location: ../../index.php?pfad=createArticle");
-            exit();
-        }
-
-        if (!articleCategoryValidator($category)) {
-            $_SESSION["message"] = "invalid_category";
-            header("location: ../../index.php?pfad=createArticle");
-            exit();
-        }
-
-        if (!articleTagValidator($tags)) {
-            $_SESSION["message"] = "invalid_tags";
+        if(!isset($_POST["title"]) ||!isset($_POST["content"]) || !isset($_POST["category"])){
+            $_SESSION["message"] = "missing_parameters";
             header("location: ../../index.php?pfad=createArticle");
             exit();
         } else {
-            $cleanedTags = [];
-            $rawTags = explode(',', $tags);
-            foreach ($rawTags as $rawTag) {
-                // Leerzeichen am Anfang/Ende des einzelnen Tags entfernen:
-                $tag = trim($rawTag);
-                $cleanedTags[] = $tag;
+            $title = $_POST["title"];
+            $content = $_POST["content"];
+            $author = $_SESSION["user_email"];
+            $category = $_POST["category"];
+            $tags = $_POST['tags'] ?? '';
+
+            // -------------------------------- Validierung der Daten: -------------------------
+            if (!articleAuthorValidator($author)) {
+                $_SESSION["message"] = "author_not_valid";
+                header("location: ../../index.php?pfad=createArticle");
+                exit();
             }
-            // Duplikate entfernen:
-            $cleanedTags = array_unique($cleanedTags);
-            $cleanedTags = implode(',', $cleanedTags);
-        }
-        // ----------------- Übertragung der validierten Daten in ArticleManager: ---------------------------
-        try {
-            $articleManager = ArticleManager::getInstance();
-            $articleManager->addArticle($title, $content, $author, $category, $cleanedTags);
 
-            // Formulardaten nach erfolgreichem Erstellen aus der Session löschen
-            unset($_SESSION["old_title"], $_SESSION["old_content"], $_SESSION["old_category"], $_SESSION["old_tags"]);
+            if (!articleTitleValidator($title)) {
+                $_SESSION["message"] = "invalid_title";
+                header("location: ../../index.php?pfad=createArticle");
+                exit();
+            }
 
-        } catch (Exception $e){
-            $_SESSION["message"] = "internal_error";
-            header("location: ../../index.php?pfad=createArticle");
+            if (!articleContentValidator($content)) {
+                $_SESSION["message"] = "invalid_content";
+                header("location: ../../index.php?pfad=createArticle");
+                exit();
+            }
+
+            if (!articleCategoryValidator($category)) {
+                $_SESSION["message"] = "invalid_category";
+                header("location: ../../index.php?pfad=createArticle");
+                exit();
+            }
+
+            if (!articleTagValidator($tags)) {
+                $_SESSION["message"] = "invalid_tags";
+                header("location: ../../index.php?pfad=createArticle");
+                exit();
+            } else {
+                $cleanedTags = [];
+                $rawTags = explode(',', $tags);
+                foreach ($rawTags as $rawTag) {
+                    // Leerzeichen am Anfang/Ende des einzelnen Tags entfernen:
+                    $tag = trim($rawTag);
+                    $cleanedTags[] = $tag;
+                }
+                // Duplikate entfernen:
+                $cleanedTags = array_unique($cleanedTags);
+                $cleanedTags = implode(',', $cleanedTags);
+            }
+            // ----------------- Übertragung der validierten Daten in ArticleManager: ---------------------------
+            try {
+                $articleManager = ArticleManager::getInstance();
+                $articleManager->addArticle($title, $content, $author, $category, $cleanedTags);
+
+                // Formulardaten nach erfolgreichem Erstellen aus der Session löschen
+                unset($_SESSION["old_title"], $_SESSION["old_content"], $_SESSION["old_category"], $_SESSION["old_tags"]);
+
+            } catch (Exception $e){
+                $_SESSION["message"] = "internal_error";
+                header("location: ../../index.php?pfad=createArticle");
+                exit();
+            }
+
+            $_SESSION["message"] = "new_article";
+            // Weiterleitung zur Homepage
+            header("location: ../../index.php");
             exit();
         }
-
-        $_SESSION["message"] = "new_article";
-        // Weiterleitung zur Homepage
-        header("location: ../../index.php");
-        exit();
     }
-}
+
+
 
 ?>

php/controller/login-controller.php

@@ -0,0 +1,30 @@
+<?php
+
+require_once "php/model/LocalUserDAO.php";
+
+$dao = new LocalUserDAO();
+$error = null;
+
+/*
+    Verarbeitung des Login-Formulars
+    Funktion: Prüft Benutzerdaten und erstellt Session für eingeloggten Nutzer
+*/
+if ($_SERVER["REQUEST_METHOD"] === "POST") {
+
+    $email = $_POST["email"] ?? "";
+    $password = $_POST["password"] ?? "";
+
+    $user = $dao->findUser($email);
+
+    if ($user && password_verify($password, $user["password"])) {
+
+        $_SESSION["user"] = $user["username"];
+        $_SESSION["user_email"] = $user["email"];
+
+        header("Location: index.php");
+        exit();
+
+    } else {
+        $error = "Login fehlgeschlagen. Bitte überprüfe deine Eingaben.";
+    }
+}

php/controller/profile-controller.php

@@ -0,0 +1,31 @@
+<?php
+
+require_once "php/model/LocalUserDAO.php";
+require_once 'php/model/Article.php';
+require_once 'php/model/ArticleManager.php';
+
+if (!isset($_SESSION["user"])) {
+    header("Location: index.php?pfad=login");
+    exit();
+}
+
+try {
+    $dao = new LocalUserDAO();
+    $user = $dao->findUser($_SESSION["user_email"] ?? "");
+    $articleManager = ArticleManager::getInstance();
+    $userArticles = $articleManager->getArticlesByAuthor($_SESSION["user_email"]);
+    if(!isset($userArticles)) {
+        $_SESSION["message"] = "user_has_no_articles";
+    }
+} catch (Exception $e) {
+    $_SESSION["message"] = "internal_error";
+    exit();
+}
+
+if (!$user) {
+    $_SESSION = [];
+    session_destroy();
+
+    header("Location: index.php?pfad=login");
+    exit();
+}

php/controller/profileArticles-controller.php

@@ -3,12 +3,15 @@
  * Controller für die Liste der eigenen Beiträge eines Nutzers auf der eigenen Profilseite
  */
 
-session_start();
 require_once 'php/model/Article.php';
 require_once 'php/model/ArticleManager.php';
+require_once "../model/LocalUserDAO.php";
 
 try {
-    $author = "max.mustermann"; // TODO: später Nutzer aus der Session beziehen.
+    $dao = new LocalUserDAO();
+    $user = $dao->findUser($_SESSION["user_email"] ?? "");
+
+    $author = $user["email"];
     $articleManager = ArticleManager::getInstance();
     $userArticles = $articleManager->getArticlesByAuthor($author);
     if(!isset($userArticles)) {

php/controller/register-controller.php

@@ -0,0 +1,40 @@
+<?php
+
+require_once "php/model/LocalUserDAO.php";
+
+$dao = new LocalUserDAO();
+$error = null;
+
+/*
+    Verarbeitung des Registrierungs-Formulars
+    Funktion: Erstellt neuen Benutzer und speichert ihn im DAO + Session
+*/
+if ($_SERVER["REQUEST_METHOD"] === "POST") {
+
+    $email = $_POST["email"] ?? "";
+    $vorname = $_POST["vorname"] ?? "";
+    $nachname = $_POST["nachname"] ?? "";
+    $password = password_hash(
+        $_POST["password"] ?? "",
+        PASSWORD_DEFAULT
+    );
+
+    if ($dao->findUser($email)) {
+
+        $error = "Diese E-Mail-Adresse ist bereits registriert.";
+
+    } else {
+
+        $dao->addUser(
+            $email,
+            $vorname . " " . $nachname,
+            $password
+        );
+
+        $_SESSION["user"] = $vorname . " " . $nachname;
+        $_SESSION["user_email"] = $email;
+
+        header("Location: index.php");
+        exit();
+    }
+}

php/controller/search-results-controller.php

@@ -2,28 +2,67 @@
 session_start();
 require_once '../model/LocalArticleManager.php';
 require_once '../model/ArticleManager.php';
+require_once '../model/Article.php';
 
-if ($_SERVER["REQUEST_METHOD"] === "POST") {
-    if(!isset($_POST["search"])){
+if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
+
+    $search = trim($_GET["q"]);
+    if (empty($search)) {
+        $_SESSION["search_results"] = [];
+        $_SESSION["search_query"] = "";
         $_SESSION["message"] = "missing_parameters";
-        header("location: ../../index.php?pfad=search-results");
     } else {
-
-        $search = $_POST["search"];
-
         try {
+            
             $articleManager = ArticleManager::getInstance();
-            $articleManager->search($search); // TODO: Methode implementieren.
+            
+            $results = $articleManager->search($search);
+
+            $sortStyle = $_GET['sort'] ?? 'alphabet';
+            $_SESSION['search_sort'] = $sortStyle;
+
+            if ($sortStyle === 'alphabet') {
+                // Titel aufsteigend alphabetiisch sortiert
+                usort($results, function($a, $b) {
+                    return strcasecmp($a->title, $b->title);
+                });
+            } elseif ($sortStyle === 'newest') {
+                // Datum neu zu alt sortiert
+                usort($results, function($a, $b) {
+                    return strcmp($b->creationDate, $a->creationDate);
+                });
+            } elseif ($sortStyle === 'oldest') {
+                // Datum alt zu neu sortiert
+                usort($results, function($a, $b) {
+                    return strcmp($a->creationDate, $b->creationDate);
+                });
+            }
+
+            // Ergebnisse werden in ein flaches array umgewandelt, da sont incomplete-PHP error im Ergebnis
+            $safeArrayResults = [];
+            foreach ($results as $obj) {
+                $safeArrayResults[] = [
+                    "id" => $obj->id,
+                    "title" => $obj->title,
+                    "content" => $obj->content,
+                    "author" => $obj->author,
+                    "category" => $obj->category,
+                    "tags" => $obj->tags,
+                    "creationDate" => $obj->creationDate
+                ];
+            }
+            
+            $_SESSION["search_results"] = $safeArrayResults;
+            $_SESSION["search_query"] = $search;
+            $_SESSION["message"] = "new_search_results";
+
         } catch (Exception $e){
             $_SESSION["message"] = "internal_error";
         }
-        $_SESSION["message"] = "new_search_results";
-        // TODO: Liste mit Artikeln in der Suchreihenfolge übertragen.
-        // Weiterleitung zur Suchergebnisanzeige
-        header("location: ../../index.php?pfad=search-results");
-        exit();
-
     }
+    header("Location: ../../index.php?pfad=search-results");
+    exit();
+    
 }
 
 ?>

php/model/Article.php

@@ -7,13 +7,13 @@
  */
 class Article
 {
-    private $id;
-    private $title;
-    private $content;
-    private $author;
-    private $creationDate;
-    private $category;
-    private $tags;
+    public $id;
+    public $title;
+    public $content;
+    public $author;
+    public $creationDate;
+    public $category;
+    public $tags;
 
     /**
      * Konstruktor

php/model/ArticleManager.php

@@ -44,4 +44,5 @@ class ArticleManager extends LocalArticleManager
 
         return $articleManager;
     }
+ 
 }

php/model/ArticleManagerDAO.php

@@ -67,5 +67,15 @@ interface ArticleManagerDAO
      */
     public function getArticlesByAuthor($author);
 
+    /**
+     * Durchsucht die vorhandenen Beiträge nach einem bestimmten Suchbegriff.
+     * Die Suche prüft, ob das übergebene Keyword im Titel oder im Inhalt eines Beitrags vorkommt.
+     * (Unabhängig von Groß-und Kleinschreibung)
+     * @param string $keyword Der eingegebene Suchbegriff.
+     * @return array Ein Array von Artikeln ,die dem Suchkriterium entsprechen. Wenn nichts gefunden wird, ein leeres Array.
+     */
+    public function search(string $keyword): array;
+
+
 }
 ?>

php/model/LocalArticleManager.php

@@ -168,5 +168,40 @@ class LocalArticleManager implements ArticleManagerDAO {
         }
         return $filteredArticles;
     }
+
+
+    public function search(string $keyword): array 
+    {
+        $articles = $this->getAllArticles();
+        $filteredArticles = [];
+
+        if (!is_array($articles)) {
+            return [];
+        }
+
+        $cleanKeyword = strtolower(trim($keyword));
+
+        foreach ($articles as $article) {
+            $title = isset($article['title']) ? strtolower((string)$article['title']) : '';
+            $content = isset($article['content']) ? strtolower((string)$article['content']) : '';
+
+            if (($cleanKeyword !== '' && strpos($title, $cleanKeyword) !== false) || 
+                ($cleanKeyword !== '' && strpos($content, $cleanKeyword) !== false)) {
+            
+                $filteredArticles[] = new Article(
+                    intval($article['id'] ?? 0),
+                    $article['title'] ?? '',
+                    $article['content'] ?? '',
+                    $article['author'] ?? '',
+                    $article['category'] ?? '',
+                    $article['tags'] ?? '',
+                    $article['creationDate'] ?? ''
+                );
+            }
+        }
+
+    return $filteredArticles;
+    }
+
 }
 ?>

php/model/LocalUserDAO.php

@@ -0,0 +1,64 @@
+<?php
+require_once "UserDAOInterface.php";
+
+class LocalUserDAO implements UserDAOInterface {
+
+    private string $file = "data/users.json";
+
+    private function loadUsers() {
+        if (!file_exists($this->file)) {
+            return [];
+        }
+
+        $json = file_get_contents($this->file);
+        $users = json_decode($json, true);
+
+        return is_array($users) ? $users : [];
+    }
+
+    private function saveUsers($users) {
+        file_put_contents(
+            $this->file,
+            json_encode($users, JSON_PRETTY_PRINT)
+        );
+    }
+
+    public function findUser($email) {
+        $users = $this->loadUsers();
+
+        foreach ($users as $user) {
+            if ($user["email"] === $email) {
+                return $user;
+            }
+        }
+
+        return null;
+    }
+
+    public function addUser($email, $username, $password) {
+        $users = $this->loadUsers();
+
+        $users[] = [
+            "email" => $email,
+            "username" => $username,
+            "password" => $password
+        ];
+
+        $this->saveUsers($users);
+    }
+
+    public function deleteUser($email) {
+        $users = $this->loadUsers();
+
+        foreach ($users as $i => $user) {
+            if ($user["email"] === $email) {
+                unset($users[$i]);
+                $users = array_values($users);
+                $this->saveUsers($users);
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

php/model/UserDAOInterface.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Interface für den Zugriff auf Benutzerdaten.
+ *
+ * Definiert die Methoden, die jede UserDAO-Implementierung
+ * bereitstellen muss.
+ */
+interface UserDAOInterface {
+
+    /**
+     * Sucht einen Benutzer anhand seiner E-Mail-Adresse.
+     *
+     * @param string $email E-Mail-Adresse des gesuchten Benutzers
+     * @return array|null Benutzerdaten als Array oder null
+     */
+    public function findUser($email);
+
+    /**
+     * Fügt einen neuen Benutzer hinzu.
+     *
+     * @param string $email E-Mail-Adresse des Benutzers
+     * @param string $username Benutzername des Benutzers
+     * @param string $password Passwort des Benutzers
+     * @return void
+     */
+    public function addUser($email, $username, $password);
+
+    /**
+     * Löscht einen Benutzer anhand seiner E-Mail-Adresse.
+     *
+     * @param string $email E-Mail-Adresse des zu löschenden Benutzers
+     * @return bool true, wenn der Benutzer gelöscht wurde, sonst false
+     */
+    public function deleteUser($email);
+}