Design Anpassung der search in navbar

content/search-results.php

@@ -1,13 +1,6 @@
 <?php
 session_start();
  
-//debugging
-echo "<pre style='background:#fff; color:#000; padding:10px; border:2px solid red; position:relative; z-index:9999;'>";
-echo "Aktuelle URL-Parameter (GET): "; print_r($_GET);
-echo "Aktueller Session-Inhalt (SESSION): "; print_r($_SESSION);
-echo "</pre>";
-// debugging
-
 $results = $_SESSION["search_results"] ?? [];
 $query = $_SESSION["search_query"] ?? "";
 $resultCount = count($results);
@@ -22,38 +15,41 @@ $resultCount = count($results);
     <!-- Links: Seitenleiste für Filter und Suche -->
     <aside class="s-res-sidebar">
 
-        <!-- Suchleiste Box -->
+        <!-- Sortierfuntion Box und Such Box-->
+         <form action="php/controller/search-results-controller.php" method="GET" class="s-res-sidebar-form">
+    
             <div class="s-res-sidebar-box">
                 <h3 class="s-res-sidebar-title">Suche anpassen</h3>
-            <form action="#" method="GET" class="s-res-search-form">
+                <input type="search" id="site-search" name="q" placeholder="Suchen..." class="nav__search" value="<?php echo htmlspecialchars($query); ?>" maxlength="50" required>
-                <input type="search" id="site-search" name="q" placeholder="Suchen..." class="nav__search">
                 <button type="submit" class="nav__search-button">Suchen</button>
-            </form>
             </div>
 
-        <!-- Sortierfuntion Box -->
             <div class="s-res-sidebar-box">
                 <h3 class="s-res-sidebar-title">Sortierung</h3>
+                <?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" checked>
+                        <input type="radio" name="sort" value="alphabet" <?php echo $currentSort === 'alphabet' ? 'checked' : ''; ?> onchange="this.form.submit()">
                         <span>Alphabetisch</span>
                     </label>
+                    <!-- Noch disabled, da likes noch nicht implementiert-->
                     <label class="s-res-filter-option">
-                    <input type="radio" name="sort" value="likes">
+                        <input type="radio" name="sort" value="likes" <?php echo $currentSort === 'likes' ? 'checked' : ''; ?> disabled>
-                    <span>Beliebtheit (Likes)</span>
+                        <span style="color: #94a3b8;">Beliebtheit (Likes)</span>
                     </label>
                     <label class="s-res-filter-option">
-                    <input type="radio" name="sort" value="newest">
+                        <input type="radio" name="sort" value="newest" <?php echo $currentSort === 'newest' ? 'checked' : ''; ?> onchange="this.form.submit()">
                         <span>Neueste Beiträge</span>
                     </label>
                     <label class="s-res-filter-option">
-                    <input type="radio" name="sort" value="oldest">
+                        <input type="radio" name="sort" value="oldest" <?php echo $currentSort === 'oldest' ? 'checked' : ''; ?> onchange="this.form.submit()">
                         <span>Älteste Beiträge</span>
                     </label>
                 </div>
             </div>
 
+        </form>
+
     </aside>
 
     <main class="s-res-main-content">
@@ -65,36 +61,35 @@ $resultCount = count($results);
 
         <!-- Ergebnisliste -->
         <div class="s-res-list">
-
             <?php 
-            if(isset($_SESSION['message']) && $_SESSION['message'] == "new_search_results"): ?>
+            if (!empty($results)): ?>
     
-            <?php if ($resultCount === 0): ?>
-                    <p>Keine Beiträge zu diesem Suchbegriff gefunden.</p>
-                <?php else: ?>
                 <?php foreach ($results as $item): ?>
                     <div class="s-res-item">
                         <div class="s-res-content">
                             <h2 class="s-res-item-title">
-                                    <a href="<?php echo $item['link']; ?>" class="s-res-link"><?php echo $item['title']; ?></a>
+                                <a href="index.php?pfad=showArticle&id=<?php echo $item['id']; ?>" class="s-res-link">
+                                    <?php echo htmlspecialchars($item['title']); ?>
+                                </a>
                             </h2>
-                                <p class="s-res-author">Kategorie: <span class="s-res-author-name">Beitrag</span></p>
+                            <p class="s-res-author">Von: <span class="s-res-author-name"><?php echo htmlspecialchars($item['author']); ?></span></p>
                         </div>
                         <div class="s-res-arrow">&rarr;</div>
                     </div>
                 <?php endforeach; ?>
-                <?php endif; ?>
 
