Kategoriepaginator
This commit is contained in:
@@ -66,7 +66,7 @@ $categories = [
|
|||||||
Inhalt: Zeigt die Ergebnisse einer Suche an.
|
Inhalt: Zeigt die Ergebnisse einer Suche an.
|
||||||
Funktioniert ohne JavaScript (serverseitige Sortierung/Filter/Pagination
|
Funktioniert ohne JavaScript (serverseitige Sortierung/Filter/Pagination
|
||||||
über echte Links + Formulare) und wird bei aktiviertem JS von
|
über echte Links + Formulare) und wird bei aktiviertem JS von
|
||||||
js/results-app.js vollständig client-seitig übernommen.
|
js/search-results.js vollständig client-seitig übernommen.
|
||||||
-->
|
-->
|
||||||
<div class="s-res-layout-grid">
|
<div class="s-res-layout-grid">
|
||||||
<?php include_once "includes/alertMessages.php" ?>
|
<?php include_once "includes/alertMessages.php" ?>
|
||||||
|
|||||||
+100
-82
@@ -5,7 +5,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
|||||||
require_once __DIR__ . '/../includes/resultsHelper.php';
|
require_once __DIR__ . '/../includes/resultsHelper.php';
|
||||||
|
|
||||||
$rawResults = $_SESSION["search_results"] ?? [];
|
$rawResults = $_SESSION["search_results"] ?? [];
|
||||||
$query = $_SESSION["search_query"] ?? "";
|
|
||||||
|
|
||||||
// Sortierung / Kategorie / Limit: GET-Parameter haben Vorrang, sonst
|
// Sortierung / Kategorie / Limit: GET-Parameter haben Vorrang, sonst
|
||||||
// Rückfall auf die zuletzt in der Session gemerkten Werte. So bleibt
|
// Rückfall auf die zuletzt in der Session gemerkten Werte. So bleibt
|
||||||
@@ -26,9 +25,8 @@ if (!in_array($limit, [10, 20, 50, 100])) {
|
|||||||
}
|
}
|
||||||
$_SESSION['search_limit'] = $limit;
|
$_SESSION['search_limit'] = $limit;
|
||||||
|
|
||||||
// Serverseitig sortieren + filtern
|
// Serverseitig sortieren
|
||||||
$filteredResults = sortSearchResults($rawResults, $currentSort);
|
$filteredResults = sortSearchResults($rawResults, $currentSort);
|
||||||
$filteredResults = filterSearchResultsByCategory($filteredResults, $currentCategory);
|
|
||||||
|
|
||||||
$totalResultsCount = count($filteredResults);
|
$totalResultsCount = count($filteredResults);
|
||||||
$totalPages = max(1, (int)ceil($totalResultsCount / $limit));
|
$totalPages = max(1, (int)ceil($totalResultsCount / $limit));
|
||||||
@@ -49,108 +47,128 @@ $offset = ($currentPage - 1) * $limit;
|
|||||||
$results = array_slice($filteredResults, $offset, $limit);
|
$results = array_slice($filteredResults, $offset, $limit);
|
||||||
$resultCount = count($results);
|
$resultCount = count($results);
|
||||||
?>
|
?>
|
||||||
|
<!--
|
||||||
|
Seite: Kategorie-Seite
|
||||||
|
Inhalt: Zeigt die Ergebnisse einer Kategorie 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" ?>
|
||||||
|
|
||||||
|
<!-- Links: Seitenleiste für Filter und Suche -->
|
||||||
|
<aside class="s-res-sidebar">
|
||||||
|
<!-- Formular: sortiert 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>
|
||||||
|
<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' : ''; ?>>
|
||||||
|
<span>Alphabetisch</span>
|
||||||
|
</label>
|
||||||
|
<label class="s-res-filter-option">
|
||||||
|
<input type="radio" name="sort" value="likes" class="sort-radio" <?php echo $currentSort === 'likes' ? 'checked' : ''; ?>>
|
||||||
|
<span>Beliebtheit (Likes)</span>
|
||||||
|
</label>
|
||||||
|
<label class="s-res-filter-option">
|
||||||
|
<input type="radio" name="sort" value="newest" class="sort-radio" <?php echo $currentSort === 'newest' ? 'checked' : ''; ?>>
|
||||||
|
<span>Neueste Beiträge</span>
|
||||||
|
</label>
|
||||||
|
<label class="s-res-filter-option">
|
||||||
|
<input type="radio" name="sort" value="oldest" class="sort-radio" <?php echo $currentSort === 'oldest' ? 'checked' : ''; ?>>
|
||||||
|
<span>Älteste Beiträge</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<noscript>
|
<noscript>
|
||||||
Bitte JavaScript aktivieren!
|
<button type="submit" class="nav__search-button">Filter anwenden</button>
|
||||||
</noscript>
|
</noscript>
|
||||||
|
</form>
|
||||||
|
|
||||||
<!-- Das Formular umschließt jetzt das gesamte Layout -->
|
|
||||||
<form id="search-form-id" action="index.php" method="GET" style="display: contents;">
|
|
||||||
<input type="hidden" name="pfad" value="showCategory">
|
|
||||||
<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="cat-view-container">
|
|
||||||
|
|
||||||
<!-- LINKE SPALTE: SEITENLEISTE FÜR SORTIERUNG -->
|
|
||||||
<aside class="cat-sidebar">
|
|
||||||
<div class="cat-sidebar-box">
|
|
||||||
<h3 class="cat-sidebar-title">Sortierung</h3>
|
|
||||||
<div class="cat-filter-group">
|
|
||||||
<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="cat-filter-option">
|
|
||||||
<input type="radio" name="sort" value="likes" <?php echo ($currentSort === 'likes') ? 'checked' : ''; ?> onchange="this.form.submit();">
|
|
||||||
Beliebtheit (Likes)
|
|
||||||
</label>
|
|
||||||
<label class="cat-filter-option">
|
|
||||||
<input type="radio" name="sort" value="newest" <?php echo ($currentSort === 'newest') ? 'checked' : ''; ?> onchange="this.form.submit();">
|
|
||||||
Neueste Beiträge
|
|
||||||
</label>
|
|
||||||
<label class="cat-filter-option">
|
|
||||||
<input type="radio" name="sort" value="oldest" <?php echo ($currentSort === 'oldest') ? 'checked' : ''; ?> onchange="this.form.submit();">
|
|
||||||
Älteste Beiträge
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</aside>
|
</aside>
|
||||||
|
|
||||||
<!-- RECHTE SPALTE: INHALT & PAGINATOR -->
|
<main class="s-res-main-content">
|
||||||
<main class="cat-view-main">
|
|
||||||
<div class="cat-view-header">
|
<div class="s-res-header">
|
||||||
<h1 class="cat-view-title">Kategorie: <?php echo (isset($category) && !empty($category)) ? htmlspecialchars($category) : 'Unbekannt'; ?></h1>
|
<h1 class="s-res-main-title">Ergebnisse</h1>
|
||||||
<p class="cat-view-meta-text">
|
<p class="s-res-meta"><span id="s-res-result-count"><?php echo $totalResultsCount; ?></span> Treffer in dieser Kategorie "<?php echo htmlspecialchars($query); ?>"</p>
|
||||||
<?php echo (isset($totalArticles)) ? $totalArticles : 0; ?> Treffer in dieser Kategorie
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Beiträge -->
|
<!-- Ergebnisliste -->
|
||||||
<div class="cat-view-list">
|
<div class="s-res-list">
|
||||||
<?php if (isset($articles) && !empty($articles)): ?>
|
<?php if (!empty($results)): ?>
|
||||||
<?php foreach ($articles as $article): ?>
|
|
||||||
<div class="cat-view-item">
|
<?php foreach ($results as $item):
|
||||||
<div class="cat-view-content">
|
$likesCount = getLikeCount($item);
|
||||||
<h2 class="cat-view-item-title">
|
?>
|
||||||
<a href="index.php?pfad=showArticle&id=<?php echo htmlspecialchars($article->getID()); ?>" class="cat-view-link">
|
<div class="s-res-item" data-likes="<?php echo $likesCount; ?>" data-category="<?php echo strtolower($item['category'] ?? ''); ?>">
|
||||||
<?php echo (isset($article) && !empty($article->getTitle())) ? htmlspecialchars($article->getTitle()) : 'Kein Titel'; ?>
|
<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>
|
</a>
|
||||||
</h2>
|
</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>
|
||||||
|
|
||||||
<div class="cat-view-meta-row">
|
<span class="s-res-likes">
|
||||||
<p class="cat-view-author">
|
❤️ <?php echo $likesCount; ?>
|
||||||
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>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="cat-view-arrow">→</div>
|
<div class="s-res-arrow">→</div>
|
||||||
</div>
|
</div>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<?php else: ?>
|
|
||||||
<p class="cat-view-meta-text">Keine Artikel in dieser Kategorie 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 endif; ?>
|
<?php endif; ?>
|
||||||
|
<?php unset($_SESSION["message"]); ?>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Footer Paginator -->
|
<div class="s-res-pagination-footer">
|
||||||
<?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' : ''; ?>>
|
|
||||||
«
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<?php for ($i = 1; $i <= $totalPages; $i++): ?>
|
<!-- Auswahl der Ergebnisse pro Seite. Gehört per form="..." logisch
|
||||||
<button type="button"
|
zum Filterformular oben -->
|
||||||
class="s-res-page-btn <?php echo ($i === $currentPage) ? 'cat-active-btn' : ''; ?>"
|
<div class="s-res-limit-selector">
|
||||||
data-page="<?php echo $i; ?>"
|
<label for="s-res-per-page" class="s-res-limit-label">Ergebnisse pro Seite:</label>
|
||||||
<?php echo ($i === $currentPage) ? 'disabled' : ''; ?>>
|
<select id="s-res-per-page" name="limit" form="s-res-filter-form" class="s-res-limit-select">
|
||||||
<?php echo $i; ?>
|
<option value="10" <?php echo $limit === 10 ? 'selected' : ''; ?>>10</option>
|
||||||
</button>
|
<option value="20" <?php echo $limit === 20 ? 'selected' : ''; ?>>20</option>
|
||||||
<?php endfor; ?>
|
<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>
|
||||||
|
|
||||||
<button type="button" class="s-res-page-btn" data-page="<?php echo $currentPage + 1; ?>" <?php echo ($currentPage >= $totalPages) ? 'disabled' : ''; ?>>
|
<nav class="s-res-page-navigation" aria-label="Seitennavigation">
|
||||||
»
|
<!-- No-JS-Fallback: -->
|
||||||
</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>
|
||||||
</div>
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<?php endif; ?>
|
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
|
||||||
|
|||||||
@@ -9,59 +9,58 @@ require_once 'php/model/UserManager.php';
|
|||||||
require_once 'php/validator/article-validator.php';
|
require_once 'php/validator/article-validator.php';
|
||||||
|
|
||||||
if (isset($_GET["category"]) && !empty($_GET["category"]) && articleCategoryValidator($_GET["category"])){
|
if (isset($_GET["category"]) && !empty($_GET["category"]) && articleCategoryValidator($_GET["category"])){
|
||||||
$category = $_GET["category"];
|
$category = $_GET['category'] ?? 'all';
|
||||||
|
|
||||||
// Sortierung auslesen (Standard: alphabet)
|
// Sortierung auslesen (Standard: alphabet)
|
||||||
$sortStyle = isset($_GET['sort']) ? trim($_GET['sort']) : '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{
|
try{
|
||||||
$articleManager = ArticleManager::getInstance();
|
$articleManager = ArticleManager::getInstance();
|
||||||
$userManager = UserManager::getInstance();
|
$userManager = UserManager::getInstance();
|
||||||
$allArticles = $articleManager->getArticlesByCategory($category);
|
|
||||||
foreach ($allArticles as $article) {
|
|
||||||
$article->setAuthor($userManager->findUser($article->getAuthor())["vorname"] . " " . $userManager->findUser($article->getAuthor())["nachname"]);
|
|
||||||
}
|
|
||||||
$totalArticles = count($allArticles);
|
|
||||||
|
|
||||||
// --- SORTIERUNG LOGIK ---
|
$results = $articleManager->getArticlesByCategory($category);
|
||||||
if ($sortStyle === 'alphabet') {
|
|
||||||
usort($allArticles, function($a, $b) {
|
$safeArrayResults = [];
|
||||||
return strcasecmp($a->getTitle(), $b->getTitle());
|
foreach ($results as $obj) {
|
||||||
});
|
$safeArrayResults[] = [
|
||||||
} elseif ($sortStyle === 'likes') {
|
"id" => $obj->getId(),
|
||||||
usort($allArticles, function($a, $b) {
|
"title" => $obj->getTitle(),
|
||||||
return $b->getLikes() <=> $a->getLikes(); // Absteigend nach Likes
|
"content" => $obj->getContent(),
|
||||||
});
|
"author" => $userManager->findUser($obj->getAuthor())["vorname"] . " " . $userManager->findUser($obj->getAuthor())["nachname"],
|
||||||
} elseif ($sortStyle === 'newest') {
|
"category" => $obj->getCategory(),
|
||||||
usort($allArticles, function($a, $b) {
|
"tags" => $obj->getTags(),
|
||||||
return strtotime($b->getCreationDate()) <=> strtotime($a->getCreationDate()); // Neueste zuerst
|
"creationDate" => $obj->getCreationDate(),
|
||||||
});
|
"likes" => $obj->getLikes(),
|
||||||
} elseif ($sortStyle === 'oldest') {
|
];
|
||||||
usort($allArticles, function($a, $b) {
|
|
||||||
return strtotime($a->getCreationDate()) <=> strtotime($b->getCreationDate()); // Älteste zuerst
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Paginierung konfigurieren
|
$_SESSION["search_results"] = $safeArrayResults;
|
||||||
$limit = 10;
|
$_SESSION["message"] = "new_search_results";
|
||||||
$totalPages = ceil($totalArticles / $limit);
|
|
||||||
if ($page > $totalPages && $totalPages > 0) { $page = $totalPages; }
|
|
||||||
|
|
||||||
$offset = ($page - 1) * $limit;
|
|
||||||
$articles = array_slice($allArticles, $offset, $limit);
|
|
||||||
|
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$_SESSION["message"] = "internal_error";
|
$_SESSION["message"] = "internal_error";
|
||||||
include_once "content/404.php";
|
include_once "content/404.php";
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$sort = $_GET['sort'] ?? 'alphabet';
|
||||||
|
$_SESSION['search_sort'] = $sort;
|
||||||
|
|
||||||
|
$_SESSION['search_category'] = $category;
|
||||||
|
|
||||||
|
$limit = isset($_GET['limit']) ? (int)$_GET['limit'] : 10;
|
||||||
|
if (!searchLimitValidator($limit)) {
|
||||||
|
$limit = 10;
|
||||||
|
}
|
||||||
|
$_SESSION['search_limit'] = $limit;
|
||||||
|
|
||||||
|
// Neue Suche -> immer wieder bei Seite 1 beginnen
|
||||||
|
header("Location: ../../index.php?pfad=showCategory&category=" . urlencode($category) . "&sort=" . urlencode($sort) . "&limit=" . $limit . "&page=1");
|
||||||
|
exit();
|
||||||
} else {
|
} else {
|
||||||
$_SESSION["message"] = "invalid_category";
|
$_SESSION["message"] = "invalid_category";
|
||||||
include_once "content/404.php";
|
include_once "content/404.php";
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
Reference in New Issue
Block a user