Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 niklas.ortmann
|
e77c60d8c8 | ||
|
niklas.ortmann
|
7f5cea8c1e | ||
|
niklas.ortmann
|
71c213ef1e |
Generated
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="dataSourceStorageLocal" created-in="IU-253.32098.101">
|
||||
<component name="dataSourceStorageLocal" created-in="IU-261.25134.95">
|
||||
<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>"</identifier-quote-string>
|
||||
|
||||
@@ -36,9 +36,6 @@
|
||||
- JavaScript wird verwendet, um im erweitertem Beitragseditor clientseitig einzelne Content-Boxen erstellen und löschen
|
||||
zu können.
|
||||
- JavaScript wird ebenfalls verwendet, um in die Suchergebnisse clientseitig zu sortieren.
|
||||
- Die Kommentarfunktion ist zusätzlich auch ohne JavaScript nutzbar. Kommentare und Antworten können auch ohne JavaScript erstellt werden.
|
||||
- Eigene Kommentare und Antworten können bearbeitet und gelöscht werden. Die Bearbeitung und das Löschen funktionieren ebenfalls ohne JavaScript über normale Formulare und serverseitige Verarbeitung.
|
||||
|
||||
|
||||
## Sonstiges
|
||||
- Das Datenschema befindet sich unter /planung/Datenschema.pdf
|
||||
|
||||
+12
-12
@@ -45,9 +45,9 @@ $resultCount = count($results);
|
||||
<!-- Links: Seitenleiste für Filter und Suche -->
|
||||
<aside class="s-res-sidebar">
|
||||
|
||||
<!-- Sortierfuntion Box und Such Box-->
|
||||
<!-- 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">
|
||||
@@ -125,13 +125,13 @@ $resultCount = count($results);
|
||||
|
||||
<!-- Ergebnisliste -->
|
||||
<div class="s-res-list">
|
||||
<?php
|
||||
<?php
|
||||
if (!empty($results)): ?>
|
||||
|
||||
<?php foreach ($results as $item):
|
||||
|
||||
<?php foreach ($results as $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">
|
||||
<h2 class="s-res-item-title">
|
||||
@@ -151,13 +151,13 @@ $resultCount = count($results);
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
|
||||
<?php
|
||||
<?php
|
||||
elseif (isset($_SESSION["search_query"]) && $_SESSION["search_query"] !== "" && $resultCount === 0): ?>
|
||||
<p>Keine Beiträge zu diesem Suchbegriff gefunden.</p>
|
||||
<?php
|
||||
<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 endif; ?>
|
||||
<?php
|
||||
unset($_SESSION["message"]);
|
||||
@@ -179,9 +179,9 @@ $resultCount = count($results);
|
||||
|
||||
<div class="s-res-page-navigation">
|
||||
<button type="button" class="s-res-page-btn" id="prev-page-btn" data-page="0">«</button>
|
||||
|
||||
|
||||
<span id="dynamic-page-numbers"></span>
|
||||
|
||||
|
||||
<button type="button" class="s-res-page-btn" id="next-page-btn" data-page="2">»</button>
|
||||
</div>
|
||||
|
||||
|
||||
+26
-310
@@ -5,34 +5,6 @@ $repliesByParent = [];
|
||||
$articleObj = null;
|
||||
|
||||
include_once 'php/controller/showArticle-controller.php';
|
||||
/*
|
||||
* Ermittelt, ob ohne JavaScript auf einen Kommentar
|
||||
* geantwortet werden soll.
|
||||
*/
|
||||
$replyTo = filter_input(
|
||||
INPUT_GET,
|
||||
"reply_to",
|
||||
FILTER_VALIDATE_INT
|
||||
);
|
||||
|
||||
$replyAuthor = null;
|
||||
|
||||
if ($replyTo !== false && $replyTo !== null) {
|
||||
foreach ($mainComments as $mainComment) {
|
||||
if ($mainComment->getId() === $replyTo) {
|
||||
$replyAuthor = $mainComment->getAuthor();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Eine Antwort darf nur auf einen existierenden
|
||||
* Hauptkommentar geschrieben werden.
|
||||
*/
|
||||
if ($replyAuthor === null) {
|
||||
$replyTo = null;
|
||||
}
|
||||
?>
|
||||
<!--
|
||||
Seite: Anzeige für Beiträge
|
||||
@@ -45,6 +17,8 @@ if ($replyAuthor === null) {
|
||||
<!-- Metadaten & Titel -->
|
||||
<div class="article-view-top-section">
|
||||
|
||||
<div class="article-view-top-section">
|
||||
|
||||
<div class="category-and-likes-row">
|
||||
<?php if (isset($category) && !empty($category)): ?>
|
||||
<span class="article-view-category"><?php echo htmlspecialchars($category); ?></span>
|
||||
@@ -132,268 +106,39 @@ if ($replyAuthor === null) {
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<section class="article-comments-section" id="comments">
|
||||
<section class="article-comments-section">
|
||||
<h2>Kommentare</h2>
|
||||
|
||||
<?php if (isset($_SESSION["comment_message"])): ?>
|
||||
<div class="alert-message <?php
|
||||
echo ($_SESSION["comment_message_type"] ?? "") === "success"
|
||||
? "is-success"
|
||||
: "is-error";
|
||||
?>">
|
||||
<?php echo htmlspecialchars($_SESSION["comment_message"]); ?>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
unset($_SESSION["comment_message"]);
|
||||
unset($_SESSION["comment_message_type"]);
|
||||
?>
|
||||
<?php endif; ?>
|
||||
|
||||
<div id="comments-list">
|
||||
<?php if (!empty($mainComments)): ?>
|
||||
<?php foreach ($mainComments as $comment): ?>
|
||||
<div class="comment-item"
|
||||
data-comment-id="<?php echo htmlspecialchars(
|
||||
(string) $comment->getId()
|
||||
); ?>">
|
||||
<div class="comment-item" data-comment-id="<?php echo htmlspecialchars($comment->getId()); ?>">
|
||||
<p>
|
||||
<strong><?php echo htmlspecialchars($comment->getAuthor()); ?></strong>
|
||||
<span><?php echo htmlspecialchars($comment->getCreated()); ?></span>
|
||||
</p>
|
||||
|
||||
<?php
|
||||
$isDeleted = $comment->getContent()
|
||||
=== "Dieser Kommentar wurde gelöscht.";
|
||||
?>
|
||||
|
||||
<?php if ($isDeleted): ?>
|
||||
|
||||
<p class="deleted-comment">
|
||||
Dieser Kommentar wurde gelöscht.
|
||||
</p>
|
||||
|
||||
<?php else: ?>
|
||||
|
||||
<p>
|
||||
<strong>
|
||||
<?php echo htmlspecialchars($comment->getAuthor()); ?>
|
||||
</strong>
|
||||
|
||||
<span>
|
||||
<?php echo htmlspecialchars($comment->getCreated()); ?>
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<?php
|
||||
echo nl2br(
|
||||
htmlspecialchars($comment->getContent())
|
||||
);
|
||||
?>
|
||||
</p>
|
||||
|
||||
<?php if (
|
||||
isset($_SESSION["user_email"])
|
||||
&& $_SESSION["user_email"] === $comment->getAuthor()
|
||||
): ?>
|
||||
<details class="edit-comment-details">
|
||||
<summary class="edit-comment-button">
|
||||
Kommentar bearbeiten
|
||||
</summary>
|
||||
|
||||
<form method="post"
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form">
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
(string) $comment->getId()
|
||||
); ?>">
|
||||
|
||||
<input type="hidden"
|
||||
name="article_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
(string) $comment->getArticleId()
|
||||
); ?>">
|
||||
|
||||
<label for="edit-comment-<?php
|
||||
echo htmlspecialchars((string) $comment->getId());
|
||||
?>">
|
||||
Kommentar bearbeiten
|
||||
</label>
|
||||
|
||||
<textarea
|
||||
id="edit-comment-<?php
|
||||
echo htmlspecialchars((string) $comment->getId());
|
||||
?>"
|
||||
name="content"
|
||||
required><?php echo htmlspecialchars(
|
||||
$comment->getContent()
|
||||
); ?></textarea>
|
||||
|
||||
<button type="submit" class="button">
|
||||
Änderungen speichern
|
||||
</button>
|
||||
</form>
|
||||
</details>
|
||||
|
||||
<form method="post"
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form">
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
(string) $comment->getId()
|
||||
); ?>">
|
||||
|
||||
<input type="hidden"
|
||||
name="article_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
(string) $comment->getArticleId()
|
||||
); ?>">
|
||||
|
||||
<button type="submit"
|
||||
class="delete-comment-button"
|
||||
onclick="return confirm('Möchtest du diesen Kommentar wirklich löschen?');">
|
||||
Kommentar löschen
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if (isset($_SESSION["user_email"])): ?>
|
||||
|
||||
<a href="index.php?pfad=<?php
|
||||
echo urlencode($_GET["pfad"] ?? "showArticle");
|
||||
?>&id=<?php
|
||||
echo urlencode((string) $comment->getArticleId());
|
||||
?>&reply_to=<?php
|
||||
echo urlencode((string) $comment->getId());
|
||||
?>#comment-form"
|
||||
class="reply-button"
|
||||
data-comment-id="<?php echo htmlspecialchars(
|
||||
(string) $comment->getId()
|
||||
); ?>"
|
||||
data-author="<?php echo htmlspecialchars(
|
||||
$comment->getAuthor()
|
||||
); ?>">
|
||||
|
||||
Antworten
|
||||
</a>
|
||||
|
||||
<?php endif; ?>
|
||||
<p><?php echo nl2br(htmlspecialchars($comment->getContent())); ?></p>
|
||||
|
||||
<?php if (isset($_SESSION["user_email"])): ?>
|
||||
<button type="button"
|
||||
class="reply-button"
|
||||
data-comment-id="<?php echo htmlspecialchars($comment->getId()); ?>"
|
||||
data-author="<?php echo htmlspecialchars($comment->getAuthor()); ?>">
|
||||
Antworten
|
||||
</button>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="comment-replies">
|
||||
<?php if (isset($repliesByParent[$comment->getId()])): ?>
|
||||
<?php foreach ($repliesByParent[$comment->getId()] as $reply): ?>
|
||||
<div class="comment-item comment-reply">
|
||||
<p>
|
||||
<strong><?php echo htmlspecialchars($reply->getAuthor()); ?></strong>
|
||||
<span><?php echo htmlspecialchars($reply->getCreated()); ?></span>
|
||||
</p>
|
||||
|
||||
<?php
|
||||
$isReplyDeleted = $reply->getContent()
|
||||
=== "Dieser Kommentar wurde gelöscht.";
|
||||
?>
|
||||
|
||||
<?php if ($isReplyDeleted): ?>
|
||||
|
||||
<p class="deleted-comment">
|
||||
Dieser Kommentar wurde gelöscht.
|
||||
</p>
|
||||
|
||||
<?php else: ?>
|
||||
|
||||
<p>
|
||||
<strong>
|
||||
<?php echo htmlspecialchars($reply->getAuthor()); ?>
|
||||
</strong>
|
||||
|
||||
<span>
|
||||
<?php echo htmlspecialchars($reply->getCreated()); ?>
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<?php
|
||||
echo nl2br(
|
||||
htmlspecialchars($reply->getContent())
|
||||
);
|
||||
?>
|
||||
</p>
|
||||
|
||||
<?php if (
|
||||
isset($_SESSION["user_email"])
|
||||
&& $_SESSION["user_email"] === $reply->getAuthor()
|
||||
): ?>
|
||||
|
||||
<details class="edit-comment-details">
|
||||
<summary class="edit-comment-button">
|
||||
Antwort bearbeiten
|
||||
</summary>
|
||||
|
||||
<form method="post"
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form">
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
(string) $reply->getId()
|
||||
); ?>">
|
||||
|
||||
<input type="hidden"
|
||||
name="article_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
(string) $reply->getArticleId()
|
||||
); ?>">
|
||||
|
||||
<label for="edit-reply-<?php
|
||||
echo htmlspecialchars((string) $reply->getId());
|
||||
?>">
|
||||
Antwort bearbeiten
|
||||
</label>
|
||||
|
||||
<textarea
|
||||
id="edit-reply-<?php
|
||||
echo htmlspecialchars((string) $reply->getId());
|
||||
?>"
|
||||
name="content"
|
||||
required><?php echo htmlspecialchars(
|
||||
$reply->getContent()
|
||||
); ?></textarea>
|
||||
|
||||
<button type="submit" class="button">
|
||||
Änderungen speichern
|
||||
</button>
|
||||
</form>
|
||||
</details>
|
||||
|
||||
<form method="post"
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form">
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
(string) $reply->getId()
|
||||
); ?>">
|
||||
|
||||
<input type="hidden"
|
||||
name="article_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
(string) $reply->getArticleId()
|
||||
); ?>">
|
||||
|
||||
<button type="submit"
|
||||
class="delete-comment-button"
|
||||
onclick="return confirm('Möchtest du diesen Kommentar wirklich löschen?');">
|
||||
Kommentar löschen
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<p><?php echo nl2br(htmlspecialchars($reply->getContent())); ?></p>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
@@ -408,46 +153,17 @@ if ($replyAuthor === null) {
|
||||
</div>
|
||||
|
||||
<?php if (isset($_SESSION["user_email"])): ?>
|
||||
<form id="comment-form"
|
||||
method="post"
|
||||
action="php/ajax/add-comment.php">
|
||||
|
||||
<form id="comment-form">
|
||||
<input type="hidden"
|
||||
name="article_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
(string) ($_GET["id"] ?? "")
|
||||
); ?>">
|
||||
value="<?php echo htmlspecialchars($_GET["id"] ?? ""); ?>">
|
||||
|
||||
<input type="hidden"
|
||||
name="parent_comment_id"
|
||||
id="parent-comment-id"
|
||||
value="<?php echo $replyTo !== null
|
||||
? htmlspecialchars((string) $replyTo)
|
||||
: "";
|
||||
?>">
|
||||
value="">
|
||||
|
||||
<p id="reply-info"
|
||||
class="reply-info"
|
||||
<?php if ($replyAuthor === null): ?>
|
||||
style="display: none;"
|
||||
<?php endif; ?>>
|
||||
|
||||
<?php if ($replyAuthor !== null): ?>
|
||||
Antwort auf <?php echo htmlspecialchars($replyAuthor); ?>
|
||||
|
||||
<a href="index.php?pfad=<?php
|
||||
echo urlencode($_GET["pfad"] ?? "showArticle");
|
||||
?>&id=<?php
|
||||
echo urlencode((string) ($_GET["id"] ?? ""));
|
||||
?>#comment-form">
|
||||
Abbrechen
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
</p>
|
||||
|
||||
<label for="comment-content">
|
||||
Kommentar
|
||||
</label>
|
||||
<p id="reply-info" class="reply-info" style="display: none;"></p>
|
||||
|
||||
<textarea name="content"
|
||||
id="comment-content"
|
||||
@@ -465,4 +181,4 @@ if ($replyAuthor === null) {
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</section>
|
||||
</main>
|
||||
</main>
|
||||
@@ -34,20 +34,11 @@ if ($pfad === "logout") {
|
||||
include_once "php/controller/logout-controller.php";
|
||||
exit();
|
||||
}
|
||||
|
||||
if ($pfad === "deleteAccount") {
|
||||
include_once "php/controller/deleteAccount-controller.php";
|
||||
exit();
|
||||
}
|
||||
|
||||
if ($pfad === "updateComment") {
|
||||
include_once "php/controller/updateComment-controller.php";
|
||||
exit();
|
||||
}
|
||||
|
||||
if ($pfad === "deleteComment") {
|
||||
include_once "php/controller/deleteComment-controller.php";
|
||||
exit();
|
||||
}
|
||||
?>
|
||||
|
||||
<!--
|
||||
|
||||
+43
-192
@@ -11,31 +11,20 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
const parentCommentInput = document.getElementById("parent-comment-id");
|
||||
const replyInfo = document.getElementById("reply-info");
|
||||
|
||||
if (!form || !commentsList || !commentContent || !parentCommentInput) {
|
||||
if (!form || !commentsList || !commentContent || !parentCommentInput || !replyInfo) {
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
* Aktiviert einen einzelnen Antworten-Link.
|
||||
* Aktiviert einen einzelnen Antworten-Button.
|
||||
*
|
||||
* @param {HTMLAnchorElement} replyLink Antworten-Link
|
||||
* @param {HTMLButtonElement} button Antworten-Button
|
||||
*/
|
||||
function registerReplyButton(replyLink) {
|
||||
replyLink.addEventListener("click", function (event) {
|
||||
/*
|
||||
* Mit JavaScript wird die Seite nicht neu geladen.
|
||||
* Ohne JavaScript funktioniert der normale Link.
|
||||
*/
|
||||
event.preventDefault();
|
||||
|
||||
parentCommentInput.value = replyLink.dataset.commentId;
|
||||
|
||||
if (replyInfo) {
|
||||
replyInfo.textContent =
|
||||
"Antwort auf " + replyLink.dataset.author;
|
||||
replyInfo.style.display = "block";
|
||||
}
|
||||
|
||||
function registerReplyButton(button) {
|
||||
button.addEventListener("click", function () {
|
||||
parentCommentInput.value = button.dataset.commentId;
|
||||
replyInfo.textContent = "Antwort auf " + button.dataset.author;
|
||||
replyInfo.style.display = "block";
|
||||
commentContent.focus();
|
||||
});
|
||||
}
|
||||
@@ -56,29 +45,18 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
const formData = new FormData(form);
|
||||
const parentCommentId = parentCommentInput.value;
|
||||
|
||||
fetch(form.action, {
|
||||
fetch("php/ajax/add-comment.php", {
|
||||
method: "POST",
|
||||
body: formData,
|
||||
headers: {
|
||||
"X-Requested-With": "XMLHttpRequest"
|
||||
}
|
||||
body: formData
|
||||
})
|
||||
.then(function (response) {
|
||||
if (!response.ok) {
|
||||
throw new Error("Fehlerhafte Serverantwort.");
|
||||
}
|
||||
|
||||
return response.json();
|
||||
})
|
||||
.then(function (data) {
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (!data.success) {
|
||||
alert(data.message);
|
||||
return;
|
||||
}
|
||||
|
||||
const emptyMessage = commentsList.querySelector(
|
||||
".no-comments-message"
|
||||
);
|
||||
const emptyMessage = commentsList.querySelector(".no-comments-message");
|
||||
|
||||
if (emptyMessage) {
|
||||
emptyMessage.remove();
|
||||
@@ -86,172 +64,49 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
|
||||
const commentElement = document.createElement("div");
|
||||
commentElement.classList.add("comment-item");
|
||||
commentElement.dataset.commentId = data.commentId;
|
||||
|
||||
if (parentCommentId !== "") {
|
||||
if (parentCommentId) {
|
||||
commentElement.classList.add("comment-reply");
|
||||
|
||||
commentElement.innerHTML = `
|
||||
<p>
|
||||
<strong>${escapeHtml(data.author)}</strong>
|
||||
<span>${escapeHtml(data.created)}</span>
|
||||
</p>
|
||||
<p>
|
||||
<strong>${escapeHtml(data.author)}</strong>
|
||||
<span>${escapeHtml(data.created)}</span>
|
||||
</p>
|
||||
<p>${escapeHtml(data.content).replace(/\n/g, "<br>")}</p>
|
||||
`;
|
||||
|
||||
<p>${escapeHtml(data.content).replace(/\n/g, "<br>")}</p>
|
||||
|
||||
<details class="edit-comment-details">
|
||||
<summary class="edit-comment-button">
|
||||
Antwort bearbeiten
|
||||
</summary>
|
||||
|
||||
<form
|
||||
method="post"
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
value="${escapeHtml(data.commentId)}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="article_id"
|
||||
value="${escapeHtml(formData.get("article_id"))}"
|
||||
>
|
||||
|
||||
<textarea
|
||||
name="content"
|
||||
required
|
||||
>${escapeHtml(data.content)}</textarea>
|
||||
|
||||
<button type="submit" class="button">
|
||||
Änderungen speichern
|
||||
</button>
|
||||
</form>
|
||||
</details>
|
||||
|
||||
<form
|
||||
method="post"
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
value="${escapeHtml(data.commentId)}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="article_id"
|
||||
value="${escapeHtml(formData.get("article_id"))}"
|
||||
>
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
class="delete-comment-button"
|
||||
onclick="return confirm('Möchtest du diesen Kommentar wirklich löschen?');"
|
||||
>
|
||||
Kommentar löschen
|
||||
</button>
|
||||
</form>
|
||||
`;
|
||||
|
||||
const parentReplies = commentsList.querySelector(
|
||||
const parentReplies = document.querySelector(
|
||||
`.comment-item[data-comment-id="${parentCommentId}"] .comment-replies`
|
||||
);
|
||||
|
||||
if (parentReplies) {
|
||||
parentReplies.appendChild(commentElement);
|
||||
} else {
|
||||
commentsList.prepend(commentElement);
|
||||
}
|
||||
|
||||
} else {
|
||||
commentElement.dataset.commentId = data.commentId;
|
||||
|
||||
commentElement.innerHTML = `
|
||||
<p>
|
||||
<strong>${escapeHtml(data.author)}</strong>
|
||||
<span>${escapeHtml(data.created)}</span>
|
||||
</p>
|
||||
<p>
|
||||
<strong>${escapeHtml(data.author)}</strong>
|
||||
<span>${escapeHtml(data.created)}</span>
|
||||
</p>
|
||||
<p>${escapeHtml(data.content).replace(/\n/g, "<br>")}</p>
|
||||
|
||||
<p>${escapeHtml(data.content).replace(/\n/g, "<br>")}</p>
|
||||
<button type="button"
|
||||
class="reply-button"
|
||||
data-comment-id="${escapeHtml(data.commentId)}"
|
||||
data-author="${escapeHtml(data.author)}">
|
||||
Antworten
|
||||
</button>
|
||||
|
||||
<details class="edit-comment-details">
|
||||
<summary class="edit-comment-button">
|
||||
Kommentar bearbeiten
|
||||
</summary>
|
||||
|
||||
<form
|
||||
method="post"
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
value="${escapeHtml(data.commentId)}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="article_id"
|
||||
value="${escapeHtml(formData.get("article_id"))}"
|
||||
>
|
||||
|
||||
<textarea
|
||||
name="content"
|
||||
required
|
||||
>${escapeHtml(data.content)}</textarea>
|
||||
|
||||
<button type="submit" class="button">
|
||||
Änderungen speichern
|
||||
</button>
|
||||
</form>
|
||||
</details>
|
||||
|
||||
<form
|
||||
method="post"
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
value="${escapeHtml(data.commentId)}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="article_id"
|
||||
value="${escapeHtml(formData.get("article_id"))}"
|
||||
>
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
class="delete-comment-button"
|
||||
onclick="return confirm('Möchtest du diesen Kommentar wirklich löschen?');"
|
||||
>
|
||||
Kommentar löschen
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<a
|
||||
href="#comment-form"
|
||||
class="reply-button"
|
||||
data-comment-id="${escapeHtml(data.commentId)}"
|
||||
data-author="${escapeHtml(data.author)}"
|
||||
>
|
||||
Antworten
|
||||
</a>
|
||||
|
||||
<div class="comment-replies"></div>
|
||||
`;
|
||||
<div class="comment-replies"></div>
|
||||
`;
|
||||
|
||||
commentsList.prepend(commentElement);
|
||||
|
||||
const newReplyButton =
|
||||
commentElement.querySelector(".reply-button");
|
||||
const newReplyButton = commentElement.querySelector(".reply-button");
|
||||
|
||||
if (newReplyButton) {
|
||||
registerReplyButton(newReplyButton);
|
||||
@@ -260,14 +115,10 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
|
||||
commentContent.value = "";
|
||||
parentCommentInput.value = "";
|
||||
|
||||
if (replyInfo) {
|
||||
replyInfo.textContent = "";
|
||||
replyInfo.style.display = "none";
|
||||
}
|
||||
replyInfo.textContent = "";
|
||||
replyInfo.style.display = "none";
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.error(error);
|
||||
.catch(() => {
|
||||
alert("Kommentar konnte nicht gesendet werden.");
|
||||
});
|
||||
});
|
||||
@@ -275,12 +126,12 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
/**
|
||||
* Entfernt HTML-Sonderzeichen aus Nutzereingaben.
|
||||
*
|
||||
* @param {*} text Zu bereinigender Text
|
||||
* @param {string} text Zu bereinigender Text
|
||||
* @returns {string} Sicherer Text
|
||||
*/
|
||||
function escapeHtml(text) {
|
||||
const div = document.createElement("div");
|
||||
div.textContent = String(text ?? "");
|
||||
div.textContent = text;
|
||||
return div.innerHTML;
|
||||
}
|
||||
});
|
||||
+223
-22
@@ -1,27 +1,228 @@
|
||||
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');
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
pageButtons.forEach(button => {
|
||||
button.addEventListener('click', function() {
|
||||
if (this.disabled) return;
|
||||
const state = {
|
||||
items: [],
|
||||
sorted: [],
|
||||
category: 'all',
|
||||
sort: 'alphabet',
|
||||
limit: 10,
|
||||
page: 1,
|
||||
};
|
||||
|
||||
const targetPage = this.getAttribute('data-page');
|
||||
function loadData() {
|
||||
const el = document.getElementById('s-res-data');
|
||||
if (!el) return [];
|
||||
try {
|
||||
return JSON.parse(el.textContent);
|
||||
} catch (e) {
|
||||
console.error('Suchergebnis-Daten konnten nicht gelesen werden', e);
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
if (targetPage && form && pageInput) {
|
||||
pageInput.value = targetPage;
|
||||
form.submit();
|
||||
}
|
||||
function applyFilterAndSort() {
|
||||
let list = state.items.slice();
|
||||
|
||||
if (state.category && state.category !== 'all') {
|
||||
list = list.filter(item => (item.category || '') === state.category);
|
||||
}
|
||||
|
||||
switch (state.sort) {
|
||||
case 'likes':
|
||||
list.sort((a, b) => (b.likes || 0) - (a.likes || 0));
|
||||
break;
|
||||
case 'newest':
|
||||
list.sort((a, b) => (b.creationDate || '').localeCompare(a.creationDate || ''));
|
||||
break;
|
||||
case 'oldest':
|
||||
list.sort((a, b) => (a.creationDate || '').localeCompare(b.creationDate || ''));
|
||||
break;
|
||||
default:
|
||||
list.sort((a, b) => (a.title || '').localeCompare(b.title || '', 'de', { sensitivity: 'base' }));
|
||||
}
|
||||
|
||||
state.sorted = list;
|
||||
const totalPages = Math.max(1, Math.ceil(state.sorted.length / state.limit));
|
||||
state.page = Math.min(Math.max(state.page, 1), totalPages);
|
||||
}
|
||||
|
||||
function el(tag, className, text) {
|
||||
const e = document.createElement(tag);
|
||||
if (className) e.className = className;
|
||||
if (text !== undefined) e.textContent = text;
|
||||
return e;
|
||||
}
|
||||
|
||||
function renderList() {
|
||||
const container = document.querySelector('.s-res-list');
|
||||
if (!container) return;
|
||||
|
||||
const start = (state.page - 1) * state.limit;
|
||||
const pageItems = state.sorted.slice(start, start + state.limit);
|
||||
|
||||
container.innerHTML = '';
|
||||
|
||||
if (pageItems.length === 0) {
|
||||
container.appendChild(el('p', null, 'Keine Beiträge zu diesem Suchbegriff gefunden.'));
|
||||
return;
|
||||
}
|
||||
|
||||
pageItems.forEach(item => {
|
||||
const item_el = el('div', 's-res-item');
|
||||
item_el.dataset.likes = item.likes;
|
||||
item_el.dataset.category = item.category;
|
||||
|
||||
const link = el('a', 's-res-link', item.title);
|
||||
link.href = 'index.php?pfad=showArticle&id=' + encodeURIComponent(item.id);
|
||||
|
||||
const title = el('h2', 's-res-item-title');
|
||||
title.appendChild(link);
|
||||
|
||||
const authorName = el('span', 's-res-author-name', item.author);
|
||||
const author = el('p', 's-res-author', 'Von: ');
|
||||
author.appendChild(authorName);
|
||||
|
||||
const likes = el('span', 's-res-likes', '❤️ ' + item.likes);
|
||||
|
||||
const metaRow = el('div', 's-res-meta-row');
|
||||
metaRow.appendChild(author);
|
||||
metaRow.appendChild(likes);
|
||||
|
||||
const content = el('div', 's-res-content');
|
||||
content.appendChild(title);
|
||||
content.appendChild(metaRow);
|
||||
|
||||
item_el.appendChild(content);
|
||||
item_el.appendChild(el('div', 's-res-arrow', '→'));
|
||||
|
||||
container.appendChild(item_el);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 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();
|
||||
}
|
||||
function renderMeta() {
|
||||
const metaEl = document.querySelector('.s-res-meta');
|
||||
const queryInput = document.getElementById('site-search');
|
||||
if (metaEl) {
|
||||
const q = queryInput ? queryInput.value : '';
|
||||
metaEl.textContent = state.sorted.length + ' Treffer für Ihre Suchanfrage "' + q + '"';
|
||||
}
|
||||
}
|
||||
|
||||
function renderPagination() {
|
||||
const nav = document.querySelector('.s-res-page-navigation');
|
||||
if (!nav) return;
|
||||
|
||||
const totalPages = Math.max(1, Math.ceil(state.sorted.length / state.limit));
|
||||
nav.innerHTML = '';
|
||||
|
||||
const makeBtn = (label, page, disabled, active) => {
|
||||
const btn = el('button', 's-res-page-btn' + (active ? ' is-active' : ''), label);
|
||||
btn.type = 'button';
|
||||
btn.disabled = !!disabled;
|
||||
btn.addEventListener('click', () => goToPage(page));
|
||||
return btn;
|
||||
};
|
||||
|
||||
nav.appendChild(makeBtn('«', state.page - 1, state.page <= 1));
|
||||
|
||||
const windowSize = 2;
|
||||
for (let p = 1; p <= totalPages; p++) {
|
||||
const edge = p === 1 || p === totalPages;
|
||||
const near = Math.abs(p - state.page) <= windowSize;
|
||||
if (!edge && !near) {
|
||||
if (p === 2 || p === totalPages - 1) nav.appendChild(el('span', 's-res-page-dots', '…'));
|
||||
continue;
|
||||
}
|
||||
nav.appendChild(makeBtn(String(p), p, false, p === state.page));
|
||||
}
|
||||
|
||||
nav.appendChild(makeBtn('»', state.page + 1, state.page >= totalPages));
|
||||
}
|
||||
|
||||
function updateUrl() {
|
||||
const url = new URL(window.location.href);
|
||||
url.searchParams.set('sort', state.sort);
|
||||
url.searchParams.set('category', state.category);
|
||||
url.searchParams.set('limit', state.limit);
|
||||
url.searchParams.set('page', state.page);
|
||||
window.history.replaceState(null, '', url);
|
||||
}
|
||||
|
||||
function rerender() {
|
||||
applyFilterAndSort();
|
||||
renderList();
|
||||
renderMeta();
|
||||
renderPagination();
|
||||
updateUrl();
|
||||
}
|
||||
|
||||
function goToPage(page) {
|
||||
const totalPages = Math.max(1, Math.ceil(state.sorted.length / state.limit));
|
||||
state.page = Math.min(Math.max(page, 1), totalPages);
|
||||
renderList();
|
||||
renderPagination();
|
||||
updateUrl();
|
||||
}
|
||||
|
||||
function initPaginator() {
|
||||
state.items = loadData();
|
||||
|
||||
const checkedSort = document.querySelector('.sort-radio:checked');
|
||||
state.sort = checkedSort ? checkedSort.value : 'alphabet';
|
||||
|
||||
const categorySelect = document.getElementById('category-filter');
|
||||
state.category = categorySelect ? categorySelect.value.toLowerCase() : 'all';
|
||||
|
||||
const limitSelect = document.getElementById('s-res-per-page');
|
||||
state.limit = limitSelect ? parseInt(limitSelect.value, 10) || 10 : 10;
|
||||
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
state.page = parseInt(params.get('page') || '1', 10) || 1;
|
||||
|
||||
document.querySelectorAll('.sort-radio').forEach(radio => {
|
||||
radio.addEventListener('change', function () {
|
||||
state.sort = this.value;
|
||||
state.page = 1;
|
||||
rerender();
|
||||
});
|
||||
});
|
||||
|
||||
if (categorySelect) {
|
||||
categorySelect.addEventListener('change', function () {
|
||||
state.category = this.value.toLowerCase();
|
||||
state.page = 1;
|
||||
rerender();
|
||||
});
|
||||
}
|
||||
|
||||
if (limitSelect) {
|
||||
limitSelect.addEventListener('change', function () {
|
||||
state.limit = parseInt(this.value, 10) || 10;
|
||||
state.page = 1;
|
||||
rerender();
|
||||
});
|
||||
}
|
||||
|
||||
// "Filter anwenden"-Button wird bei aktivem JS nicht gebraucht
|
||||
const applyBtn = document.querySelector('.s-res-apply-btn');
|
||||
if (applyBtn) applyBtn.style.display = 'none';
|
||||
|
||||
// Server-gerenderte Pagination-Links durch clientseitige Steuerung ersetzen
|
||||
document.querySelectorAll('.s-res-page-navigation .s-res-page-btn').forEach(link => {
|
||||
link.addEventListener('click', function (evt) {
|
||||
evt.preventDefault();
|
||||
const target = parseInt(this.getAttribute('data-page'), 10);
|
||||
if (!isNaN(target)) goToPage(target);
|
||||
});
|
||||
});
|
||||
|
||||
rerender();
|
||||
}
|
||||
|
||||
if (document.readyState === 'loading') {
|
||||
document.addEventListener('DOMContentLoaded', initPaginator);
|
||||
} else {
|
||||
initPaginator();
|
||||
}
|
||||
})();
|
||||
+29
-155
@@ -3,153 +3,32 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
session_start();
|
||||
}
|
||||
|
||||
header("Content-Type: application/json");
|
||||
|
||||
require_once "../model/CommentManager.php";
|
||||
|
||||
/**
|
||||
* Prüft, ob die Anfrage durch JavaScript per AJAX gesendet wurde.
|
||||
*/
|
||||
$isAjaxRequest = isset($_SERVER["HTTP_X_REQUESTED_WITH"])
|
||||
&& strtolower($_SERVER["HTTP_X_REQUESTED_WITH"]) === "xmlhttprequest";
|
||||
|
||||
/**
|
||||
* Gibt das Ergebnis entweder als JSON zurück oder leitet
|
||||
* bei einem normalen Formularaufruf wieder zum Beitrag zurück.
|
||||
*
|
||||
* @param bool $success War das Speichern erfolgreich?
|
||||
* @param string $message Rückmeldung für den Benutzer
|
||||
* @param int|null $articleId ID des Beitrags
|
||||
* @param array $additionalData Zusätzliche Daten für AJAX
|
||||
*/
|
||||
function sendCommentResponse(
|
||||
$success,
|
||||
$message,
|
||||
$articleId,
|
||||
$additionalData = []
|
||||
) {
|
||||
global $isAjaxRequest;
|
||||
|
||||
if ($isAjaxRequest) {
|
||||
header("Content-Type: application/json; charset=utf-8");
|
||||
|
||||
echo json_encode(
|
||||
array_merge(
|
||||
[
|
||||
"success" => $success,
|
||||
"message" => $message
|
||||
],
|
||||
$additionalData
|
||||
)
|
||||
);
|
||||
|
||||
exit();
|
||||
}
|
||||
|
||||
/*
|
||||
* Bei deaktiviertem JavaScript wird die Rückmeldung
|
||||
* in der Session gespeichert und die Beitragsseite neu geladen.
|
||||
*/
|
||||
$_SESSION["comment_message"] = $message;
|
||||
$_SESSION["comment_message_type"] = $success ? "success" : "error";
|
||||
|
||||
if ($articleId !== null) {
|
||||
header(
|
||||
"Location: ../../index.php?pfad=showArticle&id="
|
||||
. urlencode((string) $articleId)
|
||||
. "#comments"
|
||||
);
|
||||
} else {
|
||||
header("Location: ../../index.php");
|
||||
}
|
||||
|
||||
if (!isset($_SESSION["user_email"])) {
|
||||
echo json_encode([
|
||||
"success" => false,
|
||||
"message" => "Du musst angemeldet sein, um zu kommentieren."
|
||||
]);
|
||||
exit();
|
||||
}
|
||||
|
||||
/*
|
||||
* Nur POST-Anfragen dürfen Kommentare erstellen.
|
||||
*/
|
||||
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
"Ungültige Anfrage.",
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
/*
|
||||
* Die Beitrags-ID wird zuerst eingelesen,
|
||||
* damit bei Fehlern wieder zum Beitrag zurückgeleitet werden kann.
|
||||
*/
|
||||
$articleId = filter_input(
|
||||
INPUT_POST,
|
||||
"article_id",
|
||||
FILTER_VALIDATE_INT
|
||||
);
|
||||
|
||||
/*
|
||||
* Ein Benutzer muss angemeldet sein.
|
||||
*/
|
||||
if (!isset($_SESSION["user_email"])) {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
"Du musst angemeldet sein, um zu kommentieren.",
|
||||
$articleId !== false ? $articleId : null
|
||||
);
|
||||
}
|
||||
|
||||
/*
|
||||
* Weitere Formulardaten einlesen.
|
||||
*/
|
||||
|
||||
$articleId = $_POST["article_id"] ?? null;
|
||||
$content = trim($_POST["content"] ?? "");
|
||||
$parentCommentId = $_POST["parent_comment_id"] ?? null;
|
||||
|
||||
$parentCommentId = filter_input(
|
||||
INPUT_POST,
|
||||
"parent_comment_id",
|
||||
FILTER_VALIDATE_INT
|
||||
);
|
||||
|
||||
/*
|
||||
* Ein leerer Wert bedeutet, dass es sich um einen
|
||||
* normalen Hauptkommentar handelt.
|
||||
*/
|
||||
if (
|
||||
!isset($_POST["parent_comment_id"])
|
||||
|| $_POST["parent_comment_id"] === ""
|
||||
|| $_POST["parent_comment_id"] === "0"
|
||||
) {
|
||||
if ($parentCommentId === "" || $parentCommentId === "0") {
|
||||
$parentCommentId = null;
|
||||
}
|
||||
|
||||
if ($articleId === false || $articleId === null) {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
"Der zugehörige Beitrag ist ungültig.",
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
if ($content === "") {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
"Der Kommentar darf nicht leer sein.",
|
||||
$articleId
|
||||
);
|
||||
}
|
||||
|
||||
/*
|
||||
* Eine ungültige Eltern-ID darf nicht gespeichert werden.
|
||||
*/
|
||||
if (
|
||||
isset($_POST["parent_comment_id"])
|
||||
&& $_POST["parent_comment_id"] !== ""
|
||||
&& $_POST["parent_comment_id"] !== "0"
|
||||
&& $parentCommentId === false
|
||||
) {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
"Der ausgewählte Kommentar ist ungültig.",
|
||||
$articleId
|
||||
);
|
||||
if (empty($articleId) || empty($content)) {
|
||||
echo json_encode([
|
||||
"success" => false,
|
||||
"message" => "Kommentar darf nicht leer sein."
|
||||
]);
|
||||
exit();
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -162,23 +41,18 @@ try {
|
||||
$parentCommentId
|
||||
);
|
||||
|
||||
sendCommentResponse(
|
||||
true,
|
||||
"Der Kommentar wurde erfolgreich gespeichert.",
|
||||
$articleId,
|
||||
[
|
||||
"commentId" => $commentId,
|
||||
"author" => $_SESSION["user_email"],
|
||||
"content" => $content,
|
||||
"created" => date("Y-m-d H:i:s"),
|
||||
"parentCommentId" => $parentCommentId
|
||||
]
|
||||
);
|
||||
echo json_encode([
|
||||
"success" => true,
|
||||
"commentId" => $commentId,
|
||||
"author" => $_SESSION["user_email"],
|
||||
"content" => $content,
|
||||
"created" => date("Y-m-d H:i:s"),
|
||||
"parentCommentId" => $parentCommentId
|
||||
]);
|
||||
|
||||
} catch (Throwable $e) {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
"Der Kommentar konnte nicht gespeichert werden.",
|
||||
$articleId
|
||||
);
|
||||
} catch (Exception $e) {
|
||||
echo json_encode([
|
||||
"success" => false,
|
||||
"message" => "Kommentar konnte nicht gespeichert werden."
|
||||
]);
|
||||
}
|
||||
@@ -1,105 +0,0 @@
|
||||
<?php
|
||||
|
||||
if (session_status() === PHP_SESSION_NONE) {
|
||||
session_start();
|
||||
}
|
||||
|
||||
require_once __DIR__ . "/../model/CommentManager.php";
|
||||
|
||||
/*
|
||||
* Kommentare dürfen nur über ein POST-Formular gelöscht werden.
|
||||
*/
|
||||
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
||||
header("Location: index.php");
|
||||
exit();
|
||||
}
|
||||
$commentId = filter_input(
|
||||
INPUT_POST,
|
||||
"comment_id",
|
||||
FILTER_VALIDATE_INT
|
||||
);
|
||||
|
||||
$articleId = filter_input(
|
||||
INPUT_POST,
|
||||
"article_id",
|
||||
FILTER_VALIDATE_INT
|
||||
);
|
||||
|
||||
/*
|
||||
* Nur angemeldete Nutzer dürfen Kommentare löschen.
|
||||
*/
|
||||
if (!isset($_SESSION["user_email"])) {
|
||||
$_SESSION["comment_message"] = "Du musst angemeldet sein.";
|
||||
$_SESSION["comment_message_type"] = "error";
|
||||
|
||||
if ($articleId !== false && $articleId !== null) {
|
||||
header(
|
||||
"Location: index.php?pfad=showArticle&id="
|
||||
. urlencode((string) $articleId)
|
||||
. "#comments"
|
||||
);
|
||||
} else {
|
||||
header("Location: index.php");
|
||||
}
|
||||
exit();
|
||||
}
|
||||
|
||||
/*
|
||||
* Kommentar-ID und Beitrags-ID müssen gültige Zahlen sein.
|
||||
*/
|
||||
if (
|
||||
$commentId === false
|
||||
|| $commentId === null
|
||||
|| $articleId === false
|
||||
|| $articleId === null
|
||||
) {
|
||||
$_SESSION["comment_message"] =
|
||||
"Der Kommentar konnte nicht gelöscht werden.";
|
||||
|
||||
$_SESSION["comment_message_type"] = "error";
|
||||
|
||||
header("Location: index.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
try {
|
||||
$commentManager = CommentManager::getInstance();
|
||||
|
||||
/*
|
||||
* Die E-Mail-Adresse aus der Session wird mitgegeben.
|
||||
* Dadurch kann der Nutzer nur eigene Kommentare löschen.
|
||||
*/
|
||||
$deleted = $commentManager->deleteComment(
|
||||
$commentId,
|
||||
$_SESSION["user_email"]
|
||||
);
|
||||
|
||||
if ($deleted) {
|
||||
$_SESSION["comment_message"] =
|
||||
"Der Kommentar wurde gelöscht.";
|
||||
|
||||
$_SESSION["comment_message_type"] = "success";
|
||||
} else {
|
||||
$_SESSION["comment_message"] =
|
||||
"Der Kommentar wurde nicht gefunden oder gehört nicht dir.";
|
||||
|
||||
$_SESSION["comment_message_type"] = "error";
|
||||
}
|
||||
|
||||
} catch (Throwable $e) {
|
||||
$_SESSION["comment_message"] =
|
||||
"Der Kommentar konnte nicht gelöscht werden.";
|
||||
|
||||
$_SESSION["comment_message_type"] = "error";
|
||||
}
|
||||
|
||||
/*
|
||||
* Anschließend wird wieder zum Beitrag und zu den Kommentaren geleitet.
|
||||
*/
|
||||
header(
|
||||
"Location: index.php?pfad=showArticle&id="
|
||||
. urlencode((string) $articleId)
|
||||
. "#comments"
|
||||
);
|
||||
|
||||
exit();
|
||||
@@ -16,37 +16,11 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
|
||||
$_SESSION["message"] = "invalid_search_query";
|
||||
} else {
|
||||
try {
|
||||
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$userManager = UserManager::getInstance();
|
||||
|
||||
|
||||
$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[] = [
|
||||
@@ -60,25 +34,21 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) {
|
||||
"likes" => $obj->getLikes(),
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
$_SESSION["search_results"] = $safeArrayResults;
|
||||
$_SESSION["search_query"] = $search;
|
||||
$_SESSION["message"] = "new_search_results";
|
||||
|
||||
} catch (Exception $e){
|
||||
// Bei einer neuen Suche Anzeige-Filter zurücksetzen
|
||||
$_SESSION['search_sort'] = 'alphabet';
|
||||
$_SESSION['search_category'] = 'all';
|
||||
$_SESSION['search_limit'] = 10;
|
||||
|
||||
} catch (Exception $e) {
|
||||
$_SESSION["message"] = "internal_error";
|
||||
}
|
||||
}
|
||||
|
||||
$sort = $_GET['sort'] ?? 'alphabet';
|
||||
$limit = isset($_GET['limit']) ? (int)$_GET['limit'] : 10;
|
||||
if (!searchLimitValidator($limit)) {
|
||||
$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);
|
||||
header("Location: ../../index.php?pfad=search-results&q=" . urlencode($search));
|
||||
exit();
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
}
|
||||
@@ -49,9 +49,8 @@ if (isset($_GET["id"]) && !empty($_GET["id"])){
|
||||
}
|
||||
}
|
||||
|
||||
} catch (Throwable $e) {
|
||||
} catch (Exception $e){
|
||||
$_SESSION["message"] = "internal_error";
|
||||
header("Location: index.php");
|
||||
exit();
|
||||
}
|
||||
}else{
|
||||
|
||||
@@ -1,92 +0,0 @@
|
||||
<?php
|
||||
|
||||
if (session_status() === PHP_SESSION_NONE) {
|
||||
session_start();
|
||||
}
|
||||
|
||||
require_once "php/model/CommentManager.php";
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
||||
header("Location: index.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
if (!isset($_SESSION["user_email"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
exit();
|
||||
}
|
||||
|
||||
$commentId = filter_input(
|
||||
INPUT_POST,
|
||||
"comment_id",
|
||||
FILTER_VALIDATE_INT
|
||||
);
|
||||
|
||||
$articleId = filter_input(
|
||||
INPUT_POST,
|
||||
"article_id",
|
||||
FILTER_VALIDATE_INT
|
||||
);
|
||||
|
||||
$content = trim($_POST["content"] ?? "");
|
||||
|
||||
/*
|
||||
* Ohne gültige Beitrags-ID kann nicht sicher
|
||||
* zum ursprünglichen Beitrag zurückgeleitet werden.
|
||||
*/
|
||||
if (!$articleId) {
|
||||
header("Location: index.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
/*
|
||||
* Kommentar-ID und Inhalt werden geprüft.
|
||||
*/
|
||||
if (!$commentId || $content === "") {
|
||||
$_SESSION["comment_message"] =
|
||||
"Der Kommentar darf nicht leer sein.";
|
||||
|
||||
$_SESSION["comment_message_type"] = "error";
|
||||
|
||||
header(
|
||||
"Location: index.php?pfad=showArticle&id="
|
||||
. urlencode((string) $articleId)
|
||||
. "#comments"
|
||||
);
|
||||
exit();
|
||||
}
|
||||
|
||||
try {
|
||||
$commentManager = CommentManager::getInstance();
|
||||
|
||||
$updated = $commentManager->updateComment(
|
||||
$commentId,
|
||||
$_SESSION["user_email"],
|
||||
$content
|
||||
);
|
||||
|
||||
if ($updated) {
|
||||
$_SESSION["comment_message"] =
|
||||
"Der Kommentar wurde erfolgreich bearbeitet.";
|
||||
|
||||
$_SESSION["comment_message_type"] = "success";
|
||||
} else {
|
||||
$_SESSION["comment_message"] =
|
||||
"Der Kommentar konnte nicht bearbeitet werden.";
|
||||
|
||||
$_SESSION["comment_message_type"] = "error";
|
||||
}
|
||||
|
||||
} catch (Throwable $e) {
|
||||
$_SESSION["comment_message"] =
|
||||
"Beim Bearbeiten des Kommentars ist ein Fehler aufgetreten.";
|
||||
|
||||
$_SESSION["comment_message_type"] = "error";
|
||||
}
|
||||
|
||||
header(
|
||||
"Location: index.php?pfad=showArticle&id="
|
||||
. urlencode((string) $articleId)
|
||||
. "#comments"
|
||||
);
|
||||
exit();
|
||||
@@ -13,7 +13,7 @@ class Comment
|
||||
private int $id;
|
||||
private int $articleId;
|
||||
private ?int $parentCommentId;
|
||||
private ?string $author;
|
||||
private string $author;
|
||||
private string $content;
|
||||
private string $created;
|
||||
|
||||
@@ -23,7 +23,7 @@ class Comment
|
||||
* @param int $id Eindeutige ID des Kommentars
|
||||
* @param int $articleId ID des zugehörigen Beitrags
|
||||
* @param int|null $parentCommentId ID des Eltern-Kommentars oder null
|
||||
* @param string|null $author Autor des Kommentars oder null bei gelöschten Kommentaren
|
||||
* @param string $author Autor des Kommentars
|
||||
* @param string $content Inhalt des Kommentars
|
||||
* @param string $created Erstellungsdatum des Kommentars
|
||||
*/
|
||||
@@ -31,7 +31,7 @@ class Comment
|
||||
int $id,
|
||||
int $articleId,
|
||||
?int $parentCommentId,
|
||||
?string $author,
|
||||
string $author,
|
||||
string $content,
|
||||
string $created
|
||||
) {
|
||||
@@ -86,9 +86,9 @@ class Comment
|
||||
/**
|
||||
* Gibt den Autor des Kommentars zurück.
|
||||
*
|
||||
* @return string|null Autor oder null bei gelöschten Kommentaren
|
||||
* @return string Autor
|
||||
*/
|
||||
public function getAuthor(): ?string
|
||||
public function getAuthor(): string
|
||||
{
|
||||
return $this->author;
|
||||
}
|
||||
|
||||
@@ -51,40 +51,4 @@ interface CommentManagerDAO
|
||||
* @return Comment[] Liste der Kommentare
|
||||
*/
|
||||
public function getCommentsByAuthor($author);
|
||||
/**
|
||||
* Löscht einen einzelnen Kommentar des angemeldeten Nutzers.
|
||||
*
|
||||
* Kommentare ohne Antworten werden vollständig entfernt.
|
||||
* Kommentare mit Antworten bleiben als anonymer Platzhalter erhalten.
|
||||
*
|
||||
* @param int $commentId ID des Kommentars
|
||||
* @param string $author E-Mail-Adresse des Autors
|
||||
* @return bool true, wenn der Kommentar gefunden und gelöscht wurde
|
||||
*/
|
||||
public function deleteComment(int $commentId, string $author): bool;
|
||||
|
||||
/**
|
||||
* Löscht beziehungsweise anonymisiert alle Kommentare eines Nutzers.
|
||||
*
|
||||
* Diese Methode wird bei der Löschung eines Benutzerkontos verwendet.
|
||||
*
|
||||
* @param string $author E-Mail-Adresse des Nutzers
|
||||
* @return void
|
||||
*/
|
||||
public function deleteCommentsByAuthor(string $author): void;
|
||||
/**
|
||||
* Bearbeitet einen Kommentar des angemeldeten Nutzers.
|
||||
*
|
||||
* Nur der Autor des Kommentars darf den Inhalt ändern.
|
||||
*
|
||||
* @param int $commentId ID des Kommentars
|
||||
* @param string $author E-Mail-Adresse des Autors
|
||||
* @param string $content Neuer Kommentarinhalt
|
||||
* @return bool true, wenn der Kommentar bearbeitet wurde
|
||||
*/
|
||||
public function updateComment(
|
||||
int $commentId,
|
||||
string $author,
|
||||
string $content
|
||||
): bool;
|
||||
}
|
||||
@@ -17,7 +17,7 @@ class DatabaseCommentManager implements CommentManagerDAO
|
||||
/**
|
||||
* Erstellt die Kommentartabelle, falls diese noch nicht existiert.
|
||||
*/
|
||||
private function __construct()
|
||||
public function __construct()
|
||||
{
|
||||
$this->dbPath = __DIR__ . '/../../db/eduforgeDB.db';
|
||||
DatabaseInitializer::initialize($this->dbPath);
|
||||
@@ -223,194 +223,4 @@ class DatabaseCommentManager implements CommentManagerDAO
|
||||
|
||||
return $comments;
|
||||
}
|
||||
/**
|
||||
* Bearbeitet einen eigenen Kommentar.
|
||||
*
|
||||
* Der Kommentar wird nur geändert, wenn er dem
|
||||
* angemeldeten Nutzer gehört.
|
||||
*
|
||||
* @param int $commentId ID des Kommentars
|
||||
* @param string $author E-Mail-Adresse des Autors
|
||||
* @param string $content Neuer Kommentarinhalt
|
||||
* @return bool true, wenn der Kommentar bearbeitet wurde
|
||||
*/
|
||||
public function updateComment(
|
||||
int $commentId,
|
||||
string $author,
|
||||
string $content
|
||||
): bool {
|
||||
try {
|
||||
$db = $this->getConnection();
|
||||
|
||||
$command = $db->prepare("
|
||||
UPDATE comments
|
||||
SET content = :content
|
||||
WHERE id = :commentId
|
||||
AND author = :author
|
||||
");
|
||||
|
||||
$command->execute([
|
||||
":content" => $content,
|
||||
":commentId" => $commentId,
|
||||
":author" => $author
|
||||
]);
|
||||
|
||||
return $command->rowCount() > 0;
|
||||
|
||||
} catch (PDOException $e) {
|
||||
throw new RuntimeException("internal_error");
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Löscht einen eigenen Kommentar.
|
||||
*
|
||||
* Hat der Kommentar Antworten, wird er anonymisiert.
|
||||
* Hat er keine Antworten, wird er vollständig gelöscht.
|
||||
*
|
||||
* @param int $commentId ID des Kommentars
|
||||
* @param string $author E-Mail-Adresse des Autors
|
||||
* @return bool true, wenn der Kommentar gelöscht wurde
|
||||
*/
|
||||
public function deleteComment(int $commentId, string $author): bool
|
||||
{
|
||||
try {
|
||||
$db = $this->getConnection();
|
||||
|
||||
/*
|
||||
* Zuerst wird geprüft, ob der Kommentar existiert
|
||||
* und wirklich dem angemeldeten Nutzer gehört.
|
||||
*/
|
||||
$checkCommand = $db->prepare("
|
||||
SELECT id
|
||||
FROM comments
|
||||
WHERE id = :commentId
|
||||
AND author = :author
|
||||
");
|
||||
|
||||
$checkCommand->execute([
|
||||
":commentId" => $commentId,
|
||||
":author" => $author
|
||||
]);
|
||||
|
||||
if ($checkCommand->fetch() === false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* Danach wird geprüft, ob Antworten auf den Kommentar existieren.
|
||||
*/
|
||||
$replyCommand = $db->prepare("
|
||||
SELECT COUNT(*)
|
||||
FROM comments
|
||||
WHERE parent_comment_id = :commentId
|
||||
");
|
||||
|
||||
$replyCommand->execute([
|
||||
":commentId" => $commentId
|
||||
]);
|
||||
|
||||
$hasReplies = (int) $replyCommand->fetchColumn() > 0;
|
||||
|
||||
if ($hasReplies) {
|
||||
/*
|
||||
* Der Kommentar wird für den Kommentarbaum benötigt.
|
||||
* Deshalb bleibt er als anonymer Platzhalter erhalten.
|
||||
*/
|
||||
$deleteCommand = $db->prepare("
|
||||
UPDATE comments
|
||||
SET author = NULL,
|
||||
content = 'Dieser Kommentar wurde gelöscht.'
|
||||
WHERE id = :commentId
|
||||
AND author = :author
|
||||
");
|
||||
} else {
|
||||
/*
|
||||
* Ohne Antworten kann der Kommentar vollständig
|
||||
* aus der Datenbank entfernt werden.
|
||||
*/
|
||||
$deleteCommand = $db->prepare("
|
||||
DELETE FROM comments
|
||||
WHERE id = :commentId
|
||||
AND author = :author
|
||||
");
|
||||
}
|
||||
|
||||
$deleteCommand->execute([
|
||||
":commentId" => $commentId,
|
||||
":author" => $author
|
||||
]);
|
||||
|
||||
return $deleteCommand->rowCount() > 0;
|
||||
|
||||
} catch (PDOException $e) {
|
||||
throw new RuntimeException("internal_error");
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Löscht beziehungsweise anonymisiert alle Kommentare eines Nutzers.
|
||||
*
|
||||
* Kommentare ohne Antworten werden vollständig gelöscht.
|
||||
* Kommentare mit Antworten bleiben als anonyme Platzhalter erhalten.
|
||||
*
|
||||
* @param string $author E-Mail-Adresse des Nutzers
|
||||
* @return void
|
||||
*/
|
||||
public function deleteCommentsByAuthor(string $author): void
|
||||
{
|
||||
$db = $this->getConnection();
|
||||
|
||||
try {
|
||||
$db->beginTransaction();
|
||||
|
||||
/*
|
||||
* Zuerst werden alle Kommentare ohne Antworten gelöscht.
|
||||
*
|
||||
* Die Schleife ist wichtig, weil durch das Löschen einer Antwort
|
||||
* eventuell auch der darüberliegende Kommentar keine Antworten
|
||||
* mehr besitzt und anschließend ebenfalls gelöscht werden kann.
|
||||
*/
|
||||
do {
|
||||
$deleteCommand = $db->prepare("
|
||||
DELETE FROM comments
|
||||
WHERE author = :author
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM comments AS replies
|
||||
WHERE replies.parent_comment_id = comments.id
|
||||
)
|
||||
");
|
||||
|
||||
$deleteCommand->execute([
|
||||
":author" => $author
|
||||
]);
|
||||
|
||||
$deletedRows = $deleteCommand->rowCount();
|
||||
|
||||
} while ($deletedRows > 0);
|
||||
|
||||
/*
|
||||
* Kommentare, auf die noch Antworten anderer Nutzer folgen,
|
||||
* müssen für den Kommentarbaum erhalten bleiben.
|
||||
*/
|
||||
$placeholderCommand = $db->prepare("
|
||||
UPDATE comments
|
||||
SET author = NULL,
|
||||
content = 'Dieser Kommentar wurde gelöscht.'
|
||||
WHERE author = :author
|
||||
");
|
||||
|
||||
$placeholderCommand->execute([
|
||||
":author" => $author
|
||||
]);
|
||||
|
||||
$db->commit();
|
||||
|
||||
} catch (PDOException $e) {
|
||||
if ($db->inTransaction()) {
|
||||
$db->rollBack();
|
||||
}
|
||||
|
||||
throw new RuntimeException("internal_error");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -46,17 +46,17 @@ class DatabaseInitializer {
|
||||
|
||||
$db->exec("
|
||||
CREATE TABLE IF NOT EXISTS comments (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
article_id INTEGER NOT NULL,
|
||||
parent_comment_id INTEGER NULL,
|
||||
author TEXT NULL,
|
||||
content TEXT NOT NULL,
|
||||
created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (article_id) REFERENCES articles(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY (author) REFERENCES users(email) ON DELETE SET NULL,
|
||||
FOREIGN KEY (parent_comment_id) REFERENCES comments(id) ON DELETE CASCADE
|
||||
);
|
||||
");
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
article_id INTEGER NOT NULL,
|
||||
parent_comment_id INTEGER NULL,
|
||||
author TEXT NOT NULL,
|
||||
content TEXT NOT NULL,
|
||||
created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (article_id) REFERENCES articles(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY (author) REFERENCES users(email) ON DELETE CASCADE,
|
||||
FOREIGN KEY (parent_comment_id) REFERENCES comments(id) ON DELETE CASCADE
|
||||
);
|
||||
");
|
||||
|
||||
$initializer = new self();
|
||||
$availableEmails = $initializer->seedDummyUsers($db);
|
||||
|
||||
Reference in New Issue
Block a user