Merge pull request 'Beitrag erstellen oder bearbeiten: Bei einer Fehlermeldung wird die Kategorie nicht mehr zurückgesetzt' (#31) from bugfix_KategorieNichtZuruecksetzen into dev

Reviewed-on: #31

.idea/dataSources.local.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-261.25134.95">
+  <component name="dataSourceStorageLocal" created-in="IU-261.24374.151">
     <data-source name="articles" uuid="315cb5c9-2b0f-435b-b602-59823b160908">
       <database-info product="SQLite" version="3.51.1" jdbc-version="4.2" driver-name="SQLite JDBC" driver-version="3.51.1.0" dbms="SQLITE" exact-version="3.51.1" exact-driver-version="3.51">
         <identifier-quote-string>&quot;</identifier-quote-string>

content/createArticle.php

@@ -31,45 +31,211 @@ if (!isset($_SESSION["user"])) {
         <div class="sidebar-block">
             <label for="category">Kategorie <span class="required">*</span></label>
             <select id="category" name="category" required>
-                <option value="" disabled selected>Kategorie wählen...</option>
+                <option disabled <?php
+                if ((!isset($_SESSION['old_category']) || empty($_SESSION['old_category'])) && (!isset($category) || empty($category))) {
+                    echo 'selected';
+                }
+                ?>>Kategorie wählen...</option>
 
                 <optgroup label="Sprachen">
-                    <option value="deutsch">Deutsch</option>
+                    <option value="deutsch" <?php
-                    <option value="englisch">Englisch</option>
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
-                    <option value="franzoesisch">Französisch</option>
+                        if ($_SESSION['old_category'] === 'deutsch') { echo 'selected'; }
-                    <option value="latein">Latein</option>
+                    } elseif (isset($category) && !empty($category)) {
-                    <option value="literatur">Literatur</option>
+                        if ($category === 'deutsch') { echo 'selected'; }
+                    }
+                    ?>>Deutsch</option>
+                    <option value="englisch" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'englisch') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'englisch') { echo 'selected'; }
+                    }
+                    ?>>Englisch</option>
+                    <option value="franzoesisch" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'franzoesisch') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'franzoesisch') { echo 'selected'; }
+                    }
+                    ?>>Französisch</option>
+                    <option value="latein" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'latein') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'latein') { echo 'selected'; }
+                    }
+                    ?>>Latein</option>
+                    <option value="literatur" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'literatur') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'literatur') { echo 'selected'; }
+                    }
+                    ?>>Literatur</option>
                 </optgroup>
 
                 <optgroup label="MINT">
-                    <option value="mathe">Mathematik</option>
+                    <option value="mathe" <?php
-                    <option value="biologie">Biologie</option>
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
-                    <option value="chemie">Chemie</option>
+                        if ($_SESSION['old_category'] === 'mathe') { echo 'selected'; }
-                    <option value="physik">Physik</option>
+                    } elseif (isset($category) && !empty($category)) {
-                    <option value="informatik">Informatik</option>
+                        if ($category === 'mathe') { echo 'selected'; }
-                    <option value="astronomie">Astronomie</option>
+                    }
+                    ?>>Mathematik</option>
+                    <option value="biologie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'biologie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'biologie') { echo 'selected'; }
+                    }
+                    ?>>Biologie</option>
+                    <option value="chemie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'chemie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'chemie') { echo 'selected'; }
+                    }
+                    ?>>Chemie</option>
+                    <option value="physik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'physik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'physik') { echo 'selected'; }
+                    }
+                    ?>>Physik</option>
+                    <option value="informatik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'informatik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'informatik') { echo 'selected'; }
+                    }
+                    ?>>Informatik</option>
+                    <option value="astronomie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'astronomie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'astronomie') { echo 'selected'; }
+                    }
+                    ?>>Astronomie</option>
                 </optgroup>
 
                 <optgroup label="Gesellschaft & Werte">
