Update index-controller.php

content/search-results.php

@@ -2,37 +2,20 @@
 if (session_status() === PHP_SESSION_NONE) {
     session_start();
 }
-require_once __DIR__ . '/../includes/resultsHelper.php';
 
-$rawResults = $_SESSION["search_results"] ?? [];
+$all_results = $_SESSION["search_results"] ?? [];
 $query = $_SESSION["search_query"] ?? "";
+$totalResultsCount = count($all_results);
 
-// Sortierung / Kategorie / Limit: GET-Parameter haben Vorrang, sonst
+$limit = isset($_GET['limit']) ? (int)$_GET['limit'] : 10;
-// Rückfall auf die zuletzt in der Session gemerkten Werte. So bleibt
-// z.B. ein reiner Pagination-Link (?page=2) bei der aktuellen
-// Sortierung/Filterung.
-$currentSort = $_GET['sort'] ?? ($_SESSION['search_sort'] ?? 'alphabet');
-if (!in_array($currentSort, ['alphabet', 'likes', 'newest', 'oldest'])) {
-    $currentSort = 'alphabet';
-}
-$_SESSION['search_sort'] = $currentSort;
-
-$currentCategory = strtolower($_GET['category'] ?? ($_SESSION['search_category'] ?? 'all'));
-$_SESSION['search_category'] = $currentCategory;
-
-$limit = isset($_GET['limit']) ? (int)$_GET['limit'] : ($_SESSION['search_limit'] ?? 10);
 if (!in_array($limit, [10, 20, 50, 100])) {
     $limit = 10;
 }
-$_SESSION['search_limit'] = $limit;
 
-// Serverseitig sortieren + filtern
+// Gesamtseitenzahl
-$filteredResults = sortSearchResults($rawResults, $currentSort);
+$totalPages = max(1, ceil($totalResultsCount / $limit));
-$filteredResults = filterSearchResultsByCategory($filteredResults, $currentCategory);
-
-$totalResultsCount = count($filteredResults);
-$totalPages = max(1, (int)ceil($totalResultsCount / $limit));
 
