Merge branch 'dev' into SuchergebnisseJS

Reviewed-on: #36

README.md

@@ -19,6 +19,8 @@
 - Die Suchseite und Kategorieseite packen momentan alle passenden Beiträge untereinander. Später sollen zunächst 10 
   Ergebnisse auf einer Seite angezeigt werden.
 - Wenn ein Bild aus einem Beitrag entfernt wird, dann wird noch nicht die Datei im Pfad /uploads gelöscht.
+- id in showArticle-controller.php und updateArticle-controller.php wird nicht als gültige numerische ID geprüft. 
+- sort in search-results-controller.php wird nicht gegen erlaubte Werte validiert.
 
 ## Besonderheiten des Projektes
 - Es wurde ein einfacher Beitrags-Editor erstellt. Mit diesem können Beiträge erstellt oder bearbeitet werden.

content/profile.php

@@ -7,8 +7,8 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
 
 <main class="form-page">
     <div class="flexbox">
-
         <div class="container">
+            <?php include_once "includes/alertMessages.php" ?>
 
             <?php if (!empty($error)): ?>
                 <p class="alert-message is-error">
@@ -93,8 +93,6 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
 
         <div class="container">
 
-            <?php include_once "includes/alertMessages.php" ?>
-
             <h2 class="section-title">Meine Beiträge</h2>
 
             <div class="articles-list">
@@ -182,10 +180,9 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
 
                 <?php endif; ?>
             </div>
+        </div>
 
-            <br>
+        <div class="container">
-
-            <!-- Eigener Bereich für die Kommentare des Nutzers -->
             <div class="comments-section">
 
                 <h2 class="section-title">Meine Kommentare</h2>
@@ -228,10 +225,8 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
                 </div>
 
             </div>
-
-            <?php unset($_SESSION["message"]); ?>
-            </div>
-
         </div>
+        <?php unset($_SESSION["message"]); ?>
+    </div>
 
 </main>

content/search-results.php