-                    <option value="geschichte">Geschichte</option>
+                    <option value="geschichte" <?php
-                    <option value="erdkunde">Erdkunde</option>
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
-                    <option value="sozialkunde">Sozialkunde</option>
+                        if ($_SESSION['old_category'] === 'geschichte') { echo 'selected'; }
-                    <option value="wirtschaft">Wirtschaftskunde</option>
+                    } elseif (isset($category) && !empty($category)) {
-                    <option value="religion">Religion</option>
+                        if ($category === 'geschichte') { echo 'selected'; }
-                    <option value="ethik">Ethikunterricht</option>
+                    }
-                    <option value="philosophie">Philosophie</option>
+                    ?>>Geschichte</option>
-                    <option value="psychologie">Psychologie</option>
+                    <option value="erdkunde" <?php
-                    <option value="kunst">Kunst</option>
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
-                    <option value="musik">Musik</option>
+                        if ($_SESSION['old_category'] === 'erdkunde') { echo 'selected'; }
-                    <option value="theater">Theater</option>
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'erdkunde') { echo 'selected'; }
+                    }
+                    ?>>Erdkunde</option>
+                    <option value="sozialkunde" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'sozialkunde') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'sozialkunde') { echo 'selected'; }
+                    }
+                    ?>>Sozialkunde</option>
+                    <option value="wirtschaft" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'wirtschaft') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'wirtschaft') { echo 'selected'; }
+                    }
+                    ?>>Wirtschaftskunde</option>
+                    <option value="religion" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'religion') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'religion') { echo 'selected'; }
+                    }
+                    ?>>Religion</option>
+                    <option value="ethik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'ethik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'ethik') { echo 'selected'; }
+                    }
+                    ?>>Ethikunterricht</option>
+                    <option value="philosophie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'philosophie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'philosophie') { echo 'selected'; }
+                    }
+                    ?>>Philosophie</option>
+                    <option value="psychologie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'psychologie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'psychologie') { echo 'selected'; }
+                    }
+                    ?>>Psychologie</option>
+                    <option value="kunst" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'kunst') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'kunst') { echo 'selected'; }
+                    }
+                    ?>>Kunst</option>
+                    <option value="musik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'musik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'musik') { echo 'selected'; }
+                    }
+                    ?>>Musik</option>
+                    <option value="theater" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'theater') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'theater') { echo 'selected'; }
+                    }
+                    ?>>Theater</option>
                 </optgroup>
 
                 <optgroup label="Technik & Praxis">
-                    <option value="technik">Technik</option>
+                    <option value="technik" <?php
-                    <option value="werken">Werken</option>
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
-                    <option value="hauswirtschaft">Hauswirtschaft</option>
+                        if ($_SESSION['old_category'] === 'technik') { echo 'selected'; }
-                    <option value="sport">Sport</option>
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'technik') { echo 'selected'; }
+                    }
+                    ?>>Technik</option>
+                    <option value="werken" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'werken') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'werken') { echo 'selected'; }
+                    }
+                    ?>>Werken</option>
+                    <option value="hauswirtschaft" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'hauswirtschaft') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'hauswirtschaft') { echo 'selected'; }
+                    }
+                    ?>>Hauswirtschaft</option>
+                    <option value="sport" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'sport') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'sport') { echo 'selected'; }
+                    }
+                    ?>>Sport</option>
                 </optgroup>
+
+                <?php
+                if (isset($_SESSION['old_category'])) {
+                    unset($_SESSION['old_category']);
+                }
+                ?>
             </select>
         </div>
 

content/search-results.php

@@ -3,37 +3,18 @@ if (session_status() === PHP_SESSION_NONE) {
     session_start();
 }
  
-$all_results = $_SESSION["search_results"] ?? [];
+$results = $_SESSION["search_results"] ?? [];
 $query = $_SESSION["search_query"] ?? "";
-$totalResultsCount = count($all_results);
 
 $limit = isset($_GET['limit']) ? (int)$_GET['limit'] : 10;
 if (!in_array($limit, [10, 20, 50, 100])) {
     $limit = 10;
 }
+$results = array_slice($results, 0, $limit);
 
-// Gesamtseitenzahl
-$totalPages = max(1, ceil($totalResultsCount / $limit));
-
-// Aktuelle Seite auslesen und validieren
-$currentPage = isset($_GET['page']) ? (int)$_GET['page'] : 1;
-if ($currentPage < 1) {
-    $currentPage = 1;
-} elseif ($currentPage > $totalPages) {
-    $currentPage = $totalPages;
-}
-
-// Startpunkt im Array berechnen (Offset)
-$offset = ($currentPage - 1) * $limit;
-
-// Nur die Ergebnisse für die aktuelle Seite ausschneiden
-$results = array_slice($all_results, $offset, $limit);
 $resultCount = count($results);
 
 ?>
-<noscript>
-    Bitte JavaScript aktivieren!
-</noscript>
 <!--
     Seite: Suchergebnisse
     Inhalt: Zeigt die Ergebnisse einer Suche an