+// Aktuelle Seite auslesen und validieren
 $currentPage = isset($_GET['page']) ? (int)$_GET['page'] : 1;
 if ($currentPage < 1) {
     $currentPage = 1;
@@ -40,59 +23,42 @@ if ($currentPage < 1) {
     $currentPage = $totalPages;
 }
 
+// Startpunkt im Array berechnen (Offset)
 $offset = ($currentPage - 1) * $limit;
 
-// Dies ist die No-JS-Basisversion: nur die aktuelle Seite wird gerendert.
+// Nur die Ergebnisse für die aktuelle Seite ausschneiden
-// Bei aktiviertem JS lädt js/results-app.js zusätzlich den kompletten
+//$results = array_slice($all_results, $offset, $limit);
-// Datensatz nach (ein einziger Request) und übernimmt Sortierung, Filter
+$results = $all_results;
-// und Pagination danach komplett im Browser, ohne weitere Serveranfragen.
-$results = array_slice($filteredResults, $offset, $limit);
 $resultCount = count($results);
 
-// Kategorien für das Auswahlfeld (Wert => Label)
-$categories = [
-        'Deutsch' => 'Deutsch', 'Englisch' => 'Englisch', 'Franzoesisch' => 'Französisch',
-        'Latein' => 'Latein', 'Literatur' => 'Literatur', 'Mathematik' => 'Mathematik',
-        'Biologie' => 'Biologie', 'Informatik' => 'Informatik', 'Chemie' => 'Chemie',
-        'Physik' => 'Physik', 'Astronomie' => 'Astronomie', 'Geschichte' => 'Geschichte',
-        'Erdkunde' => 'Erdkunde', 'Sozialkunde' => 'Sozialkunde', 'Wirtschaftskunde' => 'Wirtschaftskunde',
-        'Religion' => 'Religion', 'Ethikunterricht' => 'Ethikunterricht', 'Philosophie' => 'Philosophie',
-        'Psychologie' => 'Psychologie', 'Kunst' => 'Kunst', 'Musik' => 'Musik', 'Theater' => 'Theater',
-        'Technik' => 'Technik', 'Werken' => 'Werken', 'Hauswirtschaft' => 'Hauswirtschaft', 'Sport' => 'Sport',
-];
 ?>
+<noscript>
+    Bitte JavaScript aktivieren!
+</noscript>
 <!--
     Seite: Suchergebnisse
-    Inhalt: Zeigt die Ergebnisse einer Suche an.
+    Inhalt: Zeigt die Ergebnisse einer Suche an
-    Funktioniert ohne JavaScript (serverseitige Sortierung/Filter/Pagination
-    über echte Links + Formulare) und wird bei aktiviertem JS von
-    js/search-results.js vollständig client-seitig übernommen.
 -->
 <div class="s-res-layout-grid">
-    <?php include_once "includes/alertMessages.php" ?>
+    <?php include_once "includes/alertMessages.php"?>
 
     <!-- Links: Seitenleiste für Filter und Suche -->
     <aside class="s-res-sidebar">
 
-        <!-- Formular 1: startet eine NEUE Suche (löst immer einen Server-Request aus) -->
+    <!-- Sortierfuntion Box und Such Box-->
         <form action="php/controller/search-results-controller.php" method="GET" id="search-form-id" class="s-res-sidebar-form">
+            
+            <input type="hidden" id="s-res-page-input" name="page" value="<?php echo $_GET['page'] ?? 1; ?>">
+
             <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>
             </div>
-        </form>
-
-        <!-- Formular 2: sortiert/filtert die BEREITS gefundenen Ergebnisse.
-             Ohne JS: echter Reload dieser Seite, aber ohne erneute Datenbank-Suche.
-             Mit JS: search-results.js übernimmt das live im Browser, der Submit-Button
-             wird dafür nicht benötigt und über <noscript> versteckt. -->
-        <form action="index.php" method="GET" id="s-res-filter-form" class="s-res-sidebar-form">
-            <input type="hidden" name="pfad" value="search-results">
-            <input type="hidden" name="q" value="<?php echo htmlspecialchars($query); ?>">
 
             <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" class="sort-radio" <?php echo $currentSort === 'alphabet' ? 'checked' : ''; ?>>
@@ -115,17 +81,37 @@ $categories = [
 
             <div class="s-res-sidebar-box">
                 <h3 class="s-res-sidebar-title">Kategorie filtern</h3>
-                <select id="category-filter" name="category" class="s-res-limit-select" style="width: 100%; padding: 8px; border-radius: 6px; border: 1px solid #cbd5e1;">
+                <select id="category-filter" class="s-res-limit-select" style="width: 100%; padding: 8px; border-radius: 6px; border: 1px solid #cbd5e1;">
-                    <option value="all" <?php echo $currentCategory === 'all' ? 'selected' : ''; ?>>Alle Kategorien</option>
+                    <option value="all">Alle Kategorien</option>
-                    <?php foreach ($categories as $value => $label): ?>
+                    <option value="Deutsch">Deutsch</option>
-                        <option value="<?php echo htmlspecialchars($value); ?>" <?php echo $currentCategory === strtolower($value) ? 'selected' : ''; ?>><?php echo htmlspecialchars($label); ?></option>
+                    <option value="Englisch">Englisch</option>
-                    <?php endforeach; ?>
+                    <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>
 
-            <noscript>
-                <button type="submit" class="nav__search-button">Filter anwenden</button>
-            </noscript>
         </form>
 
     </aside>
@@ -134,15 +120,17 @@ $categories = [
 
         <div class="s-res-header">
             <h1 class="s-res-main-title">Suchergebnisse</h1>
-            <p class="s-res-meta"><span id="s-res-result-count"><?php echo $totalResultsCount; ?></span> Treffer für Ihre Suchanfrage "<?php echo htmlspecialchars($query); ?>"</p>
+            <p class="s-res-meta"><?php echo $totalResultsCount; ?> Treffer für Ihre Suchanfrage "<?php echo htmlspecialchars($query); ?>"</p>
         </div>
 
         <!-- Ergebnisliste -->
         <div class="s-res-list">
-            <?php if (!empty($results)): ?>
+            <?php 
+            if (!empty($results)): ?>
     
                 <?php foreach ($results as $item): 
-                    $likesCount = getLikeCount($item);
+                    // Anzahl der Likes ermitteln (falls es ein Array ist, zählen; falls Zahl, direkt nutzen)
+                    $likesCount = isset($item['likes']) && is_array($item['likes']) ? count($item['likes']) : ($item['likes'] ?? 0);
                 ?>
                     <div class="s-res-item" data-likes="<?php echo $likesCount; ?>" data-category="<?php echo strtolower($item['category'] ?? ''); ?>">
                         <div class="s-res-content">
@@ -163,48 +151,39 @@ $categories = [
                     </div>
                 <?php endforeach; ?>
 
-            <?php elseif (isset($_SESSION["message"]) && $_SESSION["message"] === "invalid_search_query"): ?>
+            <?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"] == "invalid_search_query"): ?>
                 <p>Unzulässige Suchanfrage</p>
                 
-            <?php elseif ($query !== "" && $totalResultsCount === 0 && count($rawResults) > 0): ?>
-                <p>Keine Beiträge in dieser Kategorie gefunden.</p>
-
-            <?php elseif ($query !== "" && $totalResultsCount === 0): ?>
-                <p>Keine Beiträge zu diesem Suchbegriff gefunden.</p>
-
             <?php endif; ?>
-            <?php unset($_SESSION["message"]); ?>
+            <?php
+            unset($_SESSION["message"]);
+            ?>
 
         </div>
-
         <div class="s-res-pagination-footer">
 
-            <!-- Auswahl der Ergebnisse pro Seite. Gehört per form="..." logisch
+            <!-- Auswahl der Ergebnisse pro Seite -->
-                 zum Filterformular oben -->
             <div class="s-res-limit-selector">
                 <label for="s-res-per-page" class="s-res-limit-label">Ergebnisse pro Seite:</label>
-                <select id="s-res-per-page" name="limit" form="s-res-filter-form" class="s-res-limit-select">
+                <select id="s-res-per-page" name="limit" class="s-res-limit-select">
                     <option value="10" <?php echo $limit === 10 ? 'selected' : ''; ?>>10</option>
                     <option value="20" <?php echo $limit === 20 ? 'selected' : ''; ?>>20</option>
                     <option value="50" <?php echo $limit === 50 ? 'selected' : ''; ?>>50</option>
                     <option value="100" <?php echo $limit === 100 ? 'selected' : ''; ?>>100</option>
                 </select>
-                <noscript><button type="submit" form="s-res-filter-form" class="nav__search-button">Übernehmen</button></noscript>
             </div>
 
-            <nav class="s-res-page-navigation" aria-label="Seitennavigation">
+            <div class="s-res-page-navigation">
-                <!-- No-JS-Fallback: -->
+                <button type="button" class="s-res-page-btn" id="prev-page-btn" data-page="0">«</button>
-                <noscript>
-                    <?php echo renderNoJsPagination($currentPage, $totalPages, $query, $currentSort, $currentCategory, $limit); ?>
-                </noscript>
                 
-                <!-- JS-Version: wird per search-results.js befüllt/eingeblendet: -->
-                <div id="js-page-navigation" style="display:none;">
-                    <button type="button" class="s-res-page-btn" id="prev-page-btn">«</button>
                 <span id="dynamic-page-numbers"></span>
-                    <button type="button" class="s-res-page-btn" id="next-page-btn">»</button>
+                
+                <button type="button" class="s-res-page-btn" id="next-page-btn" data-page="2">»</button>
             </div>
-            </nav>
 
         </div>
     </main>

content/showCategory.php

@@ -1,184 +1,111 @@
 <?php
-if (session_status() === PHP_SESSION_NONE) {
-    session_start();
-}
 include_once "php/controller/showCategory-controller.php";
-require_once __DIR__ . '/../includes/resultsHelper.php';
 
-$rawResults = $_SESSION['category_results'] ?? [];
+$currentSort = isset($sortStyle) ? $sortStyle : 'alphabet';
-$category = $_SESSION['category_name'] ?? ($_GET['category'] ?? '');
+$currentPage = isset($page) ? $page : 1;
-
-// Sortierung / Suche / Limit: GET-Parameter haben Vorrang, sonst Rückfall auf
-// die zuletzt in der Session gemerkten Werte (analog zu search-results.php).
-$currentSort = $_GET['sort'] ?? ($_SESSION['cat_sort'] ?? 'alphabet');
-if (!in_array($currentSort, ['alphabet', 'likes', 'newest', 'oldest'])) {
-    $currentSort = 'alphabet';
-}
-$_SESSION['cat_sort'] = $currentSort;
-
-$query = trim($_GET['q'] ?? ($_SESSION['cat_query'] ?? ''));
-$_SESSION['cat_query'] = $query;
-
-$limit = isset($_GET['limit']) ? (int)$_GET['limit'] : ($_SESSION['cat_limit'] ?? 10);
-if (!in_array($limit, [10, 20, 50, 100])) {
-    $limit = 10;
-}
-$_SESSION['cat_limit'] = $limit;
-
-// Serverseitig sortieren + nach Suchbegriff filtern (Kategorie steht bereits fest)
-$filteredResults = sortSearchResults($rawResults, $currentSort);
-$filteredResults = filterResultsByQuery($filteredResults, $query);
-
-$totalResultsCount = count($filteredResults);
-$totalPages = max(1, (int)ceil($totalResultsCount / $limit));
-
-$currentPage = isset($_GET['page']) ? (int)$_GET['page'] : 1;
-if ($currentPage < 1) {
-    $currentPage = 1;
-} elseif ($currentPage > $totalPages) {
-    $currentPage = $totalPages;
-}
-
-$offset = ($currentPage - 1) * $limit;
-
-// Dies ist die No-JS-Basisversion: nur die aktuelle Seite wird gerendert.
-// Bei aktiviertem JS lädt js/showCategory.js zusätzlich den kompletten
-// Kategorie-Datensatz nach (ein einziger Request) und übernimmt Sortierung,
-// Suche und Pagination danach komplett im Browser, ohne weitere Serveranfragen.
-$results = array_slice($filteredResults, $offset, $limit);
-$resultCount = count($results);
 ?>
-<!--
-    Seite: Kategorie-Ansicht
-    Inhalt: Zeigt alle Beiträge einer Kategorie an, sortierbar und innerhalb
-    der Kategorie durchsuchbar.
-    Funktioniert ohne JavaScript (serverseitige Sortierung/Suche/Pagination
-    über echte Links + Formulare) und wird bei aktiviertem JS von
-    js/showCategory.js vollständig client-seitig übernommen.
--->
-<div class="s-res-layout-grid">
-    <?php include_once "includes/alertMessages.php" ?>
 
-    <!-- Links: Seitenleiste für Suche (innerhalb der Kategorie) und Sortierung -->
+<noscript>
-    <aside class="s-res-sidebar">
+    Bitte JavaScript aktivieren!
+</noscript>
 
-        <!-- Sortiert/durchsucht die BEREITS geladenen Kategorie-Beiträge.
+<!-- Das Formular umschließt jetzt das gesamte Layout -->
-             Ohne JS: echter Reload dieser Seite, aber ohne erneute Datenbank-Abfrage.
+<form id="search-form-id" action="index.php" method="GET" style="display: contents;">
-             Mit JS: js/showCategory.js übernimmt das live im Browser, der Submit-Button
-             wird dafür nicht benötigt und über <noscript> versteckt. -->
-        <form action="index.php" method="GET" id="cat-filter-form" class="s-res-sidebar-form">
     <input type="hidden" name="pfad" value="showCategory">
-            <input type="hidden" name="category" value="<?php echo htmlspecialchars($category); ?>">
+    <input type="hidden" name="category" value="<?php echo (isset($category) && !empty($category)) ? htmlspecialchars($category) : ''; ?>">
+    <input type="hidden" id="s-res-page-input" name="page" value="<?php echo $currentPage; ?>">
 
-            <div class="s-res-sidebar-box">
+    <div class="cat-view-container">
-                <h3 class="s-res-sidebar-title">In dieser Kategorie suchen</h3>
-                <input type="search" id="cat-search-input" name="q" placeholder="Suchen..." class="nav__search" value="<?php echo htmlspecialchars($query); ?>" maxlength="50">
-            </div>
 
-            <div class="s-res-sidebar-box">
+        <!-- LINKE SPALTE: SEITENLEISTE FÜR SORTIERUNG -->
-                <h3 class="s-res-sidebar-title">Sortierung</h3>
+        <aside class="cat-sidebar">
-                <div class="s-res-filter-group">
+            <div class="cat-sidebar-box">
-                    <label class="s-res-filter-option">
+                <h3 class="cat-sidebar-title">Sortierung</h3>
-                        <input type="radio" name="sort" value="alphabet" class="sort-radio" <?php echo $currentSort === 'alphabet' ? 'checked' : ''; ?>>
+                <div class="cat-filter-group">
-                        <span>Alphabetisch</span>
+                    <label class="cat-filter-option">
+                        <input type="radio" name="sort" value="alphabet" <?php echo ($currentSort === 'alphabet') ? 'checked' : ''; ?> onchange="this.form.submit();">
+                        Alphabetisch
                     </label>
-                    <label class="s-res-filter-option">
+                    <label class="cat-filter-option">
-                        <input type="radio" name="sort" value="likes" class="sort-radio" <?php echo $currentSort === 'likes' ? 'checked' : ''; ?>>
+                        <input type="radio" name="sort" value="likes" <?php echo ($currentSort === 'likes') ? 'checked' : ''; ?> onchange="this.form.submit();">
-                        <span>Beliebtheit (Likes)</span>
+                        Beliebtheit (Likes)
                     </label>
-                    <label class="s-res-filter-option">
+                    <label class="cat-filter-option">
-                        <input type="radio" name="sort" value="newest" class="sort-radio" <?php echo $currentSort === 'newest' ? 'checked' : ''; ?>>
+                        <input type="radio" name="sort" value="newest" <?php echo ($currentSort === 'newest') ? 'checked' : ''; ?> onchange="this.form.submit();">
-                        <span>Neueste Beiträge</span>
+                        Neueste Beiträge
                     </label>
-                    <label class="s-res-filter-option">
+                    <label class="cat-filter-option">
-                        <input type="radio" name="sort" value="oldest" class="sort-radio" <?php echo $currentSort === 'oldest' ? 'checked' : ''; ?>>
+                        <input type="radio" name="sort" value="oldest" <?php echo ($currentSort === 'oldest') ? 'checked' : ''; ?> onchange="this.form.submit();">
-                        <span>Älteste Beiträge</span>
+                        Älteste Beiträge
                     </label>
                 </div>
             </div>
-
-            <noscript>
-                <button type="submit" class="nav__search-button">Anwenden</button>
-            </noscript>
-        </form>
-
         </aside>
 
-    <main class="s-res-main-content">
+        <!-- RECHTE SPALTE: INHALT & PAGINATOR -->
-
+        <main class="cat-view-main">
-        <div class="s-res-header">
+            <div class="cat-view-header">
-            <h1 class="s-res-main-title">Kategorie: <?php echo htmlspecialchars($category); ?></h1>
+                <h1 class="cat-view-title">Kategorie: <?php echo (isset($category) && !empty($category)) ? htmlspecialchars($category) : 'Unbekannt'; ?></h1>
-            <p class="s-res-meta">
+                <p class="cat-view-meta-text">
-                <span id="s-res-result-count"><?php echo $totalResultsCount; ?></span> Treffer in dieser Kategorie<?php echo $query !== '' ? ' für "' . htmlspecialchars($query) . '"' : ''; ?>
+                    <?php echo (isset($totalArticles)) ? $totalArticles : 0; ?> Treffer in dieser Kategorie
                 </p>
             </div>
 
-        <!-- Ergebnisliste -->
+            <!-- Beiträge -->
-        <div class="s-res-list">
+            <div class="cat-view-list">
-            <?php if (!empty($results)): ?>
+                <?php if (isset($articles) && !empty($articles)): ?>
-
+                    <?php foreach ($articles as $article): ?>
-                <?php foreach ($results as $item):
+                        <div class="cat-view-item">
-                    $likesCount = getLikeCount($item);
+                            <div class="cat-view-content">
-                    ?>
+                                <h2 class="cat-view-item-title">
-                    <div class="s-res-item" data-likes="<?php echo $likesCount; ?>" data-category="<?php echo strtolower($item['category'] ?? ''); ?>">
+                                    <a href="index.php?pfad=showArticle&id=<?php echo htmlspecialchars($article->getID()); ?>" class="cat-view-link">
-                        <div class="s-res-content">
+                                        <?php echo (isset($article) && !empty($article->getTitle())) ? htmlspecialchars($article->getTitle()) : 'Kein Titel'; ?>
-                            <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>
-                            <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">
+                                <div class="cat-view-meta-row">
-                                    ❤️ <?php echo $likesCount; ?>
+                                    <p class="cat-view-author">
+                                        von <span class="cat-view-author-name"><?php echo (isset($article) && !empty($article->getAuthor())) ? htmlspecialchars($article->getAuthor()) : 'Anonym'; ?></span>
+                                    </p>
+                                    <span class="cat-view-likes">
+                                        ❤️ <?php echo (isset($article) && !empty($article->getLikes())) ? htmlspecialchars($article->getLikes()) : '0'; ?>
                                     </span>
                                 </div>
+                                
                             </div>
-                        <div class="s-res-arrow">&rarr;</div>
+                            <div class="cat-view-arrow">&rarr;</div>
                         </div>
                     <?php endforeach; ?>
-
-            <?php elseif ($query !== ''): ?>
-                <p>Keine Beiträge in dieser Kategorie zu diesem Suchbegriff gefunden.</p>
-
                 <?php else: ?>
-                <p>Keine Beiträge in dieser Kategorie gefunden.</p>
+                    <p class="cat-view-meta-text">Keine Artikel in dieser Kategorie gefunden.</p>
-
                 <?php endif; ?>
-            <?php unset($_SESSION["message"]); ?>
-
             </div>
 
-        <div class="s-res-pagination-footer">
+            <!-- Footer Paginator -->
+            <?php if (isset($totalPages) && $totalPages > 1): ?>
+                <div class="cat-view-pagination-footer">
+                    <div></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' : ''; ?>>
+                            &laquo;
+                        </button>
 
-            <!-- Auswahl der Ergebnisse pro Seite -->
+                        <?php for ($i = 1; $i <= $totalPages; $i++): ?>
-            <div class="s-res-limit-selector">
+                            <button type="button"
-                <label for="s-res-per-page" class="s-res-limit-label">Ergebnisse pro Seite:</label>
+                                    class="s-res-page-btn <?php echo ($i === $currentPage) ? 'cat-active-btn' : ''; ?>"
-                <select id="s-res-per-page" name="limit" form="cat-filter-form" class="s-res-limit-select">
+                                    data-page="<?php echo $i; ?>"
-                    <option value="10" <?php echo $limit === 10 ? 'selected' : ''; ?>>10</option>
+                                    <?php echo ($i === $currentPage) ? 'disabled' : ''; ?>>
-                    <option value="20" <?php echo $limit === 20 ? 'selected' : ''; ?>>20</option>
+                                <?php echo $i; ?>
-                    <option value="50" <?php echo $limit === 50 ? 'selected' : ''; ?>>50</option>
+                            </button>
-                    <option value="100" <?php echo $limit === 100 ? 'selected' : ''; ?>>100</option>
+                        <?php endfor; ?>
-                </select>
+
-                <noscript><button type="submit" form="cat-filter-form" class="nav__search-button">Übernehmen</button></noscript>
+                        <button type="button" class="s-res-page-btn" data-page="<?php echo $currentPage + 1; ?>" <?php echo ($currentPage >= $totalPages) ? 'disabled' : ''; ?>>
+                            &raquo;
+                        </button>
                     </div>
-
-            <nav class="s-res-page-navigation" aria-label="Seitennavigation">
-                <!-- No-JS-Fallback: -->
-                <noscript>
-                    <?php echo renderNoJsPaginationCategory($currentPage, $totalPages, $category, $currentSort, $query, $limit); ?>
-                </noscript>
-
-                <!-- JS-Version: wird per js/showCategory.js befüllt/eingeblendet: -->
-                <div id="js-page-navigation" style="display:none;">
-                    <button type="button" class="s-res-page-btn" id="prev-page-btn">«</button>
-                    <span id="dynamic-page-numbers"></span>
-                    <button type="button" class="s-res-page-btn" id="next-page-btn">»</button>
-                </div>
-            </nav>
-
                 </div>
+            <?php endif; ?>
         </main>
 
-</div>
+    </div>
+</form>

includes/resultsHelper.php

@@ -1,171 +0,0 @@
-<?php
-/**
- * Hilfsfunktionen rund um die Suchergebnisse.
- *
- * Werden sowohl von content/search-results.php (No-JS-Rendering)
- * als auch von php/controller/search-results-data.php (JSON für
- * die JS-Hydration) genutzt, damit Sortier-/Filterlogik nur an
- * einer Stelle gepflegt werden muss
- */
-
-function getLikeCount($item): int
-{
-    if (isset($item['likes']) && is_array($item['likes'])) {
-        return count($item['likes']);
-    }
-    return (int)($item['likes'] ?? 0);
-}
-
-/**
- * Sortiert die Ergebnisse
- */
-function sortSearchResults(array $results, string $sortStyle): array
-{
-    switch ($sortStyle) {
-        case 'likes':
-            usort($results, function ($a, $b) {
-                return getLikeCount($b) <=> getLikeCount($a);
-            });
-            break;
-        case 'newest':
-            usort($results, function ($a, $b) {
-                return strcmp($b['creationDate'] ?? '', $a['creationDate'] ?? '');
-            });
-            break;
-        case 'oldest':
-            usort($results, function ($a, $b) {
-                return strcmp($a['creationDate'] ?? '', $b['creationDate'] ?? '');
-            });
-            break;
-        case 'alphabet':
-        default:
-            usort($results, function ($a, $b) {
-                return strcasecmp($a['title'] ?? '', $b['title'] ?? '');
-            });
-            break;
-    }
-    return $results;
-}
-
-/**
- * Filtert die Ergebnisse ('all' = kein Filter).
- */
-function filterSearchResultsByCategory(array $results, string $category): array
-{
-    $category = strtolower(trim($category));
-    if ($category === '' || $category === 'all') {
-        return $results;
-    }
-    return array_values(array_filter($results, function ($item) use ($category) {
-        return strtolower($item['category'] ?? '') === $category;
-    }));
-}
-
-/**
- * Baut eine Such-Ergebnis-URL für einen bestimmten Seitenwechsel (No-JS-Pagination).
- */
-function buildSearchResultsUrl(int $page, string $query, string $sort, string $category, int $limit): string
-{
-    return "index.php?pfad=search-results"
-        . "&q=" . urlencode($query)
-        . "&sort=" . urlencode($sort)
-        . "&category=" . urlencode($category)
-        . "&limit=" . $limit
-        . "&page=" . $page;
-}
-
-/**
- * Rendert eine rein serverseitige Pagination für den No-JS-Fall:
- */
-function renderNoJsPagination(int $currentPage, int $totalPages, string $query, string $sort, string $category, int $limit): string
-{
-    $html = '';
-
-    if ($currentPage > 1) {
-        $html .= '<a class="s-res-page-btn" href="' . htmlspecialchars(buildSearchResultsUrl($currentPage - 1, $query, $sort, $category, $limit)) . '">&laquo;</a> ';
-    } else {
-        $html .= '<span class="s-res-page-btn" aria-disabled="true">&laquo;</span> ';
-    }
-
-    for ($i = 1; $i <= $totalPages; $i++) {
-        if ($i === $currentPage) {
-            $html .= '<span class="s-res-page-btn s-res-page-btn-active">' . $i . '</span> ';
-        } else {
-            $html .= '<a class="s-res-page-btn" href="' . htmlspecialchars(buildSearchResultsUrl($i, $query, $sort, $category, $limit)) . '">' . $i . '</a> ';
-        }
-    }
-
-    if ($currentPage < $totalPages) {
-        $html .= '<a class="s-res-page-btn" href="' . htmlspecialchars(buildSearchResultsUrl($currentPage + 1, $query, $sort, $category, $limit)) . '">&raquo;</a>';
-    } else {
-        $html .= '<span class="s-res-page-btn" aria-disabled="true">&raquo;</span>';
-    }
-
-    return $html;
-}
-
-
-/**
- * Filtert Ergebnisse anhand eines Suchbegriffs
- *
- * Wird von content/showCategory.php genutzt, um innerhalb einer bereits
- * geladenen Kategorie zu suchen.
- */
-function filterResultsByQuery(array $results, string $query): array
-{
-    $query = trim($query);
-    if ($query === '') {
-        return $results;
-    }
-    $needle = mb_strtolower($query);
-    return array_values(array_filter($results, function ($item) use ($needle) {
-        $haystack = mb_strtolower(($item['title'] ?? '') . ' ' . ($item['content'] ?? ''));
-        return mb_strpos($haystack, $needle) !== false;
-    }));
-}
-
-/**
- * Baut eine Kategorie-URL für einen bestimmten Seitenwechsel (No-JS-Pagination).
- * Analog zu buildSearchResultsUrl, aber für pfad=showCategory (feste Kategorie,
- * dafür mit Freitext-Suche innerhalb der Kategorie statt Kategorie-Filter).
- */
-function buildCategoryUrl(int $page, string $category, string $sort, string $query, int $limit): string
-{
-    return "index.php?pfad=showCategory"
-        . "&category=" . urlencode($category)
-        . "&sort=" . urlencode($sort)
-        . "&q=" . urlencode($query)
-        . "&limit=" . $limit
-        . "&page=" . $page;
-}
-
-/**
- * Rendert eine rein serverseitige Pagination für showCategory (No-JS-Fall).
- * Analog zu renderNoJsPagination.
- */
-function renderNoJsPaginationCategory(int $currentPage, int $totalPages, string $category, string $sort, string $query, int $limit): string
-{
-    $html = '';
-
-    if ($currentPage > 1) {
-        $html .= '<a class="s-res-page-btn" href="' . htmlspecialchars(buildCategoryUrl($currentPage - 1, $category, $sort, $query, $limit)) . '">&laquo;</a> ';
-    } else {
-        $html .= '<span class="s-res-page-btn" aria-disabled="true">&laquo;</span> ';
-    }
-
-    for ($i = 1; $i <= $totalPages; $i++) {
-        if ($i === $currentPage) {
-            $html .= '<span class="s-res-page-btn s-res-page-btn-active">' . $i . '</span> ';
-        } else {
-            $html .= '<a class="s-res-page-btn" href="' . htmlspecialchars(buildCategoryUrl($i, $category, $sort, $query, $limit)) . '">' . $i . '</a> ';
-        }
-    }
-
-    if ($currentPage < $totalPages) {
-        $html .= '<a class="s-res-page-btn" href="' . htmlspecialchars(buildCategoryUrl($currentPage + 1, $category, $sort, $query, $limit)) . '">&raquo;</a>';
-    } else {
-        $html .= '<span class="s-res-page-btn" aria-disabled="true">&raquo;</span>';
-    }
-
-    return $html;
-}

index.php

@@ -2,57 +2,11 @@
 if (session_status() === PHP_SESSION_NONE) {
     session_start();
 }
-ob_start();
+include_once "php/controller/index-controller.php";
-include_once("php/controller/index.php");
-
-$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 === "search-results-controller") {
-    include_once "php/controller/search-results-controller.php";
-}
-
-if ($pfad === "register") {
-    include_once "php/controller/register-controller.php";
-}
-if ($pfad === "password-forgotten") {
-include_once "php/controller/password-forgotten-controller.php";
-}
-
-if ($pfad === "confirm-register") {
-    include_once "php/controller/confirm-register-controller.php";
-}
-
-if ($pfad === "confirm-password") {
-    include_once "php/controller/confirm-password-controller.php";
-}
-
-if ($pfad === "logout") {
-    include_once "php/controller/logout-controller.php";
-    exit();
-}
-
-if ($pfad === "deleteAccount") {
-    include_once "php/controller/deleteAccount-controller.php";
-    exit();
-}
 ?>
-
+<!DOCTYPE html>
-    <!--
+<html lang="de">
-        Seite: Index der Lernplattform
+<head>
-        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">
@@ -69,36 +23,28 @@ if ($pfad === "deleteAccount") {
     <link rel="stylesheet" href="css/message.css">
     <link rel="stylesheet" href="css/showCategory.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/search-results.js" async></script>
+    <script src="js/filter.js" async></script>
-        <script src="js/showCategory.js" async></script>
-
 
     <title>EduForge</title>
-    </head>
+</head>
-
+<body>
-    <body>
-
-    <?php
-    include_once 'includes/navbar.php';
-
-    /*
-        Dynamischer Inhalt:
-        Je nach pfad-Parameter wird die passende Datei aus content geladen.
-    */
-    if (file_exists('content/' . $pfad . '.php')) {
-        include_once 'content/' . $pfad . '.php';
-    } else {
-        include_once 'content/404.php';
-    }
-
-    include_once 'includes/footer.php';
-    ?>
-
-    </body>
-    </html>
 
 <?php
-ob_end_flush();
+include_once 'includes/navbar.php';
+
+// Dynamischer Inhalt
+if (isset($pfad) && $pfad !== "404" && file_exists('content/' . $pfad . '.php')) {
+    include_once 'content/' . $pfad . '.php';
+} else {
+    include_once 'content/404.php';
+}
+
+include_once 'includes/footer.php';
 ?>
+
+</body>
+</html>

js/filter.js

@@ -0,0 +1,116 @@
+let currentClientPage = 1;
+let itemsPerPage = 10;
+
+function initFilter() {
+    const filterSelect = document.getElementById('category-filter');
+    const listContainer = document.querySelector('.s-res-list');
+    const limitSelect = document.getElementById('s-res-per-page');
+
+    if (!filterSelect || !listContainer) return;
+
+    if (limitSelect) {
+        itemsPerPage = parseInt(limitSelect.value, 10) || 10;
+    }
+
+    updateVisibility();
+
+    if (limitSelect) {
+        limitSelect.addEventListener('change', function() {
+
+            //neues limit einlesen
+            itemsPerPage = parseInt(this.value, 10); 
+            currentClientPage = 1;
+            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/paginator.js

@@ -0,0 +1,27 @@
+function initPaginator() {
+    const form = document.getElementById('search-form-id');
+    const pageInput = document.getElementById('s-res-page-input');
+    const pageButtons = document.querySelectorAll('.s-res-page-navigation .s-res-page-btn');
+
+    pageButtons.forEach(button => {
+        button.addEventListener('click', function() {
+            if (this.disabled) return;
+
+            const targetPage = this.getAttribute('data-page');
+
+            if (targetPage && form && pageInput) {
+                pageInput.value = targetPage;
+                form.submit();
+            }
+        });
+    });
+}
+
+// ist das DOM bereits vollständig aufgebaut?
+if (document.readyState === 'loading') {
+    // Falls noch geladen wird, auf das Event warten
+    document.addEventListener('DOMContentLoaded', initPaginator);
+} else {
+    // Falls das HTML bereits komplett da ist, sofort ausführen
+    initPaginator();
+}

js/search-results.js

@@ -1,238 +0,0 @@
-/**
- * Übernimmt Sortierung, Kategorie-Filter und Pagination der Suchergebnisse
- * vollständig clientseitig
- *
- * Ablauf:
- * 1. Kompletten Ergebnis-Datensatz einmalig per fetch() nachladen
- *    (php/controller/search-results-data.php, liest nur die Session-Daten,
- *    keine erneute Datenbank-Suche).
- * 2. Sortieren + filtern (JS-Array).
- * 3. Ergebnisliste + Pagination-UI daraus neu rendern.
- *
- * Ersetzt sorter.js, filter.js und paginator.js, deren Klick-Handler sich
- * gegenseitig ins Gehege kamen.
- * Ohne JS bleibt die serverseitig gerenderte Seite (echte Links/Formulare)
- * voll funktionsfähig.
- */
-(function () {
-    const state = {
-        allItems: [],
-        sort: 'alphabet',
-        category: 'all',
-        itemsPerPage: 10,
-        currentPage: 1,
-    };
-
-    let listContainer, sortRadios, categorySelect, limitSelect;
-    let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
-
-    function init() {
-        listContainer = document.querySelector('.s-res-list');
-        if (!listContainer) return;
-
-        sortRadios = document.querySelectorAll('.sort-radio');
-        categorySelect = document.getElementById('category-filter');
-        limitSelect = document.getElementById('s-res-per-page');
-        prevBtn = document.getElementById('prev-page-btn');
-        nextBtn = document.getElementById('next-page-btn');
-        numbersContainer = document.getElementById('dynamic-page-numbers');
-        jsNav = document.getElementById('js-page-navigation');
-        resultCountEl = document.getElementById('s-res-result-count');
-
-        const checkedRadio = document.querySelector('.sort-radio:checked');
-        state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
-        state.category = categorySelect ? categorySelect.value : 'all';
-        state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
-
-        fetchFullDataset()
-            .then(function (data) {
-                state.allItems = data.results || [];
-                attachEvents();
-                render();
-                if (jsNav) jsNav.style.display = 'flex';
-            })
-            .catch(function (err) {
-                // JSON-Endpoint nicht erreichbar: die serverseitig gerenderte
-                // (No-JS-)Ansicht bleibt sichtbar und funktioniert weiter.
-                console.error('Suchergebnisse konnten nicht nachgeladen werden:', err);
-            });
-    }
-
-    function fetchFullDataset() {
-        return fetch('php/controller/search-results-data.php', { credentials: 'same-origin' })
-            .then(function (res) {
-                if (!res.ok) throw new Error('HTTP ' + res.status);
-                return res.json();
-            });
-    }
-
-    function getFilteredSortedItems() {
-        let items = state.allItems;
-
-        if (state.category !== 'all') {
-            const wanted = state.category.toLowerCase();
-            items = items.filter(function (item) {
-                return (item.category || '').toLowerCase() === wanted;
-            });
-        }
-
-        items = items.slice().sort(function (a, b) {
-            if (state.sort === 'likes') {
-                return (b.likes || 0) - (a.likes || 0);
-            }
-            if (state.sort === 'newest' || state.sort === 'oldest') {
-                return state.sort === 'newest' ? (b.id - a.id) : (a.id - b.id);
-            }
-            // alphabet (Standard)
-            return (a.title || '').toLowerCase().localeCompare((b.title || '').toLowerCase());
-        });
-
-        return items;
-    }
-
-    function render() {
-        const items = getFilteredSortedItems();
-
-        if (resultCountEl) resultCountEl.textContent = items.length;
-
-        const totalPages = Math.max(1, Math.ceil(items.length / state.itemsPerPage));
-        if (state.currentPage > totalPages) state.currentPage = totalPages;
-        if (state.currentPage < 1) state.currentPage = 1;
-
-        const start = (state.currentPage - 1) * state.itemsPerPage;
-        const pageItems = items.slice(start, start + state.itemsPerPage);
-
-        listContainer.innerHTML = '';
-        if (pageItems.length === 0) {
-            const empty = document.createElement('p');
-            empty.textContent = 'Keine Beiträge gefunden.';
-            listContainer.appendChild(empty);
-        } else {
-            pageItems.forEach(function (item) {
-                listContainer.appendChild(buildCard(item));
-            });
-        }
-
-        updatePaginatorUI(state.currentPage, totalPages);
-    }
-
-    function buildCard(item) {
-        const card = document.createElement('div');
-        card.className = 's-res-item';
-        card.setAttribute('data-likes', item.likes);
-        card.setAttribute('data-category', (item.category || '').toLowerCase());
-
-        const link = document.createElement('a');
-        link.className = 's-res-link';
-        link.href = 'index.php?pfad=showArticle&id=' + encodeURIComponent(item.id);
-        link.textContent = item.title;
-
-        const title = document.createElement('h2');
-        title.className = 's-res-item-title';
-        title.appendChild(link);
-
-        const authorName = document.createElement('span');
-        authorName.className = 's-res-author-name';
-        authorName.textContent = item.author;
-
-        const author = document.createElement('p');
-        author.className = 's-res-author';
-        author.append('Von: ', authorName);
-
-        const likes = document.createElement('span');
-        likes.className = 's-res-likes';
-        likes.textContent = '❤️ ' + item.likes;
-
-        const metaRow = document.createElement('div');
-        metaRow.className = 's-res-meta-row';
-        metaRow.append(author, likes);
-
-        const content = document.createElement('div');
-        content.className = 's-res-content';
-        content.append(title, metaRow);
-
-        const arrow = document.createElement('div');
-        arrow.className = 's-res-arrow';
-        arrow.textContent = '→';
-
-        card.append(content, arrow);
-        return card;
-    }
-
-    function updatePaginatorUI(currentPage, totalPages) {
-        if (!prevBtn || !nextBtn || !numbersContainer) return;
-
-        prevBtn.disabled = currentPage <= 1;
-        nextBtn.disabled = currentPage >= totalPages;
-
-        numbersContainer.innerHTML = '';
-        for (let i = 1; i <= totalPages; i++) {
-            const btn = document.createElement('button');
-            btn.type = 'button';
-            btn.className = 's-res-page-btn' + (i === currentPage ? ' s-res-page-btn-active' : '');
-            btn.textContent = i;
-            btn.addEventListener('click', function () {
-                state.currentPage = i;
-                render();
-            });
-            numbersContainer.appendChild(btn);
-        }
-    }
-
-    function attachEvents() {
-        sortRadios.forEach(function (radio) {
-            radio.addEventListener('change', function () {
-                state.sort = this.value;
-                state.currentPage = 1;
-                render();
-            });
-        });
-
-        if (categorySelect) {
-            categorySelect.addEventListener('change', function () {
-                state.category = this.value;
-                state.currentPage = 1;
-                render();
-            });
-        }
-
-        if (limitSelect) {
-            limitSelect.addEventListener('change', function () {
-                state.itemsPerPage = parseInt(this.value, 10) || 10;
-                state.currentPage = 1;
-                render();
-            });
-        }
-
-        if (prevBtn) {
-            prevBtn.addEventListener('click', function () {
-                if (state.currentPage > 1) {
-                    state.currentPage -= 1;
-                    render();
-                }
-            });
-        }
-
-        if (nextBtn) {
-            nextBtn.addEventListener('click', function () {
-                state.currentPage += 1;
-                render();
-            });
-        }
-
-        // Mit aktivem JS übernimmt render() Sortierung/Filter live
-        // ein echtes Absenden des Formulars (No-JS-Fallback) ist dann nicht mehr nötig.
-        const filterForm = document.getElementById('s-res-filter-form');
-        if (filterForm) {
-            filterForm.addEventListener('submit', function (e) {
-                e.preventDefault();
-            });
-        }
-    }
-
-    if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', init);
-    } else {
-        init();
-    }
-})();

js/showCategory.js

@@ -1,242 +0,0 @@
-/**
- * Übernimmt Sortierung, Suche (innerhalb der Kategorie) und Pagination der
- * Kategorie-Ansicht vollständig clientseitig.
- *
- * Ablauf:
- * 1. Kompletten Kategorie-Datensatz einmalig per fetch() nachladen
- * 2. Sortieren + nach Suchbegriff filtern (JS-Array).
- * 3. Ergebnisliste + Pagination-UI daraus neu rendern.
- *
- * Ohne JS bleibt die serverseitig gerenderte Seite (echte Links/Formulare)
- * voll funktionsfähig
- */
-(function () {
-    const state = {
-        allItems: [],
-        sort: 'alphabet',
-        query: '',
-        itemsPerPage: 10,
-        currentPage: 1,
-    };
-
-    let listContainer, sortRadios, searchInput, limitSelect;
-    let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
-    let searchDebounceTimer;
-
-    function init() {
-        listContainer = document.querySelector('.s-res-list');
-        if (!listContainer) return;
-
-        sortRadios = document.querySelectorAll('.sort-radio');
-        searchInput = document.getElementById('cat-search-input');
-        limitSelect = document.getElementById('s-res-per-page');
-        prevBtn = document.getElementById('prev-page-btn');
-        nextBtn = document.getElementById('next-page-btn');
-        numbersContainer = document.getElementById('dynamic-page-numbers');
-        jsNav = document.getElementById('js-page-navigation');
-        resultCountEl = document.getElementById('s-res-result-count');
-
-        const checkedRadio = document.querySelector('.sort-radio:checked');
-        state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
-        state.query = searchInput ? searchInput.value : '';
-        state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
-
-        fetchFullDataset()
-            .then(function (data) {
-                state.allItems = data.results || [];
-                attachEvents();
-                render();
-                if (jsNav) jsNav.style.display = 'flex';
-            })
-            .catch(function (err) {
-                // JSON-Endpoint nicht erreichbar: die serverseitig gerenderte
-                // (No-JS-)Ansicht bleibt sichtbar und funktioniert weiter.
-                console.error('Kategorie-Beiträge konnten nicht nachgeladen werden:', err);
-            });
-    }
-
-    function fetchFullDataset() {
-        return fetch('php/controller/showCategory-data.php', { credentials: 'same-origin' })
-            .then(function (res) {
-                if (!res.ok) throw new Error('HTTP ' + res.status);
-                return res.json();
-            });
-    }
-
-    function getFilteredSortedItems() {
-        let items = state.allItems;
-
-        const needle = state.query.trim().toLowerCase();
-        if (needle !== '') {
-            items = items.filter(function (item) {
-                const haystack = ((item.title || '') + ' ' + (item.content || '')).toLowerCase();
-                return haystack.indexOf(needle) !== -1;
-            });
-        }
-
-        items = items.slice().sort(function (a, b) {
-            if (state.sort === 'likes') {
-                return (b.likes || 0) - (a.likes || 0);
-            }
-            if (state.sort === 'newest' || state.sort === 'oldest') {
-                return state.sort === 'newest' ? (b.id - a.id) : (a.id - b.id);
-            }
-            // alphabet (Standard)
-            return (a.title || '').toLowerCase().localeCompare((b.title || '').toLowerCase());
-        });
-
-        return items;
-    }
-
-    function render() {
-        const items = getFilteredSortedItems();
-
-        if (resultCountEl) resultCountEl.textContent = items.length;
-
-        const totalPages = Math.max(1, Math.ceil(items.length / state.itemsPerPage));
-        if (state.currentPage > totalPages) state.currentPage = totalPages;
-        if (state.currentPage < 1) state.currentPage = 1;
-
-        const start = (state.currentPage - 1) * state.itemsPerPage;
-        const pageItems = items.slice(start, start + state.itemsPerPage);
-
-        listContainer.innerHTML = '';
-        if (pageItems.length === 0) {
-            const empty = document.createElement('p');
-            empty.textContent = 'Keine Beiträge gefunden.';
-            listContainer.appendChild(empty);
-        } else {
-            pageItems.forEach(function (item) {
-                listContainer.appendChild(buildCard(item));
-            });
-        }
-
-        updatePaginatorUI(state.currentPage, totalPages);
-    }
-
-    function buildCard(item) {
-        const card = document.createElement('div');
-        card.className = 's-res-item';
-        card.setAttribute('data-likes', item.likes);
-        card.setAttribute('data-category', (item.category || '').toLowerCase());
-
-        const link = document.createElement('a');
-        link.className = 's-res-link';
-        link.href = 'index.php?pfad=showArticle&id=' + encodeURIComponent(item.id);
-        link.textContent = item.title;
-
-        const title = document.createElement('h2');
-        title.className = 's-res-item-title';
-        title.appendChild(link);
-
-        const authorName = document.createElement('span');
-        authorName.className = 's-res-author-name';
-        authorName.textContent = item.author;
-
-        const author = document.createElement('p');
-        author.className = 's-res-author';
-        author.append('Von: ', authorName);
-
-        const likes = document.createElement('span');
-        likes.className = 's-res-likes';
-        likes.textContent = '❤️ ' + item.likes;
-
-        const metaRow = document.createElement('div');
-        metaRow.className = 's-res-meta-row';
-        metaRow.append(author, likes);
-
-        const content = document.createElement('div');
-        content.className = 's-res-content';
-        content.append(title, metaRow);
-
-        const arrow = document.createElement('div');
-        arrow.className = 's-res-arrow';
-        arrow.textContent = '→';
-
-        card.append(content, arrow);
-        return card;
-    }
-
-    function updatePaginatorUI(currentPage, totalPages) {
-        if (!prevBtn || !nextBtn || !numbersContainer) return;
-
-        prevBtn.disabled = currentPage <= 1;
-        nextBtn.disabled = currentPage >= totalPages;
-
-        numbersContainer.innerHTML = '';
-        for (let i = 1; i <= totalPages; i++) {
-            const btn = document.createElement('button');
-            btn.type = 'button';
-            btn.className = 's-res-page-btn' + (i === currentPage ? ' s-res-page-btn-active' : '');
-            btn.textContent = i;
-            btn.addEventListener('click', function () {
-                state.currentPage = i;
-                render();
-            });
-            numbersContainer.appendChild(btn);
-        }
-    }
-
-    function attachEvents() {
-        sortRadios.forEach(function (radio) {
-            radio.addEventListener('change', function () {
-                state.sort = this.value;
-                state.currentPage = 1;
-                render();
-            });
-        });
-
-        if (searchInput) {
-            // Live-Filterung während des Tippens (leicht entprellt), da der
-            // Datensatz bereits vollständig im Browser liegt.
-            searchInput.addEventListener('input', function () {
-                clearTimeout(searchDebounceTimer);
-                const value = this.value;
-                searchDebounceTimer = setTimeout(function () {
-                    state.query = value;
-                    state.currentPage = 1;
-                    render();
-                }, 150);
-            });
-        }
-
-        if (limitSelect) {
-            limitSelect.addEventListener('change', function () {
-                state.itemsPerPage = parseInt(this.value, 10) || 10;
-                state.currentPage = 1;
-                render();
-            });
-        }
-
-        if (prevBtn) {
-            prevBtn.addEventListener('click', function () {
-                if (state.currentPage > 1) {
-                    state.currentPage -= 1;
-                    render();
-                }
-            });
-        }
-
-        if (nextBtn) {
-            nextBtn.addEventListener('click', function () {
-                state.currentPage += 1;
-                render();
-            });
-        }
-
-        // Mit aktivem JS übernimmt render() Sortierung/Suche live
-        // ein echtes Absenden des Formulars (No-JS-Fallback) ist dann nicht mehr nötig.
-        const filterForm = document.getElementById('cat-filter-form');
-        if (filterForm) {
-            filterForm.addEventListener('submit', function (e) {
-                e.preventDefault();
-            });
-        }
-    }
-
-    if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', init);
-    } else {
-        init();
-    }
-})();

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/index-controller.php

@@ -1,3 +1,35 @@
 <?php
+// Standardpfad
+$pfad = $_GET["pfad"] ?? "home";
 
-?>
+if ($pfad === "logout") {
+    include_once "php/controller/logout-controller.php";
+    exit();
+} elseif ($pfad === "deleteAccount") {
+    include_once "php/controller/deleteAccount-controller.php";
+    exit();
+}
+
+if ($pfad === "login") {
+    include_once "php/controller/login-controller.php";
+} elseif ($pfad === "register") {
+    include_once "php/controller/register-controller.php";
+} elseif ($pfad === "password-forgotten") {
+    include_once "php/controller/password-forgotten-controller.php";
+} elseif ($pfad === "confirm-register") {
+    include_once "php/controller/confirm-register-controller.php";
+} elseif ($pfad === "confirm-password") {
+    include_once "php/controller/confirm-password-controller.php";
+}
+
+// Whitelist
+$erlaubte_content_seiten = [
+    "accessibility", "confirm-password", "confirm-register", "createArticle",
+    "datenschutz", "home", "impressum", "login", "nutzungsbedingungen",
+    "password-forgotten", "profile", "register", "search-results",
+    "show-mail", "showArticle", "showCategory", "updateArticle"
+];
+
+if (!in_array($pfad, $erlaubte_content_seiten)) {
+    $pfad = "404";
+}

php/controller/search-results-controller.php

@@ -22,6 +22,31 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
             
             $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->getTitle(), $b->getTitle());
+                });
+            } elseif ($sortStyle === 'likes') {
+                usort($results, function($a, $b) {
+                    return $b->getLikeCount() <=> $a->getLikeCount();
+                });
+            } elseif ($sortStyle === 'newest') {
+                // Datum neu zu alt sortiert
+                usort($results, function($a, $b) {
+                    return strcmp($b->getCreationDate(), $a->getCreationDate());
+                });
+            } elseif ($sortStyle === 'oldest') {
+                // Datum alt zu neu sortiert
+                usort($results, function($a, $b) {
+                    return strcmp($a->getCreationDate(), $b->getCreationDate());
+                });
+            }
+
+            // Ergebnisse werden in ein flaches array umgewandelt, da sont incomplete-PHP error im Ergebnis
             $safeArrayResults = [];
             foreach ($results as $obj) {
                 $safeArrayResults[] = [
@@ -40,25 +65,20 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
             $_SESSION["search_query"] = $search;
             $_SESSION["message"] = "new_search_results";
 
-        } catch (Exception $e) {
+        } catch (Exception $e){
             $_SESSION["message"] = "internal_error";
         }
     }
 
     $sort  = $_GET['sort'] ?? 'alphabet';
-    $_SESSION['search_sort'] = $sort;
-
-    $category = $_GET['category'] ?? 'all';
-    $_SESSION['search_category'] = $category;
-
     $limit = isset($_GET['limit']) ? (int)$_GET['limit'] : 10;
     if (!searchLimitValidator($limit)) {
         $limit = 10;
     }
-    $_SESSION['search_limit'] = $limit;
+    $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);
-    // Neue Suche -> immer wieder bei Seite 1 beginnen
-    header("Location: ../../index.php?pfad=search-results&q=" . urlencode($search) . "&sort=" . urlencode($sort) . "&category=" . urlencode($category) . "&limit=" . $limit . "&page=1");
     exit();
     
 }