@@ -27,7 +27,8 @@ if ($currentPage < 1) {
 $offset = ($currentPage - 1) * $limit;
 
 // Nur die Ergebnisse für die aktuelle Seite ausschneiden
-$results = array_slice($all_results, $offset, $limit);
+//$results = array_slice($all_results, $offset, $limit);
+$results = $all_results;
 $resultCount = count($results);
 
 ?>
@@ -44,12 +45,11 @@ $resultCount = count($results);
     <!-- Links: Seitenleiste für Filter und Suche -->
     <aside class="s-res-sidebar">
 
-        <!-- Sortierfuntion Box und Such Box-->
+        <form action="php/controller/search-results-controller.php" method="GET" id="search-form-id" class="s-res-sidebar-form">
-         <form id="search-form-id" action="php/controller/search-results-controller.php" method="GET" class="s-res-sidebar-form">
+            
-             <!-- Dieses Feld hält die aktuelle Seitenzahl für den Submit bereit -->
+            <input type="hidden" id="s-res-page-input" name="page" value="<?php echo $_GET['page'] ?? 1; ?>">
-             <input type="hidden" name="page" id="s-res-page-input" value="<?php echo $currentPage; ?>">
 
-             <div class="s-res-sidebar-box">
+            <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>
@@ -60,25 +60,57 @@ $resultCount = count($results);
                 <?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()">
+                        <input type="radio" name="sort" value="alphabet" class="sort-radio" <?php echo $currentSort === 'alphabet' ? 'checked' : ''; ?>>
                         <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>
+                        <input type="radio" name="sort" value="likes" <?php echo $currentSort === 'likes' ? 'checked' : ''; ?> onchange="this.form.submit()">
-                        <span style="color: #94a3b8;">Beliebtheit (Likes)</span>
+                        <span>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()">
+                        <input type="radio" name="sort" value="newest" class="sort-radio" <?php echo $currentSort === 'newest' ? 'checked' : ''; ?>>
                         <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()">
+                        <input type="radio" name="sort" value="oldest" class="sort-radio" <?php echo $currentSort === 'oldest' ? 'checked' : ''; ?>>
                         <span>Älteste Beiträge</span>
                     </label>
                 </div>
             </div>
 
+            <div class="s-res-sidebar-box">
+                <h3 class="s-res-sidebar-title">Kategorie filtern</h3>
+                <select id="category-filter" class="s-res-limit-select" style="width: 100%; padding: 8px; border-radius: 6px; border: 1px solid #cbd5e1;">
+                    <option value="all">Alle Kategorien</option>
+                    <option value="Deutsch">Deutsch</option>
+                    <option value="Englisch">Englisch</option>
+                    <option value="Franzoesisch">Französisch</option>
+                    <option value="Latein">Latein</option>
+                    <option value="Literatur">Literatur</option>
+                    <option value="Mathematik">Mathematik</option>
+                    <option value="Biologie">Biologie</option>
+                    <option value="Informatik">Informatik</option>
+                    <option value="Chemie">Chemie</option>
+                    <option value="Physik">Physik</option>
+                    <option value="Astronomie">Astronomie</option>
+                    <option value="Geschichte">Geschichte</option>
+                    <option value="Erdkunde">Erdkunde</option>
+                    <option value="Sozialkunde">Sozialkunde</option>
+                    <option value="Wirtschaftskunde">Wirtschaftskunde</option>
+                    <option value="Religion">Religion</option>
+                    <option value="Ethikunterricht">Ethikunterricht</option>
+                    <option value="Philosophie">Philosophie</option>
+                    <option value="Psychologie">Psychologie</option>
+                    <option value="Kunst">Kunst</option>
+                    <option value="Musik">Musik</option>
+                    <option value="Theater">Theater</option>
+                    <option value="Technik">Technik</option>
+                    <option value="Werken">Werken</option>
+                    <option value="Hauswirtschaft">Hauswirtschaft</option>
+                    <option value="Sport">Sport</option>
+                </select>
+            </div>
+
         </form>
 
     </aside>
@@ -96,14 +128,21 @@ $resultCount = count($results);
             if (!empty($results)): ?>
     
                 <?php foreach ($results as $item): ?>
-                    <div class="s-res-item">
+                    <div class="s-res-item" data-likes="<?php echo $item['likes'] ?? 0; ?>" data-category="<?php echo strtolower($item['category'] ?? ''); ?>">
                         <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 class="s-res-meta-row">
+                                <p class="s-res-author">Von: <span class="s-res-author-name"><?php echo htmlspecialchars($item['author']); ?></span></p>
+
+                                <span class="s-res-likes">
+                                    ❤️ <?php echo isset($item['likes']) && is_array($item['likes']) ? count($item['likes']) : 0; ?>
+                                </span>
+                            </div>
+
                         </div>
                         <div class="s-res-arrow">&rarr;</div>
                     </div>
@@ -113,8 +152,8 @@ $resultCount = count($results);
             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"): ?>
+            elseif (isset($_SESSION["message"]) && $_SESSION["message"] == "invalid_search_query"): ?>
-                <p>Bitte überprüfe deine Sucheingabe und versuche es erneut!</p>
+                <p>Unzulässige Suchanfrage</p>
                 
             <?php endif; ?>
             <?php
@@ -136,23 +175,14 @@ $resultCount = count($results);
             </div>
 
             <div class="s-res-page-navigation">
-                <button type="button" class="s-res-page-btn" data-page="<?php echo $currentPage - 1; ?>" <?php echo $currentPage <= 1 ? 'disabled' : ''; ?>>
+                <button type="button" class="s-res-page-btn" id="prev-page-btn" data-page="0">«</button>
-                    «
+                
-                </button>
+                <span id="dynamic-page-numbers"></span>
-                <!-- Dynamische Seitenzahlen -->
+                
-                <?php for ($i = 1; $i <= $totalPages; $i++): ?>
+                <button type="button" class="s-res-page-btn" id="next-page-btn" data-page="2">»</button>
-                    <button type="button"
-                            class="s-res-page-btn <?php echo $i === $currentPage ? 's-res-page-btn-active' : ''; ?>"
-                            data-page="<?php echo $i; ?>">
-                        <?php echo $i; ?>
-                    </button>
-                <?php endfor; ?>
-                <button type="button" class="s-res-page-btn" data-page="<?php echo $currentPage + 1; ?>" <?php echo $currentPage >= $totalPages ? 'disabled' : ''; ?>>
-                    »
-                </button>
             </div>
 
         </div>
     </main>
 
-</div>
+</div>

content/showArticle.php

@@ -1,28 +1,10 @@
 <?php
-include_once 'php/controller/showArticle-controller.php';
-require_once 'php/model/CommentManager.php';
-
 $comments = [];
 $mainComments = [];
 $repliesByParent = [];
+$articleObj = null;
 
-if (isset($_GET["id"])) {
+include_once 'php/controller/showArticle-controller.php';
-    try {
-        $commentManager = CommentManager::getInstance();
-        $comments = $commentManager->getCommentsByArticle($_GET["id"]);
-
-        foreach ($comments as $comment) {
-            if ($comment->isReply()) {
-                $parentId = $comment->getParentCommentId();
-                $repliesByParent[$parentId][] = $comment;
-            } else {
-                $mainComments[] = $comment;
-            }
-        }
-    } catch (Exception $e) {
-        $_SESSION["message"] = "internal_error";
-    }
-}
 ?>
 <!--
      Seite: Anzeige für Beiträge
@@ -35,9 +17,28 @@ if (isset($_GET["id"])) {
     <!-- Metadaten & Titel -->
     <div class="article-view-top-section">
 
-        <?php if (isset($category) && !empty($category)): ?>
+        <div class="article-view-top-section">
-            <span class="article-view-category"><?php echo htmlspecialchars($category); ?></span>
+
-        <?php endif; ?>
+            <div class="category-and-likes-row">
+                <?php if (isset($category) && !empty($category)): ?>
+                    <span class="article-view-category"><?php echo htmlspecialchars($category); ?></span>
+                <?php endif; ?>
+
+                <!-- Like-Anzeige und dynamischer Like-Button  -->
+                <?php if (isset($articleObj) && $articleObj !== null): ?>
+                    <div class="article-view-likes">
+                        <span>❤️ <span class="like-count"><?php echo $articleObj->getLikeCount(); ?></span></span>
+
+                        <?php if (isset($_SESSION["user_email"])): ?>
+                            <a href="php/controller/like-controller.php?id=<?php echo $articleObj->getId(); ?>" class="like-toggle-btn">
+                                <?php echo $articleObj->hasLiked($_SESSION["user_email"]) ? '👎 Gefällt mir nicht mehr' : '👍 Gefällt mir'; ?>
+                            </a>
+                        <?php else: ?>
+                            <span class="login-hint">(Anmelden zum Liken)</span>
+                        <?php endif; ?>
+                    </div>
+                <?php endif; ?>
+            </div>
 
         <h1 class="article-view-title">
             <?php if (isset($title)) { echo htmlspecialchars($title); } ?>

css/search-results.css

@@ -247,6 +247,17 @@ CSS für die Suchergebnis-Seite
     cursor: not-allowed;
 }
 
+.s-res-meta-row {
+    display: flex;
+    gap: 15px;
+    align-items: center;
+}
+
+.s-res-likes {
+    font-size: 0.9em;
+    color: #475569;
+}
+
 /* Responsive Anpassungen unter 760px (für z.B. Smartphones) */
 @media (max-width: 768px) {
     .s-res-layout-grid {

css/showArticle.css

@@ -239,4 +239,48 @@
 
 .comment-login-hint p {
     margin-bottom: 1rem;
+}
+
+/*
+Like-Button etc.
+ */
+
+.category-and-likes-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+}
+
+.article-view-likes {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    font-size: 0.95em;
+}
+
+.article-view-likes .like-count {
+    font-weight: bold;
+}
+
+.article-view-likes .login-hint {
+    font-size: 0.8em;
+    color: #777;
+}
+
+/* Interaktiver Like/Unlike-Button */
+.like-toggle-btn {
+    text-decoration: none;
+    padding: 4px 10px;
+    border: 1px solid #bbb;
+    border-radius: 4px;
+    background-color: #f5f5f5;
+    color: #333;
+    font-weight: 500;
+    transition: background-color 0.2s ease, border-color 0.2s ease;
+}
+
+.like-toggle-btn:hover {
+    background-color: #eaeaea;
+    border-color: #999;
 }

includes/alertMessages.php

@@ -63,6 +63,16 @@
         Dein Beitrag wurde erfolgreich veröffentlicht!
     </p>
 <?php endif; ?>
+<?php if (isset($_SESSION["message"]) && $_SESSION["message"] == "article_updated"): ?>
+    <p class="alert-message is-success">
+        Der Beitrag wurde erfolgreich bearbeitet und gespeichert.
+    </p>
+<?php endif; ?>
+<?php if (isset($_SESSION["message"]) && $_SESSION["message"] == "profile_updated"): ?>
+    <p class="alert-message is-success">
+        Das Profil wurde erfolgreich bearbeitet.
+    </p>
+<?php endif; ?>
 <?php if (isset($_SESSION["message"]) && $_SESSION["message"] == "image_upload_error"): ?>
     <p class="alert-message is-error">
         Das Bild konnte nicht hochgeladen werden. Bitte versuche es erneut oder verwende ein anderes Bildformat.

index.php

@@ -53,8 +53,10 @@ if ($pfad === "deleteAccount") {
         <link rel="stylesheet" href="css/message.css">
 
         <script src="js/paginator.js" async></script>
+        <script src="js/sorter.js" async></script>
         <script src="js/comments.js" defer></script>
         <script src="js/editor.js" async></script>
+        <script src="js/filter.js" async></script>
 
         <title>EduForge</title>
     </head>

js/filter.js

@@ -0,0 +1,101 @@
+let currentClientPage = 1;
+const itemsPerPage = 10;
+
+function initFilter() {
+    const filterSelect = document.getElementById('category-filter');
+    const listContainer = document.querySelector('.s-res-list');
+
+    if (!filterSelect || !listContainer) return;
+
+    updateVisibility();
+
+    filterSelect.addEventListener('change', function() {
+        currentClientPage = 1; 
+        updateVisibility();
+    });
+
+    const navigationContainer = document.querySelector('.s-res-page-navigation');
+    if (navigationContainer) {
+        navigationContainer.addEventListener('click', function(e) {
+            const button = e.target.closest('.s-res-page-btn');
+            if (!button || button.disabled) return;
+
+            e.preventDefault();
+            
+            const targetPage = button.getAttribute('data-page');
+            if (targetPage) {
+                currentClientPage = parseInt(targetPage, 10);
+                updateVisibility();
+            }
+        });
+    }
+}
+
+function updateVisibility() {
+    const filterSelect = document.getElementById('category-filter');
+    const listContainer = document.querySelector('.s-res-list');
+    const selectedCategory = filterSelect.value.toLowerCase().trim();
+    const cards = listContainer.querySelectorAll('.s-res-item');
+
+    let visibleCards = [];
+    cards.forEach(card => {
+        const cardCategory = (card.getAttribute('data-category') || '').toLowerCase().trim();
+        if (selectedCategory === 'all' || cardCategory.includes(selectedCategory) || selectedCategory.includes(cardCategory)) {
+            visibleCards.push(card);
+        } else {
+            card.style.display = 'none';
+        }
+    });
+
+    const totalVisible = visibleCards.length;
+    const totalPages = Math.max(1, Math.ceil(totalVisible / itemsPerPage));
+    
+    if (currentClientPage < 1) currentClientPage = 1;
+    if (currentClientPage > totalPages) currentClientPage = totalPages;
+
+    const startOffset = (currentClientPage - 1) * itemsPerPage;
+    const endOffset = startOffset + itemsPerPage;
+
+    visibleCards.forEach((card, index) => {
+        if (index >= startOffset && index < endOffset) {
+            card.style.display = 'flex';
+        } else {
+            card.style.display = 'none';
+        }
+    });
+
+    updatePaginatorUI(currentClientPage, totalPages);
+}
+
+function updatePaginatorUI(currentPage, totalPages) {
+    const prevBtn = document.getElementById('prev-page-btn');
+    const nextBtn = document.getElementById('next-page-btn');
+    const numbersContainer = document.getElementById('dynamic-page-numbers');
+
+    if (!prevBtn || !nextBtn || !numbersContainer) return;
+
+    prevBtn.setAttribute('data-page', currentPage - 1);
+    prevBtn.disabled = (currentPage <= 1);
+
+    nextBtn.setAttribute('data-page', currentPage + 1);
+    nextBtn.disabled = (currentPage >= totalPages);
+
+    let buttonsHTML = '';
+    for (let i = 1; i <= totalPages; i++) {
+        const activeClass = (i === currentPage) ? 's-res-page-btn-active' : '';
+        buttonsHTML += `<button type="button" class="s-res-page-btn ${activeClass}" data-page="${i}">${i}</button> `;
+    }
+    numbersContainer.innerHTML = buttonsHTML;
+}
+
+// Hilfsfunktion für Math.ceil in JS
+function ceil(val) { return Math.ceil(val); }
+
+// ist das DOM bereits vollständig aufgebaut?
+if (document.readyState === 'loading') {
+    // Falls noch geladen wird, auf das Event warten
+    document.addEventListener('DOMContentLoaded', initFilter);
+} else {
+    // Falls das HTML bereits komplett da ist, sofort ausführen
+    initFilter();
+}

js/sorter.js

@@ -0,0 +1,50 @@
+
+function initSorter() {
+    const listContainer = document.querySelector('.s-res-list');
+    const sortRadios = document.querySelectorAll('.sort-radio');
+
+    // wenn keine liste vorhanden, abbrechen
+    if (!listContainer || sortRadios.length === 0) return;
+
+    sortRadios.forEach(radio => {
+        radio.addEventListener('change', function() {
+            const cards = Array.from(listContainer.querySelectorAll('.s-res-item'));
+            const sortValue = this.value;
+
+            cards.sort((a, b) => {
+                if (sortValue === 'likes') {
+                    const likesA = parseInt(a.getAttribute('data-likes') || '0', 10);
+                    const likesB = parseInt(b.getAttribute('data-likes') || '0', 10);
+                    return likesB - likesA; 
+                }
+                else if (sortValue === 'alphabet') {
+                    // alphabetische sortierung
+                    const titleA = a.querySelector('.s-res-link').textContent.trim().toLowerCase();
+                    const titleB = b.querySelector('.s-res-link').textContent.trim().toLowerCase();
+                    return titleA.localeCompare(titleB);
+                } 
+                else if (sortValue === 'newest' || sortValue === 'oldest') {
+                    // hoehere ID wird als neuer gesehen
+                    const urlA = a.querySelector('.s-res-link').getAttribute('href');
+                    const urlB = b.querySelector('.s-res-link').getAttribute('href');
+                    
+                    const idA = parseInt(urlA.match(/id=(\d+)/)[1], 10);
+                    const idB = parseInt(urlB.match(/id=(\d+)/)[1], 10);
+
+                    return sortValue === 'newest' ? idB - idA : idA - idB;
+                }
+                return 0;
+            });
+
+            listContainer.innerHTML = '';
+            cards.forEach(card => listContainer.appendChild(card));
+        });
+    });
+}
+
+// ist das DOM bereits vollständig aufgebaut?
+if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', initSorter);
+} else {
+    initSorter();
+}

php/controller/createArticle-controller.php

@@ -6,6 +6,10 @@ require_once '../model/LocalArticleManager.php';
 require_once '../model/ArticleManager.php';
 require_once '../validator/article-validator.php';
 
+if (!isset($_SESSION["user"])) {
+    header("Location: index.php?pfad=login");
+    exit();
+}
     if ($_SERVER["REQUEST_METHOD"] === "POST") {
         $_SESSION["old_title"]    = $_POST["title"] ?? '';
         $_SESSION["old_content"]  = $_POST["content"] ?? '';

php/controller/deleteAccount-controller.php

@@ -6,6 +6,11 @@ if (session_status() === PHP_SESSION_NONE) {
 require_once __DIR__ . "/../model/UserManager.php";
 require_once __DIR__ . "/../model/ArticleManager.php";
 
+if (!isset($_SESSION["user"])) {
+    header("Location: index.php?pfad=login");
+    exit();
+}
+
 /*
     Deregistrierung
     Funktion: Entfernt User aus der Datenbank und beendet die Session

php/controller/deleteArticle-controller.php

@@ -5,6 +5,11 @@ if (session_status() === PHP_SESSION_NONE) {
 
 require_once __DIR__ . "/../model/ArticleManager.php";
 
+if (!isset($_SESSION["user"])) {
+    header("Location: index.php?pfad=login");
+    exit();
+}
+
 if ($_SERVER["REQUEST_METHOD"] === "POST") {
 
     if (isset($_SESSION["user_email"])) {

php/controller/like-controller.php

@@ -0,0 +1,42 @@
+<?php
+if (session_status() === PHP_SESSION_NONE) {
+    session_start();
+}
+
+require_once __DIR__ . '/../model/Article.php';
+require_once __DIR__ . '/../model/ArticleManager.php';
+
+// 2. Prüfen, ob eine gültige Artikel-ID übergeben wurde
+if (isset($_GET["id"]) && !empty($_GET["id"])) {
+    $articleId = intval($_GET["id"]);
+    $userEmail = $_SESSION["user_email"];
+
+    if (!isset($_SESSION["user_email"]) || empty($_SESSION["user_email"])) {
+        $_SESSION["message"] = "unauthorized_access";
+        header("Location: ../../index.php?pfad=showArticle&id=" . $articleId);
+        exit();
+    }
+
+    try {
+        $articleManager = ArticleManager::getInstance();
+        $articleManager->toggleLike($articleId, $userEmail);
+
+        header("Location: ../../index.php?pfad=showArticle&id=" . $articleId);
+        exit();
+
+    } catch (NotFoundException $e) {
+        $_SESSION["message"] = "missing_id";
+        header("Location: ../../index.php");
+        exit();
+    } catch (Exception $e) {
+        $_SESSION["message"] = "internal_error";
+        header("Location: ../../index.php");
+        exit();
+    }
+} else {
+    $_SESSION["message"] = "missing_id";
+    header("Location: ../../index.php");
+    exit();
+}
+
+?>

php/controller/profile-controller.php

@@ -63,6 +63,7 @@ try {
                 $_SESSION["user"] = $vorname . " " . $nachname;
                 $_SESSION["user_email"] = $newEmail;
 
+                $_SESSION["message"] = "profile_updated";
                 header("Location: index.php?pfad=profile");
                 exit();
             } else {

php/controller/search-results-controller.php

@@ -5,14 +5,15 @@ if (session_status() === PHP_SESSION_NONE) {
 require_once '../model/LocalArticleManager.php';
 require_once '../model/ArticleManager.php';
 require_once '../model/Article.php';
+require_once '../validator/search-validator.php';
 
 if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
 
     $search = trim($_GET["q"]);
-    if (empty($search)) {
+    if (!searchQueryValidator($search)) {
         $_SESSION["search_results"] = [];
         $_SESSION["search_query"] = "";
-        $_SESSION["message"] = "missing_parameters";
+        $_SESSION["message"] = "invalid_search_query";
     } else {
         try {
             
@@ -25,18 +26,22 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
 
             if ($sortStyle === 'alphabet') {
                 // Titel aufsteigend alphabetiisch sortiert
+                usort($results, function ($a, $b) {
+                    return strcasecmp($a->getTitle(), $b->getTitle());
+                });
+            } elseif ($sortStyle === 'likes') {
                 usort($results, function($a, $b) {
-                    return strcasecmp($a->title, $b->title);
+                    return $b->getLikeCount() <=> $a->getLikeCount();
                 });
             } elseif ($sortStyle === 'newest') {
                 // Datum neu zu alt sortiert
                 usort($results, function($a, $b) {
-                    return strcmp($b->creationDate, $a->creationDate);
+                    return strcmp($b->getCreationDate(), $a->getCreationDate());
                 });
             } elseif ($sortStyle === 'oldest') {
                 // Datum alt zu neu sortiert
                 usort($results, function($a, $b) {
-                    return strcmp($a->creationDate, $b->creationDate);
+                    return strcmp($a->getCreationDate(), $b->getCreationDate());
                 });
             }
 
@@ -44,13 +49,14 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
             $safeArrayResults = [];
             foreach ($results as $obj) {
                 $safeArrayResults[] = [
-                    "id" => $obj->id,
+                    "id" => $obj->getId(),
-                    "title" => $obj->title,
+                    "title" => $obj->getTitle(),
-                    "content" => $obj->content,
+                    "content" => $obj->getContent(),
-                    "author" => $obj->author,
+                    "author" => $obj->getAuthor(),
-                    "category" => $obj->category,
+                    "category" => $obj->getCategory(),
-                    "tags" => $obj->tags,
+                    "tags" => $obj->getTags(),
-                    "creationDate" => $obj->creationDate
+                    "creationDate" => $obj->getCreationDate(),
+                    "likes" => $obj->getLikes(),
                 ];
             }
             
@@ -65,6 +71,9 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
 
     $sort  = $_GET['sort'] ?? 'alphabet';
     $limit = isset($_GET['limit']) ? (int)$_GET['limit'] : 10;
+    if (!searchLimitValidator($limit)) {
+        $limit = 10;
+    }
     $page  = isset($_GET['page']) ? (int)$_GET['page'] : 1;
     header("Location: ../../index.php?pfad=search-results&q=" . urlencode($search) . "&sort=" . urlencode($sort) . "&limit=" . $limit . "&page=" . $page);
     exit();

php/controller/showArticle-controller.php

@@ -5,6 +5,7 @@ if (session_status() === PHP_SESSION_NONE) {
 
 require_once 'php/model/Article.php';
 require_once 'php/model/ArticleManager.php';
+require_once 'php/model/CommentManager.php';
 
 if (isset($_GET["id"]) && !empty($_GET["id"])){
     try {
@@ -17,11 +18,25 @@ if (isset($_GET["id"]) && !empty($_GET["id"])){
             $category = $article->getCategory();
             $author = $article->getAuthor();
             $tags = $article->getTags();
+            $articleObj = $article; // Objekt für die Like-Abfagen sichern
         }else{
             //header("location: index.php?pfad=404");
             include_once "content/404.php";
             exit();
         }
+
+        $commentManager = CommentManager::getInstance();
+        $comments = $commentManager->getCommentsByArticle($_GET["id"]);
+
+        foreach ($comments as $comment) {
+            if ($comment->isReply()) {
+                $parentId = $comment->getParentCommentId();
+                $repliesByParent[$parentId][] = $comment;
+            } else {
+                $mainComments[] = $comment;
+            }
+        }
+
     } catch (Exception $e){
         $_SESSION["message"] = "internal_error";
         exit();

php/controller/updateArticle-controller.php

@@ -8,6 +8,11 @@ require_once '../model/ArticleManager.php';
 require_once '../model/Article.php';
 require_once '../validator/article-validator.php';
 
+if (!isset($_SESSION["user"])) {
+    header("Location: index.php?pfad=login");
+    exit();
+}
+
 if ($_SERVER["REQUEST_METHOD"] === "POST") {
     $_SESSION["old_title"]    = $_POST["title"] ?? '';
     $_SESSION["old_content"]  = $_POST["content"] ?? '';
@@ -22,6 +27,20 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
         exit();
     }
 
+    try {
+        $articleManager = ArticleManager::getInstance();
+        $article = $articleManager->getArticle($id);
+        if ($article->getAuthor() != $_SESSION["user"]->getUsername()) {
+            $_SESSION["message"] = "unauthorized_access";
+            header("location: ../../index.php");
+            exit();
+        }
+    } catch (Exception $e) {
+        $_SESSION["message"] = $e->getMessage();
+        header("location: ../../index.php?pfad=updateArticle&id=$id");
+        exit();
+    }
+
     if (!isset($_POST["title"]) ||!isset($_POST["content"]) || !isset($_POST["category"])){
         $_SESSION["message"] = "missing_parameters";
         header("location: ../../index.php?pfad=updateArticle&id=$id");

php/model/Article.php

@@ -7,13 +7,14 @@
  */
 class Article
 {
-    public $id;
+    private $id;
-    public $title;
+    private $title;
-    public $content;
+    private $content;
-    public $author;
+    private $author;
-    public $creationDate;
+    private $creationDate;
-    public $category;
+    private $category;
-    public $tags;
+    private $tags;
+    private $likes;
 
     /**
      * Konstruktor
@@ -26,7 +27,7 @@ class Article
      * @param $tags string optionale Schlagworte für eine bessere Suche
      * @param $creationDate string Datum der Beitragserstellung
      */
-    public function __construct(int $id, string $title, string $content, string $author, string $category, string $tags, string $creationDate)
+    public function __construct(int $id, string $title, string $content, string $author, string $category, string $tags, string $creationDate, array $likes = [])
     {
         $this->id = $id;
         $this->title = $title;
@@ -35,6 +36,7 @@ class Article
         $this->creationDate = $creationDate;
         $this->category = $category;
         $this->tags = $tags;
+        $this->likes = $likes;
     }
 
     /**
@@ -67,7 +69,7 @@ class Article
 
     /**
      * Gibt den Content eines Beitrags zurück.
-     * TODO: Content muss noch definiert werden.
+     *
      * @return string
      */
     public function getContent(): string
@@ -77,7 +79,7 @@ class Article
 
     /**
      * Setzt den Content eines Beitrags.
-     * TODO: Content muss noch definiert werden.
+     *
      * @param $content
      * @return void
      */
@@ -141,7 +143,34 @@ class Article
         $this->tags = $tags;
     }
 
+    /**
+     * Gibt alle User-IDs zurück, die diesen Beitrag geliked haben.
+     * @return array
+     */
+    public function getLikes(): array
+    {
+        return $this->likes;
+    }
 
+    /**
+     * Gibt die Gesamtzahl der Likes zurück.
+     * @return int
+     */
+    public function getLikeCount(): int
+    {
+        return count($this->likes);
+    }
+
+    /**
+     * Prüft, ob ein bestimmter Nutzer den Beitrag bereits geliked hat.
+     *
+     * @param string $userId
+     * @return bool
+     */
+    public function hasLiked(string $userId): bool
+    {
+        return in_array($userId, $this->likes);
+    }
 
 }
 ?>

php/model/ArticleManagerDAO.php

@@ -92,6 +92,18 @@ interface ArticleManagerDAO
      */
     public function getArticlesByCategory($category);
 
+    /**
+     * Registriert oder entfernt ein Like eines Nutzers für einen Beitrag.
+     * Wenn schon geliked -> Unlike
+     * Wenn noch nicht geliked -> Like
+     *
+     * @param int $articleId Die ID des Beitrags
+     * @param string $userId Die ID des Nutzers
+     * @return bool True wenn geliked, False wenn unliked
+     * @throws InternalServerErrorException
+     * @throws NotFoundException
+     */
+    public function toggleLike(int $articleId, string $userId): bool;
 
 }
 ?>

php/model/DatabaseArticleManager.php

@@ -23,6 +23,7 @@ class DatabaseArticleManager implements ArticleManagerDAO {
 
                 $db = $this->getConnection();
 
+                // Tabelle für Beiträge
                 $db->exec("
                     CREATE TABLE articles (
                         id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -33,6 +34,15 @@ class DatabaseArticleManager implements ArticleManagerDAO {
                         tags TEXT,
                         created TIMESTAMP DEFAULT CURRENT_TIMESTAMP
                     );");
+
+                // Tabelle für Likes
+                $db->exec("
+                CREATE TABLE likes (
+                    article_id INTEGER,
+                    user_id TEXT,
+                    PRIMARY KEY (article_id, user_id),
+                    FOREIGN KEY (article_id) REFERENCES articles(id) ON DELETE CASCADE
+                );");
                 unset($db);
             } catch (PDOException $e) {
                 throw new InternalServerErrorException($e->getMessage());
@@ -189,6 +199,8 @@ class DatabaseArticleManager implements ArticleManagerDAO {
             $row = $command->fetch(PDO::FETCH_ASSOC);
 
             if ($row) {
+                $likes = $this->getLikesForArticle(intval($row['id']));
+
                 return new Article(
                     intval($row['id']),
                     $row['title'],
@@ -196,7 +208,8 @@ class DatabaseArticleManager implements ArticleManagerDAO {
                     $row['author'],
                     $row['category'],
                     $row['tags'],
-                    $row['created']
+                    $row['created'],
+                    $likes
                 );
             }
 
@@ -254,6 +267,8 @@ class DatabaseArticleManager implements ArticleManagerDAO {
             $filteredArticles = [];
 
             foreach ($rows as $row) {
+                $likes = $this->getLikesForArticle(intval($row['id']));
+
                 $filteredArticles[] = new Article(
                     intval($row['id']),
                     $row['title'],
@@ -261,7 +276,8 @@ class DatabaseArticleManager implements ArticleManagerDAO {
                     $row['author'],
                     $row['category'],
                     $row['tags'],
-                    $row['created']
+                    $row['created'],
+                    $likes
                 );
             }
 
@@ -287,6 +303,8 @@ class DatabaseArticleManager implements ArticleManagerDAO {
             $filteredArticles = [];
 
             foreach ($rows as $row) {
+                $likes = $this->getLikesForArticle(intval($row['id']));
+
                 $filteredArticles[] = new Article(
                     intval($row['id']),
                     $row['title'],
@@ -294,7 +312,8 @@ class DatabaseArticleManager implements ArticleManagerDAO {
                     $row['author'],
                     $row['category'],
                     $row['tags'],
-                    $row['created']
+                    $row['created'],
+                    $likes
                 );
             }
 
@@ -341,6 +360,8 @@ class DatabaseArticleManager implements ArticleManagerDAO {
             $filteredArticles = [];
 
             foreach ($rows as $row) {
+                $likes = $this->getLikesForArticle(intval($row['id']));
+
                 $filteredArticles[] = new Article(
                     intval($row['id']),
                     $row['title'] ?? '',
@@ -348,7 +369,8 @@ class DatabaseArticleManager implements ArticleManagerDAO {
                     $row['author'] ?? '',
                     $row['category'] ?? '',
                     $row['tags'] ?? '',
-                    $row['created'] ?? '' // Nutzt 'created' aus deiner DB-Struktur
+                    $row['created'] ?? '',
+                    $likes
                 );
             }
 
@@ -359,4 +381,69 @@ class DatabaseArticleManager implements ArticleManagerDAO {
         }
     }
 
+    /**
+     * Holt alle User-IDs, die einen bestimmten Beitrag geliked haben.
+     *
+     * @return String[] UserIDs
+     * @throws InternalServerErrorException
+     */
+    private function getLikesForArticle(int $articleId): array
+    {
+        try {
+            $db = $this->getConnection();
+            $sql = "SELECT user_id FROM likes WHERE article_id = :article_id;";
+            $command = $db->prepare($sql);
+            $command->execute([':article_id' => $articleId]);
+
+            return $command->fetchAll(PDO::FETCH_COLUMN) ?: [];
+        } catch (PDOException $e) {
+            return [];
+        }
+    }
+
+    public function toggleLike(int $articleId, string $userId): bool
+    {
+        // prüfen, ob der Artikel überhaupt existiert
+        $article = $this->getArticle($articleId);
+        if (!$article) {
+            throw new NotFoundException("missing_id");
+        }
+
+        try {
+            $db = $this->getConnection();
+
+            // prüfen, ob das Like bereits existiert
+            $checkSql = "SELECT COUNT(*) FROM likes WHERE article_id = :article_id AND user_id = :user_id;";
+            $checkCommand = $db->prepare($checkSql);
+            $checkCommand->execute([
+                ':article_id' => $articleId,
+                ':user_id'    => $userId
+            ]);
+
+            $hasLiked = (int)$checkCommand->fetchColumn() > 0;
+
+            if ($hasLiked) {
+                // wenn bereits geliked -> Unlike
+                $deleteSql = "DELETE FROM likes WHERE article_id = :article_id AND user_id = :user_id;";
+                $deleteCommand = $db->prepare($deleteSql);
+                $deleteCommand->execute([
+                    ':article_id' => $articleId,
+                    ':user_id'    => $userId
+                ]);
+                return false; // gibt false zurück, da der Beitrag jetzt nicht mehr geliked ist
+            } else {
+                // wenn noch nicht geliked -> Like
+                $insertSql = "INSERT INTO likes (article_id, user_id) VALUES (:article_id, :user_id);";
+                $insertCommand = $db->prepare($insertSql);
+                $insertCommand->execute([
+                    ':article_id' => $articleId,
+                    ':user_id'    => $userId
+                ]);
+                return true; // gibt true zurück, da der Beitrag jetzt geliked ist
+            }
+
+        } catch (PDOException $e) {
+            throw new InternalServerErrorException("internal_error");
+        }
+    }
 }

php/model/LocalArticleManager.php

@@ -62,7 +62,8 @@ class LocalArticleManager implements ArticleManagerDAO {
             "author" => $author,
             "category" => $category,
             "tags" => $tags,
-            "creationDate" => date("Y-m-d H:i:s")
+            "creationDate" => date("Y-m-d H:i:s"),
+            "likes" => []
         ];
 
         $this->saveArticle($articles);
@@ -92,7 +93,8 @@ class LocalArticleManager implements ArticleManagerDAO {
                     "author" => $author,
                     "category" => $article->getCategory(),
                     "tags" => $article->getTags(),
-                    "creationDate" => $article->getCreationDate()
+                    "creationDate" => $article->getCreationDate(),
+                    "likes" => $storedArticle['likes'] ?? []
                 ];
                 $updated = true;
                 break;
@@ -142,7 +144,17 @@ class LocalArticleManager implements ArticleManagerDAO {
 
         foreach ($articles as $article) {
             if (isset($article['id']) && $article['id'] == $id) {
-                return new Article(intval($article['id']), $article['title'], $article['content'], $article['author'], $article['category'], $article['tags'], $article['creationDate']);
+                $likes = isset($article['likes']) && is_array($article['likes']) ? $article['likes'] : [];
+                return new Article(
+                    intval($article['id']),
+                    $article['title'],
+                    $article['content'],
+                    $article['author'],
+                    $article['category'],
+                    $article['tags'],
+                    $article['creationDate'],
+                    $likes
+                    );
             }
         }
 
@@ -168,6 +180,7 @@ class LocalArticleManager implements ArticleManagerDAO {
 
         foreach ($articles as $article) {
             if (isset($article['author']) && $article['author'] == $author) {
+                $likes = isset($article['likes']) && is_array($article['likes']) ? $article['likes'] : [];
                 $filteredArticles[] = new Article(
                     intval($article['id']),
                     $article['title'],
@@ -175,7 +188,8 @@ class LocalArticleManager implements ArticleManagerDAO {
                     $article['author'],
                     $article['category'],
                     $article['tags'],
-                    $article['creationDate']
+                    $article['creationDate'],
+                    $likes
                 );
             }
         }
@@ -201,6 +215,7 @@ class LocalArticleManager implements ArticleManagerDAO {
             if (($cleanKeyword !== '' && strpos($title, $cleanKeyword) !== false) ||
                 ($cleanKeyword !== '' && strpos($content, $cleanKeyword) !== false)) {
 
+                $likes = isset($article['likes']) && is_array($article['likes']) ? $article['likes'] : [];
                 $filteredArticles[] = new Article(
                     intval($article['id'] ?? 0),
                     $article['title'] ?? '',
@@ -208,7 +223,8 @@ class LocalArticleManager implements ArticleManagerDAO {
                     $article['author'] ?? '',
                     $article['category'] ?? '',
                     $article['tags'] ?? '',
-                    $article['creationDate'] ?? ''
+                    $article['creationDate'] ?? '',
+                    $likes
                 );
             }
         }
@@ -223,6 +239,7 @@ class LocalArticleManager implements ArticleManagerDAO {
 
         foreach ($articles as $article) {
             if (isset($article['category']) && $article['category'] == $category) {
+                $likes = isset($article['likes']) && is_array($article['likes']) ? $article['likes'] : [];
                 $filteredArticles[] = new Article(
                     intval($article['id']),
                     $article['title'],
@@ -230,12 +247,53 @@ class LocalArticleManager implements ArticleManagerDAO {
                     $article['author'],
                     $article['category'],
                     $article['tags'],
-                    $article['creationDate']
+                    $article['creationDate'],
+                    $likes
                 );
             }
         }
         return $filteredArticles;
     }
 
+    public function toggleLike(int $articleId, string $userId): bool
+    {
+        $articles = $this->getAllArticles();
+        $articleFound = false;
+        $isLikedNow = false;
+
+        foreach ($articles as $index => $article) {
+            if (isset($article['id']) && $article['id'] == $articleId) {
+                $articleFound = true;
+
+                // Likes-Array initialisieren, falls nicht vorhanden
+                if (!isset($articles[$index]['likes']) || !is_array($articles[$index]['likes'])) {
+                    $articles[$index]['likes'] = [];
+                }
+
+                $likeIndex = array_search($userId, $articles[$index]['likes']);
+
+                if ($likeIndex !== false) {
+                    // Bereits geliked -> Unlike
+                    unset($articles[$index]['likes'][$likeIndex]);
+                    // Array-Keys neu indizieren, damit JSON sauber bleibt
+                    $articles[$index]['likes'] = array_values($articles[$index]['likes']);
+                    $isLikedNow = false;
+                } else {
+                    // Noch nicht geliked -> Like (User-ID hinzufügen)
+                    $articles[$index]['likes'][] = $userId;
+                    $isLikedNow = true;
+                }
+                break;
+            }
+        }
+
+        if (!$articleFound) {
+            throw new NotFoundException("missing_id");
+        }
+
+        $this->saveArticle($articles);
+        return $isLikedNow;
+    }
+
 }
 ?>

php/validator/search-validator.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Prüft, ob eine Suchanfrage gültig ist.
+ *
+ * Erlaubt werden Buchstaben, Zahlen, Umlaute, typische Satzzeichen und Leerzeichen.
+ * Die Länge muss zwischen 1 und 50 Zeichen liegen.
+ *
+ * @param string $query Zu prüfender Suchbegriff
+ *
+ * @return bool true wenn die Suche gültig ist, sonst false
+ */
+function searchQueryValidator($query)
+{
+    $query = trim($query);
+    
+    // Mindestens 1 Zeichen, maximal 50 Zeichen
+    $length = mb_strlen($query);
+    if ($length < 1 || $length > 50) {
+        return false;
+    }
+
+    // Erlaubt Buchstaben (inkl. Umlaut/ß), Zahlen, Leerzeichen sowie ?, !, ., -, _
+    $searchPattern = '/^[a-zA-Z0-9äöüÄÖÜß\s?!.,\-_]+$/u';
+
+    return preg_match($searchPattern, $query) === 1;
+}
+
+/**
+ * Prüft, ob das gewählte Treffer-Limit erlaubt ist.
+ *
+ * @param int|string $limit Das zu prüfende Limit
+ *
+ * @return bool true wenn das Limit 10, 20, 50 oder 100 ist, sonst false
+ */
+function searchLimitValidator($limit)
+{
+    $allowedLimits = [10, 20, 50, 100];
+    return in_array((int)$limit, $allowedLimits, true);
+}