@@ -46,10 +27,8 @@ $resultCount = count($results);
 
         <!-- Sortierfuntion Box und Such Box-->
          <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" 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>
@@ -87,7 +66,7 @@ $resultCount = count($results);
 
         <div class="s-res-header">
             <h1 class="s-res-main-title">Suchergebnisse</h1>
-            <p class="s-res-meta"><?php echo $totalResultsCount; ?> Treffer für Ihre Suchanfrage "<?php echo htmlspecialchars($query); ?>"</p>
+            <p class="s-res-meta"><?php echo $resultCount; ?> Treffer für Ihre Suchanfrage "<?php echo htmlspecialchars($query); ?>"</p>
         </div>
 
         <!-- Ergebnisliste -->
@@ -136,20 +115,9 @@ $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" disabled>&laquo;</button>
-                    «
+                <button type="button" class="s-res-page-btn s-res-page-btn-active">1</button>
-                </button>
+                <button type="button" class="s-res-page-btn">&raquo;</button>
-                <!-- Dynamische Seitenzahlen -->
-                <?php for ($i = 1; $i <= $totalPages; $i++): ?>
-                    <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>

content/updateArticle.php

@@ -40,45 +40,211 @@ include_once 'php/controller/showArticle-controller.php';
         <div class="sidebar-block">
             <label for="category">Kategorie <span class="required">*</span></label>
             <select id="category" name="category" required>
-                <option disabled selected>Kategorie wählen...</option>
+                <option disabled <?php
+                if ((!isset($_SESSION['old_category']) || empty($_SESSION['old_category'])) && (!isset($category) || empty($category))) {
+                    echo 'selected';
+                }
+                ?>>Kategorie wählen...</option>
 
                 <optgroup label="Sprachen">
-                    <option value="deutsch">Deutsch</option>
+                    <option value="deutsch" <?php
-                    <option value="englisch">Englisch</option>
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
-                    <option value="franzoesisch">Französisch</option>
+                        if ($_SESSION['old_category'] === 'deutsch') { echo 'selected'; }
-                    <option value="latein">Latein</option>
+                    } elseif (isset($category) && !empty($category)) {
-                    <option value="literatur">Literatur</option>
+                        if ($category === 'deutsch') { echo 'selected'; }
+                    }
+                    ?>>Deutsch</option>
+                    <option value="englisch" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'englisch') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'englisch') { echo 'selected'; }
+                    }
+                    ?>>Englisch</option>
+                    <option value="franzoesisch" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'franzoesisch') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'franzoesisch') { echo 'selected'; }
+                    }
+                    ?>>Französisch</option>
+                    <option value="latein" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'latein') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'latein') { echo 'selected'; }
+                    }
+                    ?>>Latein</option>
+                    <option value="literatur" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'literatur') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'literatur') { echo 'selected'; }
+                    }
+                    ?>>Literatur</option>
                 </optgroup>
 
                 <optgroup label="MINT">
-                    <option value="mathe">Mathematik</option>
+                    <option value="mathe" <?php
-                    <option value="biologie">Biologie</option>
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
-                    <option value="chemie">Chemie</option>
+                        if ($_SESSION['old_category'] === 'mathe') { echo 'selected'; }
-                    <option value="physik">Physik</option>
+                    } elseif (isset($category) && !empty($category)) {
-                    <option value="informatik">Informatik</option>
+                        if ($category === 'mathe') { echo 'selected'; }
-                    <option value="astronomie">Astronomie</option>
+                    }
+                    ?>>Mathematik</option>
+                    <option value="biologie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'biologie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'biologie') { echo 'selected'; }
+                    }
+                    ?>>Biologie</option>
+                    <option value="chemie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'chemie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'chemie') { echo 'selected'; }
+                    }
+                    ?>>Chemie</option>
+                    <option value="physik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'physik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'physik') { echo 'selected'; }
+                    }
+                    ?>>Physik</option>
+                    <option value="informatik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'informatik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'informatik') { echo 'selected'; }
+                    }
+                    ?>>Informatik</option>
+                    <option value="astronomie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'astronomie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'astronomie') { echo 'selected'; }
+                    }
+                    ?>>Astronomie</option>
                 </optgroup>
 
                 <optgroup label="Gesellschaft & Werte">
