Merge pull request 'WIP Suche implementiert, sowie Sortieren der Ergebnisse' (#19) from ImplementedSearch into dev

Reviewed-on: #19

content/search-results.php

@@ -1,5 +1,10 @@
 <?php
 session_start();
+ 
+$results = $_SESSION["search_results"] ?? [];
+$query = $_SESSION["search_query"] ?? "";
+$resultCount = count($results);
+
 ?>
 <!--
     Seite: Suchergebnisse
@@ -10,95 +15,81 @@ session_start();
     <!-- 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">
 
         <div class="s-res-header">
             <h1 class="s-res-main-title">Suchergebnisse</h1>
-            <p class="s-res-meta">3 Treffer für Ihre Suchanfrage</p>
+            <p class="s-res-meta"><?php echo $resultCount; ?> Treffer für Ihre Suchanfrage "<?php echo htmlspecialchars($query); ?>"</p>
         </div>
 
         <!-- Ergebnisliste -->
         <div class="s-res-list">
+            <?php 
+            if (!empty($results)): ?>
+    
+                <?php foreach ($results as $item): ?>
+                    <div class="s-res-item">
+                        <div class="s-res-content">
+                            <h2 class="s-res-item-title">
+                                <a href="index.php?pfad=showArticle&id=<?php echo $item['id']; ?>" class="s-res-link">
+                                    <?php echo htmlspecialchars($item['title']); ?>
+                                </a>
+                            </h2>
+                            <p class="s-res-author">Von: <span class="s-res-author-name"><?php echo htmlspecialchars($item['author']); ?></span></p>
+                        </div>
+                        <div class="s-res-arrow">&rarr;</div>
+                    </div>
+                <?php endforeach; ?>
 
             <?php 
-            if(isset($_SESSION['message']) && $_SESSION['message'] == "new_search_results"): ?>
+            elseif (isset($_SESSION["search_query"]) && $_SESSION["search_query"] !== "" && $resultCount === 0): ?>
-            <!-- TODO: Hier die Beiträge ausgeben. -->
+                <p>Keine Beiträge zu diesem Suchbegriff gefunden.</p>  
-            <?php elseif (isset($_SESSION["message"]) && $_SESSION["message"] == "missing_parameters"): ?>
+            <?php 
-            <p>
+            elseif (isset($_SESSION["message"]) && $_SESSION["message"] == "missing_parameters"): ?>
-                Bitte überprüfe deine Sucheingabe und versuche es erneut!
+                <p>Bitte überprüfe deine Sucheingabe und versuche es erneut!</p>
-            </p>
+                
             <?php endif; ?>
             <?php
             unset($_SESSION["message"]);
             ?>
 
-            <!-- Beispielbeitrag -->
-            <div class="s-res-item">
-                <div class="s-res-content">
-                    <h2 class="s-res-item-title">
-                        <a href="#" class="s-res-link">Pythagoras</a>
-                    </h2>
-                    <p class="s-res-author">Von: <span class="s-res-author-name">Max Mustermann</span></p>
-                </div>
-                <div class="s-res-arrow">&rarr;</div>
-            </div>
-
-            <!-- Beispielbeitrag -->
-            <div class="s-res-item">
-                <div class="s-res-content">
-                    <h2 class="s-res-item-title">
-                        <a href="#" class="s-res-link">Pythagoras</a>
-                    </h2>
-                    <p class="s-res-author">Von: <span class="s-res-author-name">Max Mustermann</span></p>
-                </div>
-                <div class="s-res-arrow">&rarr;</div>
-            </div>
-
-            <!-- Beispielbeitrag -->
-            <div class="s-res-item">
-                <div class="s-res-content">
-                    <h2 class="s-res-item-title">
-                        <a href="#" class="s-res-link">Pythagoras</a>
-                    </h2>
-                    <p class="s-res-author">Von: <span class="s-res-author-name">Max Mustermann</span></p>
-                </div>
-                <div class="s-res-arrow">&rarr;</div>
-            </div>
-
         </div>
         <div class="s-res-pagination-footer">
 

includes/search.php

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

php/controller/search-results-controller.php

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

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

php/model/ArticleManagerDAO.php

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

php/model/LocalArticleManager.php

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