+
+?>

php/controller/search-results-data.php

@@ -1,32 +0,0 @@
-<?php
-/**
- * Liefert den vollständigen, zuletzt gefundenen Ergebnis-Datensatz als JSON.
- *
- * Wird von js/search-results.js EINMALIG per fetch() geladen, damit Sortierung,
- * Filterung und Pagination danach komplett im Browser laufen können, ohne
- * weitere Serveranfragen oder eine erneute Datenbank-Suche auszulösen.
- */
-if (session_status() === PHP_SESSION_NONE) {
-    session_start();
-}
-
-header('Content-Type: application/json; charset=utf-8');
-
-require_once __DIR__ . '/../../includes/resultsHelper.php';
-
-$rawResults = $_SESSION['search_results'] ?? [];
-
-$payload = array_map(function ($item) {
-    return [
-        'id'       => $item['id'],
-        'title'    => $item['title'],
-        'author'   => $item['author'],
-        'category' => $item['category'] ?? '',
-        'likes'    => getLikeCount($item),
-    ];
-}, $rawResults);
-
-echo json_encode([
-    'query'   => $_SESSION['search_query'] ?? '',
-    'results' => array_values($payload),
-]);

php/controller/showCategory-controller.php

@@ -2,51 +2,66 @@
 if (session_status() === PHP_SESSION_NONE) {
     session_start();
 }