-                    <option value="geschichte">Geschichte</option>
+                    <option value="geschichte" <?php
-                    <option value="erdkunde">Erdkunde</option>
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
-                    <option value="sozialkunde">Sozialkunde</option>
+                        if ($_SESSION['old_category'] === 'geschichte') { echo 'selected'; }
-                    <option value="wirtschaft">Wirtschaftskunde</option>
+                    } elseif (isset($category) && !empty($category)) {
-                    <option value="religion">Religion</option>
+                        if ($category === 'geschichte') { echo 'selected'; }
-                    <option value="ethik">Ethikunterricht</option>
+                    }
-                    <option value="philosophie">Philosophie</option>
+                    ?>>Geschichte</option>
-                    <option value="psychologie">Psychologie</option>
+                    <option value="erdkunde" <?php
-                    <option value="kunst">Kunst</option>
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
-                    <option value="musik">Musik</option>
+                        if ($_SESSION['old_category'] === 'erdkunde') { echo 'selected'; }
-                    <option value="theater">Theater</option>
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'erdkunde') { echo 'selected'; }
+                    }
+                    ?>>Erdkunde</option>
+                    <option value="sozialkunde" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'sozialkunde') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'sozialkunde') { echo 'selected'; }
+                    }
+                    ?>>Sozialkunde</option>
+                    <option value="wirtschaft" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'wirtschaft') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'wirtschaft') { echo 'selected'; }
+                    }
+                    ?>>Wirtschaftskunde</option>
+                    <option value="religion" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'religion') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'religion') { echo 'selected'; }
+                    }
+                    ?>>Religion</option>
+                    <option value="ethik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'ethik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'ethik') { echo 'selected'; }
+                    }
+                    ?>>Ethikunterricht</option>
+                    <option value="philosophie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'philosophie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'philosophie') { echo 'selected'; }
+                    }
+                    ?>>Philosophie</option>
+                    <option value="psychologie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'psychologie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'psychologie') { echo 'selected'; }
+                    }
+                    ?>>Psychologie</option>
+                    <option value="kunst" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'kunst') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'kunst') { echo 'selected'; }
+                    }
+                    ?>>Kunst</option>
+                    <option value="musik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'musik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'musik') { echo 'selected'; }
+                    }
+                    ?>>Musik</option>
+                    <option value="theater" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'theater') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'theater') { echo 'selected'; }
+                    }
+                    ?>>Theater</option>
                 </optgroup>
 
                 <optgroup label="Technik & Praxis">
-                    <option value="technik">Technik</option>
+                    <option value="technik" <?php
-                    <option value="werken">Werken</option>
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
-                    <option value="hauswirtschaft">Hauswirtschaft</option>
+                        if ($_SESSION['old_category'] === 'technik') { echo 'selected'; }
-                    <option value="sport">Sport</option>
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'technik') { echo 'selected'; }
+                    }
+                    ?>>Technik</option>
+                    <option value="werken" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'werken') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'werken') { echo 'selected'; }
+                    }
+                    ?>>Werken</option>
+                    <option value="hauswirtschaft" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'hauswirtschaft') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'hauswirtschaft') { echo 'selected'; }
+                    }
+                    ?>>Hauswirtschaft</option>
+                    <option value="sport" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'sport') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'sport') { echo 'selected'; }
+                    }
+                    ?>>Sport</option>
                 </optgroup>
+
+                <?php
+                if (isset($_SESSION['old_category'])) {
+                    unset($_SESSION['old_category']);
+                }
+                ?>
             </select>
         </div>
 

index.php

@@ -42,7 +42,6 @@ if ($pfad === "deleteAccount") {
         <meta name="author" content="Niklas Ortmann">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link rel="icon" type="image/x-icon" href="images/logos/logo_icon.ico">
-
         <link rel="stylesheet" href="css/main.css">
         <link rel="stylesheet" href="css/navbar.css">
         <link rel="stylesheet" href="css/footer.css">
@@ -51,9 +50,6 @@ if ($pfad === "deleteAccount") {
         <link rel="stylesheet" href="css/profile.css">
         <link rel="stylesheet" href="css/showArticle.css">
         <link rel="stylesheet" href="css/message.css">
-
-        <script src="js/paginator.js" async></script>
-
         <title>EduForge</title>
     </head>
 

js/paginator.js

@@ -1,27 +0,0 @@
-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();
-}

php/controller/search-results-controller.php

@@ -62,11 +62,7 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
             $_SESSION["message"] = "internal_error";
         }
     }
-
+    header("Location: ../../index.php?pfad=search-results");
-    $sort  = $_GET['sort'] ?? 'alphabet';
-    $limit = isset($_GET['limit']) ? (int)$_GET['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();
     
 }