-            <?php elseif (isset($_SESSION["message"]) && $_SESSION["message"] == "missing_parameters"): ?>
+            <?php 
-            <p>
+            elseif (isset($_SESSION["search_query"]) && $_SESSION["search_query"] !== "" && $resultCount === 0): ?>
-                Bitte überprüfe deine Sucheingabe und versuche es erneut!
+                <p>Keine Beiträge zu diesem Suchbegriff gefunden.</p>  
-            </p>
+            <?php 
+            elseif (isset($_SESSION["message"]) && $_SESSION["message"] == "missing_parameters"): ?>
+                <p>Bitte überprüfe deine Sucheingabe und versuche es erneut!</p>
+                
             <?php endif; ?>
             <?php
             unset($_SESSION["message"]);
             ?>
 
-
         </div>
         <div class="s-res-pagination-footer">
 

includes/search.php

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

php/controller/search-results-controller.php

@@ -1,8 +1,8 @@
 <?php
 session_start();
-require_once '/../model/LocalArticleManager.php';
+require_once '../model/LocalArticleManager.php';
-require_once '/../model/ArticleManager.php';
+require_once '../model/ArticleManager.php';
-
+require_once '../model/Article.php';
 
 if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
 
@@ -17,13 +17,51 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
             $articleManager = ArticleManager::getInstance();
             
             $results = $articleManager->search($search);
-            $_SESSION["search_results"] = $results;
+
+            $sortStyle = $_GET['sort'] ?? 'alphabet';
+            $_SESSION['search_sort'] = $sortStyle;
+
+            if ($sortStyle === 'alphabet') {
+                // Titel aufsteigend alphabetiisch sortiert
+                usort($results, function($a, $b) {
+                    return strcasecmp($a->title, $b->title);
+                });
+            } elseif ($sortStyle === 'newest') {
+                // Datum neu zu alt sortiert
+                usort($results, function($a, $b) {
+                    return strcmp($b->creationDate, $a->creationDate);
+                });
+            } elseif ($sortStyle === 'oldest') {
+                // Datum alt zu neu sortiert
+                usort($results, function($a, $b) {
+                    return strcmp($a->creationDate, $b->creationDate);
+                });
+            }
+
+            // Ergebnisse werden in ein flaches array umgewandelt, da sont incomplete-PHP error im Ergebnis
+            $safeArrayResults = [];
+            foreach ($results as $obj) {
+                $safeArrayResults[] = [
+                    "id" => $obj->id,
+                    "title" => $obj->title,
+                    "content" => $obj->content,
+                    "author" => $obj->author,
+                    "category" => $obj->category,
+                    "tags" => $obj->tags,
+                    "creationDate" => $obj->creationDate
+                ];
+            }
+            
+            $_SESSION["search_results"] = $safeArrayResults;
             $_SESSION["search_query"] = $search;
             $_SESSION["message"] = "new_search_results";
+
         } catch (Exception $e){
             $_SESSION["message"] = "internal_error";
         }
     }
+    header("Location: ../../index.php?pfad=search-results");
+    exit();
     
 }
 

php/model/Article.php

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

php/model/ArticleManagerDAO.php

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

php/model/LocalArticleManager.php

@@ -169,24 +169,38 @@ class LocalArticleManager implements ArticleManagerDAO {
         return $filteredArticles;
     }
 
+
     public function search(string $keyword): array 
     {
-        $results = [];
+        $articles = $this->getAllArticles();
-        $contentFolder = __DIR__ . '/../content/';
+        $filteredArticles = [];
-        $files = glob($contentFolder . "*.php");
 
-        foreach ($files as $file) {
+        if (!is_array($articles)) {
-            $content = file_get_contents($file);
+            return [];
-            if (stripos($content, $keyword) !== false) {
+        }
-                $filename = basename($file, ".php");
+
-                $results[] = [
+        $cleanKeyword = strtolower(trim($keyword));
-                    'title' => ucfirst($filename),
+
-                    'link' => "index.php?pfad=" . $filename
+        foreach ($articles as $article) {
-                ];
+            $title = isset($article['title']) ? strtolower((string)$article['title']) : '';
+            $content = isset($article['content']) ? strtolower((string)$article['content']) : '';
+
+            if (($cleanKeyword !== '' && strpos($title, $cleanKeyword) !== false) || 
+                ($cleanKeyword !== '' && strpos($content, $cleanKeyword) !== false)) {
+            
+                $filteredArticles[] = new Article(
+                    intval($article['id'] ?? 0),
+                    $article['title'] ?? '',
+                    $article['content'] ?? '',
+                    $article['author'] ?? '',
+                    $article['category'] ?? '',
+                    $article['tags'] ?? '',
+                    $article['creationDate'] ?? ''
+                );
             }
         }
-        return $results;
 
+    return $filteredArticles;
     }
 
 }