+
 require_once 'php/model/Article.php';
 require_once 'php/model/ArticleManager.php';
 require_once 'php/model/UserManager.php';
 require_once 'php/validator/article-validator.php';
-require_once __DIR__ . '/../../includes/resultsHelper.php';
-
-if (isset($_GET["category"]) && !empty($_GET["category"]) && articleCategoryValidator($_GET["category"])) {
 
+if (isset($_GET["category"]) && !empty($_GET["category"]) && articleCategoryValidator($_GET["category"])){
     $category = $_GET["category"];
 
+    // Sortierung auslesen (Standard: alphabet)
+    $sortStyle = isset($_GET['sort']) ? trim($_GET['sort']) : 'alphabet';
+
+    // Aktuelle Seite auslesen
+    $page = isset($_GET['page']) ? (int)$_GET['page'] : 1;
+    if ($page < 1) { $page = 1; }
+
     try {
         $articleManager = ArticleManager::getInstance();
         $userManager = UserManager::getInstance();
-
         $allArticles = $articleManager->getArticlesByCategory($category);
-
-        $safeArrayResults = [];
         foreach ($allArticles as $article) {
-            $authorName = $userManager->findUser($article->getAuthor())["vorname"] . " " . $userManager->findUser($article->getAuthor())["nachname"];
+            $article->setAuthor($userManager->findUser($article->getAuthor())["vorname"] . " " . $userManager->findUser($article->getAuthor())["nachname"]);
-            $safeArrayResults[] = [
+        }
-                "id" => $article->getID(),
+        $totalArticles = count($allArticles);
-                "title" => $article->getTitle(),
+
-                "content" => $article->getContent(),
+        // --- SORTIERUNG LOGIK ---
-                "author" => $authorName,
+        if ($sortStyle === 'alphabet') {
-                "category" => $article->getCategory(),
+            usort($allArticles, function($a, $b) {
-                "tags" => $article->getTags(),
+                return strcasecmp($a->getTitle(), $b->getTitle());
-                "creationDate" => $article->getCreationDate(),
+            });
-                "likes" => $article->getLikes(),
+        } elseif ($sortStyle === 'likes') {
-            ];
+            usort($allArticles, function($a, $b) {
+                return $b->getLikes() <=> $a->getLikes(); // Absteigend nach Likes
+            });
+        } elseif ($sortStyle === 'newest') {
+            usort($allArticles, function($a, $b) {
+                return strtotime($b->getCreationDate()) <=> strtotime($a->getCreationDate()); // Neueste zuerst
+            });
+        } elseif ($sortStyle === 'oldest') {
+            usort($allArticles, function($a, $b) {
+                return strtotime($a->getCreationDate()) <=> strtotime($b->getCreationDate()); // Älteste zuerst
+            });
         }
 
-        // Session dient hier (wie bei search-results) als Zwischenspeicher, damit
+        // Paginierung konfigurieren
-        // js/showCategory.js den kompletten Datensatz per showCategory-data.php
+        $limit = 10;
-        // nachladen kann, ohne die Kategorie-Abfrage ein zweites Mal auszuführen.
+        $totalPages = ceil($totalArticles / $limit);
-        $_SESSION['category_results'] = $safeArrayResults;
+        if ($page > $totalPages && $totalPages > 0) { $page = $totalPages; }
-        $_SESSION['category_name'] = $category;
+
+        $offset = ($page - 1) * $limit;
+        $articles = array_slice($allArticles, $offset, $limit);
 
     } catch (Exception $e) {
         $_SESSION["message"] = "internal_error";
         include_once "content/404.php";
         exit();
     }
-
 } else {
     $_SESSION["message"] = "invalid_category";
     include_once "content/404.php";
     exit();
 }
+?>

php/controller/showCategory-data.php

@@ -1,35 +0,0 @@
-<?php
-/**
- * Liefert den vollständigen, zuletzt geladenen Kategorie-Datensatz als JSON.
- *
- * Wird von js/showCategory.js EINMALIG per fetch() geladen, damit Sortierung,
- * Suche und Pagination danach komplett im Browser laufen können, ohne
- * weitere Serveranfragen oder eine erneute Datenbank-Abfrage auszulösen
- *
- * Analog zu php/controller/search-results-data.php
- */
-if (session_status() === PHP_SESSION_NONE) {
-    session_start();
-}
-
-header('Content-Type: application/json; charset=utf-8');
-
-require_once __DIR__ . '/../../includes/resultsHelper.php';
-
-$rawResults = $_SESSION['category_results'] ?? [];
-
-$payload = array_map(function ($item) {
-    return [
-        'id'       => $item['id'],
-        'title'    => $item['title'],
-        'content'  => $item['content'] ?? '',
-        'author'   => $item['author'],
-        'category' => $item['category'] ?? '',
-        'likes'    => getLikeCount($item),
-    ];
-}, $rawResults);
-
-echo json_encode([
-    'category' => $_SESSION['category_name'] ?? '',
-    'results'  => array_values($payload),
-]);