Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 09f8b11f36 | |||
| cc4cebdb45 |
@@ -27,8 +27,6 @@ $blocks = array_values($blocks); // sequentielle Indizes 0..n-1 sicherstellen
|
|||||||
-->
|
-->
|
||||||
<form method="post" action="php/controller/createArticle-controller.php" id="editor-form" enctype="multipart/form-data" class="article-editor-scope.editor-container article-editor-scope editor-container">
|
<form method="post" action="php/controller/createArticle-controller.php" id="editor-form" enctype="multipart/form-data" class="article-editor-scope.editor-container article-editor-scope editor-container">
|
||||||
|
|
||||||
<?php csrf_field(); ?>
|
|
||||||
|
|
||||||
<main class="editor-main">
|
<main class="editor-main">
|
||||||
<?php include_once "includes/alertMessages.php"?>
|
<?php include_once "includes/alertMessages.php"?>
|
||||||
|
|
||||||
|
|||||||
+1
-4
@@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
include_once 'php/controller/profile-controller.php';
|
||||||
|
|
||||||
$user = $user ?? null;
|
$user = $user ?? null;
|
||||||
$isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
$isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||||
@@ -17,8 +18,6 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
|||||||
|
|
||||||
<form method="post" action="index.php?pfad=profile">
|
<form method="post" action="index.php?pfad=profile">
|
||||||
|
|
||||||
<?php csrf_field(); ?>
|
|
||||||
|
|
||||||
<label class="input-label">Vorname</label>
|
<label class="input-label">Vorname</label>
|
||||||
<input type="text"
|
<input type="text"
|
||||||
name="vorname"
|
name="vorname"
|
||||||
@@ -83,7 +82,6 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
|||||||
<br>
|
<br>
|
||||||
|
|
||||||
<form action="php/controller/deleteAccount-controller.php" method="POST">
|
<form action="php/controller/deleteAccount-controller.php" method="POST">
|
||||||
<?php csrf_field(); ?>
|
|
||||||
<button type="submit"
|
<button type="submit"
|
||||||
class="button"
|
class="button"
|
||||||
onclick="return confirm('Möchtest du deinen Account und alle deine Beiträge wirklich unwiderruflich löschen?');">
|
onclick="return confirm('Möchtest du deinen Account und alle deine Beiträge wirklich unwiderruflich löschen?');">
|
||||||
@@ -157,7 +155,6 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
|||||||
</a>
|
</a>
|
||||||
|
|
||||||
<form action="php/controller/deleteArticle-controller.php" method="POST">
|
<form action="php/controller/deleteArticle-controller.php" method="POST">
|
||||||
<?php csrf_field(); ?>
|
|
||||||
<input type="hidden"
|
<input type="hidden"
|
||||||
name="id"
|
name="id"
|
||||||
value="<?php echo htmlspecialchars($userArticle->getID()); ?>">
|
value="<?php echo htmlspecialchars($userArticle->getID()); ?>">
|
||||||
|
|||||||
@@ -137,6 +137,17 @@ $categories = [
|
|||||||
<p class="s-res-meta"><span id="s-res-result-count"><?php echo $totalResultsCount; ?></span> Treffer für Ihre Suchanfrage "<?php echo htmlspecialchars($query); ?>"</p>
|
<p class="s-res-meta"><span id="s-res-result-count"><?php echo $totalResultsCount; ?></span> Treffer für Ihre Suchanfrage "<?php echo htmlspecialchars($query); ?>"</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<p
|
||||||
|
id="results-loading"
|
||||||
|
class="results-loading"
|
||||||
|
role="status"
|
||||||
|
aria-live="polite"
|
||||||
|
hidden
|
||||||
|
>
|
||||||
|
<span class="results-spinner" aria-hidden="true"></span>
|
||||||
|
Suchergebnisse werden geladen …
|
||||||
|
</p>
|
||||||
|
|
||||||
<!-- Ergebnisliste -->
|
<!-- Ergebnisliste -->
|
||||||
<div class="s-res-list">
|
<div class="s-res-list">
|
||||||
<?php if (!empty($results)): ?>
|
<?php if (!empty($results)): ?>
|
||||||
|
|||||||
+16
-57
@@ -5,30 +5,6 @@ $repliesByParent = [];
|
|||||||
$articleObj = null;
|
$articleObj = null;
|
||||||
|
|
||||||
include_once 'php/controller/showArticle-controller.php';
|
include_once 'php/controller/showArticle-controller.php';
|
||||||
require_once 'php/model/UserManager.php';
|
|
||||||
|
|
||||||
$userManager = UserManager::getInstance();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Liefert den vollständigen Namen zu einer gespeicherten E-Mail-Adresse.
|
|
||||||
* Falls kein Benutzer gefunden wird, wird die E-Mail als Ersatz angezeigt.
|
|
||||||
*/
|
|
||||||
function getCommentAuthorName($email, $userManager)
|
|
||||||
{
|
|
||||||
$email = trim($email);
|
|
||||||
$user = $userManager->findUser($email);
|
|
||||||
|
|
||||||
if ($user === null) {
|
|
||||||
return $email;
|
|
||||||
}
|
|
||||||
|
|
||||||
$vorname = trim($user["vorname"] ?? "");
|
|
||||||
$nachname = trim($user["nachname"] ?? "");
|
|
||||||
|
|
||||||
$fullName = trim($vorname . " " . $nachname);
|
|
||||||
|
|
||||||
return $fullName !== "" ? $fullName : $email;
|
|
||||||
}
|
|
||||||
/*
|
/*
|
||||||
* Ermittelt, ob ohne JavaScript auf einen Kommentar
|
* Ermittelt, ob ohne JavaScript auf einen Kommentar
|
||||||
* geantwortet werden soll.
|
* geantwortet werden soll.
|
||||||
@@ -80,14 +56,9 @@ if ($replyAuthor === null) {
|
|||||||
<span>❤️ <span class="like-count"><?php echo $articleObj->getLikeCount(); ?></span></span>
|
<span>❤️ <span class="like-count"><?php echo $articleObj->getLikeCount(); ?></span></span>
|
||||||
|
|
||||||
<?php if (isset($_SESSION["user_email"])): ?>
|
<?php if (isset($_SESSION["user_email"])): ?>
|
||||||
<form method="post"
|
<a href="php/controller/like-controller.php?id=<?php echo $articleObj->getId(); ?>" class="like-toggle-btn">
|
||||||
action="php/controller/like-controller.php?id=<?php echo $articleObj->getId(); ?>"
|
|
||||||
class="like-toggle-form">
|
|
||||||
<?php csrf_field(); ?>
|
|
||||||
<button type="submit" class="like-toggle-btn">
|
|
||||||
<?php echo $articleObj->hasLiked($_SESSION["user_email"]) ? '👎 Gefällt mir nicht mehr' : '👍 Gefällt mir'; ?>
|
<?php echo $articleObj->hasLiked($_SESSION["user_email"]) ? '👎 Gefällt mir nicht mehr' : '👍 Gefällt mir'; ?>
|
||||||
</button>
|
</a>
|
||||||
</form>
|
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
<span class="login-hint">(Anmelden zum Liken)</span>
|
<span class="login-hint">(Anmelden zum Liken)</span>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
@@ -202,14 +173,7 @@ if ($replyAuthor === null) {
|
|||||||
|
|
||||||
<p>
|
<p>
|
||||||
<strong>
|
<strong>
|
||||||
<?php
|
<?php echo htmlspecialchars($comment->getAuthor()); ?>
|
||||||
echo htmlspecialchars(
|
|
||||||
getCommentAuthorName(
|
|
||||||
$comment->getAuthor(),
|
|
||||||
$userManager
|
|
||||||
)
|
|
||||||
);
|
|
||||||
?>
|
|
||||||
</strong>
|
</strong>
|
||||||
|
|
||||||
<span>
|
<span>
|
||||||
@@ -238,8 +202,6 @@ if ($replyAuthor === null) {
|
|||||||
action="index.php?pfad=updateComment"
|
action="index.php?pfad=updateComment"
|
||||||
class="edit-comment-form">
|
class="edit-comment-form">
|
||||||
|
|
||||||
<?php csrf_field(); ?>
|
|
||||||
|
|
||||||
<input type="hidden"
|
<input type="hidden"
|
||||||
name="comment_id"
|
name="comment_id"
|
||||||
value="<?php echo htmlspecialchars(
|
value="<?php echo htmlspecialchars(
|
||||||
@@ -277,8 +239,6 @@ if ($replyAuthor === null) {
|
|||||||
action="index.php?pfad=deleteComment"
|
action="index.php?pfad=deleteComment"
|
||||||
class="delete-comment-form">
|
class="delete-comment-form">
|
||||||
|
|
||||||
<?php csrf_field(); ?>
|
|
||||||
|
|
||||||
<input type="hidden"
|
<input type="hidden"
|
||||||
name="comment_id"
|
name="comment_id"
|
||||||
value="<?php echo htmlspecialchars(
|
value="<?php echo htmlspecialchars(
|
||||||
@@ -344,14 +304,7 @@ if ($replyAuthor === null) {
|
|||||||
|
|
||||||
<p>
|
<p>
|
||||||
<strong>
|
<strong>
|
||||||
<?php
|
<?php echo htmlspecialchars($reply->getAuthor()); ?>
|
||||||
echo htmlspecialchars(
|
|
||||||
getCommentAuthorName(
|
|
||||||
$reply->getAuthor(),
|
|
||||||
$userManager
|
|
||||||
)
|
|
||||||
);
|
|
||||||
?>
|
|
||||||
</strong>
|
</strong>
|
||||||
|
|
||||||
<span>
|
<span>
|
||||||
@@ -381,8 +334,6 @@ if ($replyAuthor === null) {
|
|||||||
action="index.php?pfad=updateComment"
|
action="index.php?pfad=updateComment"
|
||||||
class="edit-comment-form">
|
class="edit-comment-form">
|
||||||
|
|
||||||
<?php csrf_field(); ?>
|
|
||||||
|
|
||||||
<input type="hidden"
|
<input type="hidden"
|
||||||
name="comment_id"
|
name="comment_id"
|
||||||
value="<?php echo htmlspecialchars(
|
value="<?php echo htmlspecialchars(
|
||||||
@@ -420,8 +371,6 @@ if ($replyAuthor === null) {
|
|||||||
action="index.php?pfad=deleteComment"
|
action="index.php?pfad=deleteComment"
|
||||||
class="delete-comment-form">
|
class="delete-comment-form">
|
||||||
|
|
||||||
<?php csrf_field(); ?>
|
|
||||||
|
|
||||||
<input type="hidden"
|
<input type="hidden"
|
||||||
name="comment_id"
|
name="comment_id"
|
||||||
value="<?php echo htmlspecialchars(
|
value="<?php echo htmlspecialchars(
|
||||||
@@ -463,8 +412,6 @@ if ($replyAuthor === null) {
|
|||||||
method="post"
|
method="post"
|
||||||
action="php/ajax/add-comment.php">
|
action="php/ajax/add-comment.php">
|
||||||
|
|
||||||
<?php csrf_field(); ?>
|
|
||||||
|
|
||||||
<input type="hidden"
|
<input type="hidden"
|
||||||
name="article_id"
|
name="article_id"
|
||||||
value="<?php echo htmlspecialchars(
|
value="<?php echo htmlspecialchars(
|
||||||
@@ -510,6 +457,18 @@ if ($replyAuthor === null) {
|
|||||||
<button type="submit" class="button">
|
<button type="submit" class="button">
|
||||||
Kommentar senden
|
Kommentar senden
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
<p
|
||||||
|
id="comment-loading"
|
||||||
|
class="comment-loading"
|
||||||
|
role="status"
|
||||||
|
aria-live="polite"
|
||||||
|
hidden
|
||||||
|
>
|
||||||
|
<span class="comment-spinner" aria-hidden="true"></span>
|
||||||
|
Kommentar wird gesendet …
|
||||||
|
</p>
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
<div class="comment-login-hint">
|
<div class="comment-login-hint">
|
||||||
|
|||||||
@@ -113,6 +113,17 @@ $resultCount = count($results);
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<p
|
||||||
|
id="results-loading"
|
||||||
|
class="results-loading"
|
||||||
|
role="status"
|
||||||
|
aria-live="polite"
|
||||||
|
hidden
|
||||||
|
>
|
||||||
|
<span class="results-spinner" aria-hidden="true"></span>
|
||||||
|
Kategoriebeiträge werden geladen …
|
||||||
|
</p>
|
||||||
|
|
||||||
<!-- Ergebnisliste -->
|
<!-- Ergebnisliste -->
|
||||||
<div class="s-res-list">
|
<div class="s-res-list">
|
||||||
<?php if (!empty($results)): ?>
|
<?php if (!empty($results)): ?>
|
||||||
|
|||||||
@@ -27,8 +27,6 @@ $blocks = array_values($blocks);
|
|||||||
-->
|
-->
|
||||||
<form method="post" action="php/controller/updateArticle-controller.php?id=<?php if(isset($id) && !empty($id)){echo htmlspecialchars($id);}else{$_SESSION["message"] = "missing_id";} ?>" id="editor-form" enctype="multipart/form-data" class="article-editor-scope.editor-container article-editor-scope editor-container">
|
<form method="post" action="php/controller/updateArticle-controller.php?id=<?php if(isset($id) && !empty($id)){echo htmlspecialchars($id);}else{$_SESSION["message"] = "missing_id";} ?>" id="editor-form" enctype="multipart/form-data" class="article-editor-scope.editor-container article-editor-scope editor-container">
|
||||||
|
|
||||||
<?php csrf_field(); ?>
|
|
||||||
|
|
||||||
<main class="editor-main">
|
<main class="editor-main">
|
||||||
<?php include_once "includes/alertMessages.php"?>
|
<?php include_once "includes/alertMessages.php"?>
|
||||||
|
|
||||||
|
|||||||
+24
-183
@@ -154,32 +154,21 @@ h1 {
|
|||||||
|
|
||||||
.button {
|
.button {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 14px;
|
padding: 12px;
|
||||||
background-color: #2563eb;
|
background-color: #2563eb;
|
||||||
color: white;
|
color: white;
|
||||||
border: 2px solid transparent;
|
border: none;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition:
|
transition: background-color 0.2s, transform 0.2s, box-shadow 0.2s;
|
||||||
background-color 0.2s ease,
|
|
||||||
transform 0.2s ease,
|
|
||||||
box-shadow 0.2s ease,
|
|
||||||
border-color 0.2s ease;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.button:hover {
|
.button:hover {
|
||||||
background-color: #1e40af;
|
|
||||||
border-color: #93c5fd;
|
|
||||||
transform: translateY(-3px) scale(1.01);
|
|
||||||
box-shadow: 0 8px 18px rgba(37, 99, 235, 0.35);
|
|
||||||
}
|
|
||||||
|
|
||||||
.button:active {
|
|
||||||
background-color: #1d4ed8;
|
background-color: #1d4ed8;
|
||||||
transform: translateY(1px) scale(0.99);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 2px 5px rgba(37, 99, 235, 0.25);
|
box-shadow: 0 4px 10px rgba(0,0,0,0.15);
|
||||||
}
|
}
|
||||||
|
|
||||||
.register-link {
|
.register-link {
|
||||||
@@ -237,181 +226,33 @@ h1 {
|
|||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
.comment-loading {
|
||||||
/* Deutlichere Klickreaktion für Kategorien */
|
|
||||||
.category-link:active {
|
|
||||||
transform: translateY(1px);
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Sichtbare Tastatur-Markierung */
|
|
||||||
.button:focus-visible,
|
|
||||||
.category-link:focus-visible,
|
|
||||||
.article-link a:focus-visible,
|
|
||||||
.register-link a:focus-visible {
|
|
||||||
outline: 3px solid #fbbf24;
|
|
||||||
outline-offset: 3px;
|
|
||||||
}
|
|
||||||
/* Kommentarbereich */
|
|
||||||
|
|
||||||
#comments-list {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
align-items: center;
|
||||||
gap: 20px;
|
gap: 8px;
|
||||||
margin-bottom: 40px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#comments-list > div,
|
.comment-loading[hidden] {
|
||||||
.comment {
|
|
||||||
background-color: #ffffff;
|
|
||||||
border: 1px solid #dbe3ec;
|
|
||||||
border-radius: 12px;
|
|
||||||
padding: 24px;
|
|
||||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.06);
|
|
||||||
transition:
|
|
||||||
transform 0.2s ease,
|
|
||||||
box-shadow 0.2s ease,
|
|
||||||
border-color 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
#comments-list > div:hover,
|
|
||||||
.comment:hover {
|
|
||||||
transform: translateY(-3px);
|
|
||||||
border-color: #93c5fd;
|
|
||||||
box-shadow: 0 8px 20px rgba(0, 0, 0, 0.12);
|
|
||||||
}
|
|
||||||
|
|
||||||
#comments-list textarea,
|
|
||||||
#comment-content {
|
|
||||||
width: 100%;
|
|
||||||
box-sizing: border-box;
|
|
||||||
padding: 14px;
|
|
||||||
border: 1px solid #cbd5e1;
|
|
||||||
border-radius: 8px;
|
|
||||||
font-size: 1rem;
|
|
||||||
resize: vertical;
|
|
||||||
transition:
|
|
||||||
border-color 0.2s ease,
|
|
||||||
box-shadow 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
#comments-list textarea:focus,
|
|
||||||
#comment-content:focus {
|
|
||||||
outline: none;
|
|
||||||
border-color: #2563eb;
|
|
||||||
box-shadow: 0 0 0 4px rgba(37, 99, 235, 0.18);
|
|
||||||
}
|
|
||||||
|
|
||||||
#comments-list a {
|
|
||||||
color: #2563eb;
|
|
||||||
font-weight: bold;
|
|
||||||
text-decoration: none;
|
|
||||||
border-radius: 4px;
|
|
||||||
transition:
|
|
||||||
color 0.2s ease,
|
|
||||||
background-color 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
#comments-list a:hover {
|
|
||||||
color: #1e40af;
|
|
||||||
background-color: #dbeafe;
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
#comments-list button {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
.delete-comment-button {
|
|
||||||
display: inline-block;
|
|
||||||
background: #ffffff;
|
|
||||||
color: #dc2626;
|
|
||||||
border: 2px solid #dc2626;
|
|
||||||
border-radius: 8px;
|
|
||||||
padding: 10px 18px;
|
|
||||||
font-size: 0.95rem;
|
|
||||||
font-weight: 600;
|
|
||||||
cursor: pointer;
|
|
||||||
transition:
|
|
||||||
background-color 0.25s ease,
|
|
||||||
color 0.25s ease,
|
|
||||||
transform 0.2s ease,
|
|
||||||
box-shadow 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.delete-comment-button:hover {
|
|
||||||
background: #dc2626;
|
|
||||||
color: #ffffff;
|
|
||||||
transform: translateY(-2px);
|
|
||||||
box-shadow: 0 6px 14px rgba(220,38,38,0.25);
|
|
||||||
}
|
|
||||||
|
|
||||||
.delete-comment-button:active {
|
|
||||||
transform: translateY(1px);
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
.delete-comment-form {
|
|
||||||
margin-top: 12px;
|
|
||||||
margin-bottom: 12px;
|
|
||||||
}
|
|
||||||
/* Button zum Öffnen der Kommentarbearbeitung */
|
|
||||||
.edit-comment-button {
|
|
||||||
display: inline-block;
|
|
||||||
width: auto;
|
|
||||||
padding: 10px 18px;
|
|
||||||
background-color: #2563eb;
|
|
||||||
color: #ffffff;
|
|
||||||
border: 2px solid #2563eb;
|
|
||||||
border-radius: 8px;
|
|
||||||
font-size: 0.95rem;
|
|
||||||
font-weight: 600;
|
|
||||||
cursor: pointer;
|
|
||||||
list-style: none;
|
|
||||||
transition:
|
|
||||||
background-color 0.2s ease,
|
|
||||||
border-color 0.2s ease,
|
|
||||||
transform 0.2s ease,
|
|
||||||
box-shadow 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Entfernt das normale Dreieck in einigen Browsern */
|
|
||||||
.edit-comment-button::-webkit-details-marker {
|
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Eigenes Symbol vor dem Text */
|
.comment-spinner {
|
||||||
.edit-comment-button::before {
|
width: 16px;
|
||||||
content: "✏ ";
|
height: 16px;
|
||||||
|
border: 2px solid #cbd5e1;
|
||||||
|
border-top-color: #1f2937;
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: comment-spinner-rotation 0.8s linear infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
.edit-comment-button:hover {
|
@keyframes comment-spinner-rotation {
|
||||||
background-color: #1e40af;
|
to {
|
||||||
border-color: #1e40af;
|
transform: rotate(360deg);
|
||||||
transform: translateY(-2px);
|
}
|
||||||
box-shadow: 0 5px 12px rgba(37, 99, 235, 0.3);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.edit-comment-button:active {
|
#comment-form button[type="submit"]:disabled {
|
||||||
transform: translateY(1px);
|
cursor: wait;
|
||||||
box-shadow: none;
|
opacity: 0.65;
|
||||||
}
|
|
||||||
|
|
||||||
.edit-comment-button:focus-visible {
|
|
||||||
outline: 3px solid #fbbf24;
|
|
||||||
outline-offset: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Abstand zwischen Bearbeiten und Löschen */
|
|
||||||
.edit-comment-details {
|
|
||||||
margin-bottom: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Geöffneter Bearbeitungsbereich */
|
|
||||||
.edit-comment-details[open] .edit-comment-button {
|
|
||||||
margin-bottom: 12px;
|
|
||||||
background-color: #1e40af;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Geändertes Symbol, wenn der Bereich geöffnet ist */
|
|
||||||
.edit-comment-details[open] .edit-comment-button::before {
|
|
||||||
content: "▲ ";
|
|
||||||
}
|
}
|
||||||
-110
@@ -285,32 +285,6 @@ CSS für die navbar
|
|||||||
border-bottom: 1px solid #333d43;
|
border-bottom: 1px solid #333d43;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav__logout-form {
|
|
||||||
display: contents;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav__logout-form .nav__button {
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav__mobile-logout-button {
|
|
||||||
color: #fff;
|
|
||||||
text-decoration: none;
|
|
||||||
font-size: 1.2rem;
|
|
||||||
font-weight: 600;
|
|
||||||
display: block;
|
|
||||||
width: 100%;
|
|
||||||
text-align: left;
|
|
||||||
padding: 0.5rem 1rem;
|
|
||||||
border: none;
|
|
||||||
border-bottom: 1px solid #333d43;
|
|
||||||
background: none;
|
|
||||||
cursor: pointer;
|
|
||||||
font-family: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav__mobile-submenu {
|
.nav__mobile-submenu {
|
||||||
display: block;
|
display: block;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
@@ -328,89 +302,5 @@ CSS für die navbar
|
|||||||
padding: 0.8rem 1rem;
|
padding: 0.8rem 1rem;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
/* Deutlichere Hover-Effekte für die Navigation */
|
|
||||||
|
|
||||||
.nav__dropdown-toggle,
|
|
||||||
.nav__link {
|
|
||||||
border-radius: 6px;
|
|
||||||
transition:
|
|
||||||
background-color 0.2s ease,
|
|
||||||
color 0.2s ease,
|
|
||||||
transform 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav__dropdown-toggle:hover,
|
|
||||||
.nav__link:hover {
|
|
||||||
background-color: #ffffff;
|
|
||||||
color: #1d4ed8;
|
|
||||||
transform: translateY(-2px);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Sichtbare Reaktion beim Anklicken */
|
|
||||||
.nav__dropdown-toggle:active,
|
|
||||||
.nav__link:active {
|
|
||||||
transform: translateY(1px);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Deutlichere Effekte für Anmelden, Registrieren usw. */
|
|
||||||
.nav__button {
|
|
||||||
transition:
|
|
||||||
background-color 0.2s ease,
|
|
||||||
color 0.2s ease,
|
|
||||||
transform 0.2s ease,
|
|
||||||
box-shadow 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav__button:hover {
|
|
||||||
background-color: #2563eb;
|
|
||||||
color: #ffffff;
|
|
||||||
transform: translateY(-2px);
|
|
||||||
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3);
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav__button:active {
|
|
||||||
transform: translateY(1px);
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Deutlichere Hervorhebung der Einträge im Dropdown-Menü */
|
|
||||||
.nav__dropdown-menu a {
|
|
||||||
display: block;
|
|
||||||
transition:
|
|
||||||
background-color 0.2s ease,
|
|
||||||
color 0.2s ease,
|
|
||||||
padding-left 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav__dropdown-menu a:hover {
|
|
||||||
background-color: #dbeafe;
|
|
||||||
color: #1d4ed8;
|
|
||||||
padding-left: 1.4rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Effekt für den Suchbutton */
|
|
||||||
.nav__search-button {
|
|
||||||
transition:
|
|
||||||
background-color 0.2s ease,
|
|
||||||
color 0.2s ease,
|
|
||||||
transform 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav__search-button:hover {
|
|
||||||
background-color: #2563eb;
|
|
||||||
color: #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav__search-button:active {
|
|
||||||
transform: scale(0.95);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Sichtbare Markierung bei Tastaturbedienung */
|
|
||||||
.nav a:focus-visible,
|
|
||||||
.nav button:focus-visible,
|
|
||||||
.nav input:focus-visible,
|
|
||||||
.nav label:focus-visible {
|
|
||||||
outline: 3px solid #fbbf24;
|
|
||||||
outline-offset: 3px;
|
|
||||||
}
|
}
|
||||||
@@ -271,4 +271,33 @@ CSS für die Suchergebnis-Seite
|
|||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* Ladeanzeige beim Nachladen von Such- und Kategorieergebnissen */
|
||||||
|
.results-loading {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
margin: 15px 0;
|
||||||
|
color: #4a5568;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.results-loading[hidden] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.results-spinner {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
border: 2px solid #cbd5e1;
|
||||||
|
border-top-color: #3182ce;
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: results-spinner-rotation 0.8s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes results-spinner-rotation {
|
||||||
|
to {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -89,12 +89,6 @@
|
|||||||
Es ist ein Datenbankfehler aufgetreten. Bitte versuche es erneut.
|
Es ist ein Datenbankfehler aufgetreten. Bitte versuche es erneut.
|
||||||
</p>
|
</p>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php if (isset($_SESSION["message"]) && $_SESSION["message"] == "invalid_csrf_token"): ?>
|
|
||||||
<p class="alert-message is-error">
|
|
||||||
Deine Sitzung ist abgelaufen oder die Anfrage konnte nicht überprüft werden.
|
|
||||||
Bitte lade die Seite neu und versuche es erneut.
|
|
||||||
</p>
|
|
||||||
<?php endif; ?>
|
|
||||||
<?php
|
<?php
|
||||||
unset($_SESSION["message"]);
|
unset($_SESSION["message"]);
|
||||||
?>
|
?>
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
<?php
|
|
||||||
/**
|
|
||||||
* CSRF-Schutz nach dem Synchronizer-Token-Pattern.
|
|
||||||
*
|
|
||||||
* Pro Session wird ein einziges, zufälliges Token erzeugt,
|
|
||||||
* das in jedem Formular als verstecktes Feld mitgeschickt und bei jeder
|
|
||||||
* zustandsändernden Anfrage serverseitig mit dem Session-Token verglichen
|
|
||||||
* wird.
|
|
||||||
*
|
|
||||||
* @author Niklas Ortmann
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (session_status() === PHP_SESSION_NONE) {
|
|
||||||
session_start();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gibt das aktuelle CSRF-Token der Session zurück.
|
|
||||||
*
|
|
||||||
* Existiert noch kein Token, wird eines erzeugt und in der Session
|
|
||||||
* gespeichert.
|
|
||||||
*
|
|
||||||
* @return string Das CSRF-Token
|
|
||||||
*/
|
|
||||||
function csrf_token(): string
|
|
||||||
{
|
|
||||||
if (empty($_SESSION["csrf_token"]) || !is_string($_SESSION["csrf_token"])) {
|
|
||||||
$_SESSION["csrf_token"] = bin2hex(random_bytes(32));
|
|
||||||
}
|
|
||||||
|
|
||||||
return $_SESSION["csrf_token"];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gibt ein verstecktes Formularfeld mit dem aktuellen CSRF-Token aus.
|
|
||||||
*
|
|
||||||
* Wird in jedem Formular benötigt, das eine zustandsändernde
|
|
||||||
* Aktion auslöst.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
function csrf_field(): void
|
|
||||||
{
|
|
||||||
echo '<input type="hidden" name="csrf_token" value="'
|
|
||||||
. htmlspecialchars(csrf_token())
|
|
||||||
. '">';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Prüft, ob das per POST gesendete CSRF-Token zum Session-Token passt.
|
|
||||||
*
|
|
||||||
* Der Vergleich erfolgt zeitkonstant über hash_equals(), um
|
|
||||||
* Timing-Angriffe auf den Vergleich selbst auszuschließen.
|
|
||||||
*
|
|
||||||
* @return bool true, wenn das Token gültig ist
|
|
||||||
*/
|
|
||||||
function csrf_verify(): bool
|
|
||||||
{
|
|
||||||
$sentToken = $_POST["csrf_token"] ?? "";
|
|
||||||
$sessionToken = $_SESSION["csrf_token"] ?? "";
|
|
||||||
|
|
||||||
if (!is_string($sentToken) || $sentToken === "" || $sessionToken === "") {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hash_equals($sessionToken, $sentToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Bricht die Anfrage ab und leitet mit einer Fehlermeldung um,
|
|
||||||
* wenn das mitgesendete CSRF-Token ungültig oder nicht vorhanden ist.
|
|
||||||
*
|
|
||||||
* Muss am Anfang jeder zustandsändernden POST-Aktion aufgerufen werden,
|
|
||||||
* bevor irgendeine Änderung an Daten vorgenommen wird.
|
|
||||||
*
|
|
||||||
* @param string $redirectTo Ziel-URL, zu der bei ungültigem Token
|
|
||||||
* weitergeleitet wird
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
function csrf_require_valid(string $redirectTo = "index.php"): void
|
|
||||||
{
|
|
||||||
if (!csrf_verify()) {
|
|
||||||
http_response_code(403);
|
|
||||||
$_SESSION["message"] = "invalid_csrf_token";
|
|
||||||
header("Location: " . $redirectTo);
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,6 @@
|
|||||||
if (session_status() === PHP_SESSION_NONE) {
|
if (session_status() === PHP_SESSION_NONE) {
|
||||||
session_start();
|
session_start();
|
||||||
}
|
}
|
||||||
include_once "includes/csrf.php";
|
|
||||||
include_once "php/controller/index-controller.php";
|
include_once "php/controller/index-controller.php";
|
||||||
?>
|
?>
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
|
|||||||
+38
-25
@@ -11,7 +11,19 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
const parentCommentInput = document.getElementById("parent-comment-id");
|
const parentCommentInput = document.getElementById("parent-comment-id");
|
||||||
const replyInfo = document.getElementById("reply-info");
|
const replyInfo = document.getElementById("reply-info");
|
||||||
|
|
||||||
if (!form || !commentsList || !commentContent || !parentCommentInput) {
|
const submitButton = form
|
||||||
|
? form.querySelector('button[type="submit"]')
|
||||||
|
: null;
|
||||||
|
|
||||||
|
const loadingMessage = document.getElementById("comment-loading");
|
||||||
|
|
||||||
|
if (
|
||||||
|
!form
|
||||||
|
|| !commentsList
|
||||||
|
|| !commentContent
|
||||||
|
|| !parentCommentInput
|
||||||
|
|| !submitButton
|
||||||
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,6 +65,23 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
form.addEventListener("submit", function (event) {
|
form.addEventListener("submit", function (event) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Verhindert einen erneuten Submit, während der vorherige
|
||||||
|
* Kommentar noch gespeichert wird.
|
||||||
|
*/
|
||||||
|
if (submitButton.disabled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const originalButtonText = submitButton.textContent;
|
||||||
|
|
||||||
|
submitButton.disabled = true;
|
||||||
|
submitButton.textContent = "Wird gesendet …";
|
||||||
|
|
||||||
|
if (loadingMessage) {
|
||||||
|
loadingMessage.hidden = false;
|
||||||
|
}
|
||||||
|
|
||||||
const formData = new FormData(form);
|
const formData = new FormData(form);
|
||||||
const parentCommentId = parentCommentInput.value;
|
const parentCommentId = parentCommentInput.value;
|
||||||
|
|
||||||
@@ -109,12 +138,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
action="index.php?pfad=updateComment"
|
action="index.php?pfad=updateComment"
|
||||||
class="edit-comment-form"
|
class="edit-comment-form"
|
||||||
>
|
>
|
||||||
<input
|
|
||||||
type="hidden"
|
|
||||||
name="csrf_token"
|
|
||||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
|
||||||
>
|
|
||||||
|
|
||||||
<input
|
<input
|
||||||
type="hidden"
|
type="hidden"
|
||||||
name="comment_id"
|
name="comment_id"
|
||||||
@@ -143,12 +166,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
action="index.php?pfad=deleteComment"
|
action="index.php?pfad=deleteComment"
|
||||||
class="delete-comment-form"
|
class="delete-comment-form"
|
||||||
>
|
>
|
||||||
<input
|
|
||||||
type="hidden"
|
|
||||||
name="csrf_token"
|
|
||||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
|
||||||
>
|
|
||||||
|
|
||||||
<input
|
<input
|
||||||
type="hidden"
|
type="hidden"
|
||||||
name="comment_id"
|
name="comment_id"
|
||||||
@@ -199,12 +216,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
action="index.php?pfad=updateComment"
|
action="index.php?pfad=updateComment"
|
||||||
class="edit-comment-form"
|
class="edit-comment-form"
|
||||||
>
|
>
|
||||||
<input
|
|
||||||
type="hidden"
|
|
||||||
name="csrf_token"
|
|
||||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
|
||||||
>
|
|
||||||
|
|
||||||
<input
|
<input
|
||||||
type="hidden"
|
type="hidden"
|
||||||
name="comment_id"
|
name="comment_id"
|
||||||
@@ -233,12 +244,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
action="index.php?pfad=deleteComment"
|
action="index.php?pfad=deleteComment"
|
||||||
class="delete-comment-form"
|
class="delete-comment-form"
|
||||||
>
|
>
|
||||||
<input
|
|
||||||
type="hidden"
|
|
||||||
name="csrf_token"
|
|
||||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
|
||||||
>
|
|
||||||
|
|
||||||
<input
|
<input
|
||||||
type="hidden"
|
type="hidden"
|
||||||
name="comment_id"
|
name="comment_id"
|
||||||
@@ -293,6 +298,14 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
.catch(function (error) {
|
.catch(function (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
alert("Kommentar konnte nicht gesendet werden.");
|
alert("Kommentar konnte nicht gesendet werden.");
|
||||||
|
})
|
||||||
|
.finally(function () {
|
||||||
|
submitButton.disabled = false;
|
||||||
|
submitButton.textContent = originalButtonText;
|
||||||
|
|
||||||
|
if (loadingMessage) {
|
||||||
|
loadingMessage.hidden = true;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+23
-4
@@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
let listContainer, sortRadios, categorySelect, limitSelect;
|
let listContainer, sortRadios, categorySelect, limitSelect;
|
||||||
let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
|
let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
|
||||||
|
let loadingElement;
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
listContainer = document.querySelector('.s-res-list');
|
listContainer = document.querySelector('.s-res-list');
|
||||||
@@ -38,23 +39,41 @@
|
|||||||
numbersContainer = document.getElementById('dynamic-page-numbers');
|
numbersContainer = document.getElementById('dynamic-page-numbers');
|
||||||
jsNav = document.getElementById('js-page-navigation');
|
jsNav = document.getElementById('js-page-navigation');
|
||||||
resultCountEl = document.getElementById('s-res-result-count');
|
resultCountEl = document.getElementById('s-res-result-count');
|
||||||
|
loadingElement = document.getElementById('results-loading');
|
||||||
|
|
||||||
const checkedRadio = document.querySelector('.sort-radio:checked');
|
const checkedRadio = document.querySelector('.sort-radio:checked');
|
||||||
state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
|
state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
|
||||||
state.category = categorySelect ? categorySelect.value : 'all';
|
state.category = categorySelect ? categorySelect.value : 'all';
|
||||||
state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
|
state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
|
||||||
|
|
||||||
|
if (loadingElement) {
|
||||||
|
loadingElement.hidden = false;
|
||||||
|
}
|
||||||
|
|
||||||
fetchFullDataset()
|
fetchFullDataset()
|
||||||
.then(function (data) {
|
.then(function (data) {
|
||||||
state.allItems = data.results || [];
|
state.allItems = data.results || [];
|
||||||
attachEvents();
|
attachEvents();
|
||||||
render();
|
render();
|
||||||
if (jsNav) jsNav.style.display = 'flex';
|
|
||||||
|
if (jsNav) {
|
||||||
|
jsNav.style.display = 'flex';
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch(function (err) {
|
.catch(function (err) {
|
||||||
// JSON-Endpoint nicht erreichbar: die serverseitig gerenderte
|
/*
|
||||||
// (No-JS-)Ansicht bleibt sichtbar und funktioniert weiter.
|
* Falls das Nachladen nicht funktioniert, bleibt die bereits
|
||||||
console.error('Suchergebnisse konnten nicht nachgeladen werden:', err);
|
* serverseitig ausgegebene Ergebnisliste sichtbar.
|
||||||
|
*/
|
||||||
|
console.error(
|
||||||
|
'Suchergebnisse konnten nicht nachgeladen werden:',
|
||||||
|
err
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.finally(function () {
|
||||||
|
if (loadingElement) {
|
||||||
|
loadingElement.hidden = true;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+23
-4
@@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
let listContainer, sortRadios, searchInput, limitSelect;
|
let listContainer, sortRadios, searchInput, limitSelect;
|
||||||
let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
|
let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
|
||||||
|
let loadingElement;
|
||||||
let searchDebounceTimer;
|
let searchDebounceTimer;
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
@@ -35,23 +36,41 @@
|
|||||||
numbersContainer = document.getElementById('dynamic-page-numbers');
|
numbersContainer = document.getElementById('dynamic-page-numbers');
|
||||||
jsNav = document.getElementById('js-page-navigation');
|
jsNav = document.getElementById('js-page-navigation');
|
||||||
resultCountEl = document.getElementById('s-res-result-count');
|
resultCountEl = document.getElementById('s-res-result-count');
|
||||||
|
loadingElement = document.getElementById('results-loading');
|
||||||
|
|
||||||
const checkedRadio = document.querySelector('.sort-radio:checked');
|
const checkedRadio = document.querySelector('.sort-radio:checked');
|
||||||
state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
|
state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
|
||||||
state.query = searchInput ? searchInput.value : '';
|
state.query = searchInput ? searchInput.value : '';
|
||||||
state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
|
state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
|
||||||
|
|
||||||
|
if (loadingElement) {
|
||||||
|
loadingElement.hidden = false;
|
||||||
|
}
|
||||||
|
|
||||||
fetchFullDataset()
|
fetchFullDataset()
|
||||||
.then(function (data) {
|
.then(function (data) {
|
||||||
state.allItems = data.results || [];
|
state.allItems = data.results || [];
|
||||||
attachEvents();
|
attachEvents();
|
||||||
render();
|
render();
|
||||||
if (jsNav) jsNav.style.display = 'flex';
|
|
||||||
|
if (jsNav) {
|
||||||
|
jsNav.style.display = 'flex';
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch(function (err) {
|
.catch(function (err) {
|
||||||
// JSON-Endpoint nicht erreichbar: die serverseitig gerenderte
|
/*
|
||||||
// (No-JS-)Ansicht bleibt sichtbar und funktioniert weiter.
|
* Falls das Nachladen nicht funktioniert, bleibt die bereits
|
||||||
console.error('Kategorie-Beiträge konnten nicht nachgeladen werden:', err);
|
* serverseitig ausgegebene Kategorieansicht sichtbar.
|
||||||
|
*/
|
||||||
|
console.error(
|
||||||
|
'Kategorie-Beiträge konnten nicht nachgeladen werden:',
|
||||||
|
err
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.finally(function () {
|
||||||
|
if (loadingElement) {
|
||||||
|
loadingElement.hidden = true;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,9 +4,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
require_once "../model/CommentManager.php";
|
require_once "../model/CommentManager.php";
|
||||||
require_once "../model/UserManager.php";
|
|
||||||
require_once "../model/ArticleManager.php";
|
|
||||||
require_once "../../includes/csrf.php";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Prüft, ob die Anfrage durch JavaScript per AJAX gesendet wurde.
|
* Prüft, ob die Anfrage durch JavaScript per AJAX gesendet wurde.
|
||||||
@@ -99,17 +96,6 @@ if (!isset($_SESSION["user_email"])) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird.
|
|
||||||
*/
|
|
||||||
if (!csrf_verify()) {
|
|
||||||
sendCommentResponse(
|
|
||||||
false,
|
|
||||||
"Deine Sitzung ist abgelaufen. Bitte lade die Seite neu und versuche es erneut.",
|
|
||||||
$articleId !== false ? $articleId : null
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Weitere Formulardaten einlesen.
|
* Weitere Formulardaten einlesen.
|
||||||
*/
|
*/
|
||||||
@@ -142,18 +128,6 @@ if ($articleId === false || $articleId === null) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Der Beitrag muss tatsächlich existieren.
|
|
||||||
*/
|
|
||||||
$existingArticle = ArticleManager::getInstance()->getArticle($articleId);
|
|
||||||
if ($existingArticle === null) {
|
|
||||||
sendCommentResponse(
|
|
||||||
false,
|
|
||||||
"Der zugehörige Beitrag wurde nicht gefunden.",
|
|
||||||
null
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($content === "") {
|
if ($content === "") {
|
||||||
sendCommentResponse(
|
sendCommentResponse(
|
||||||
false,
|
false,
|
||||||
@@ -178,30 +152,6 @@ if (
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Falls eine Eltern-ID angegeben wurde, muss dieser Kommentar
|
|
||||||
* tatsächlich existieren und zum selben Beitrag gehören.
|
|
||||||
*/
|
|
||||||
if ($parentCommentId !== null) {
|
|
||||||
$existingComments = CommentManager::getInstance()->getCommentsByArticle($articleId);
|
|
||||||
$parentExists = false;
|
|
||||||
|
|
||||||
foreach ($existingComments as $existingComment) {
|
|
||||||
if ($existingComment->getId() === $parentCommentId) {
|
|
||||||
$parentExists = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$parentExists) {
|
|
||||||
sendCommentResponse(
|
|
||||||
false,
|
|
||||||
"Der ausgewählte Kommentar wurde nicht gefunden.",
|
|
||||||
$articleId
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$commentManager = CommentManager::getInstance();
|
$commentManager = CommentManager::getInstance();
|
||||||
|
|
||||||
@@ -212,29 +162,13 @@ try {
|
|||||||
$parentCommentId
|
$parentCommentId
|
||||||
);
|
);
|
||||||
|
|
||||||
$userManager = UserManager::getInstance();
|
|
||||||
$user = $userManager->findUser($_SESSION["user_email"]);
|
|
||||||
|
|
||||||
$authorName = $_SESSION["user_email"];
|
|
||||||
|
|
||||||
if ($user !== null) {
|
|
||||||
$vorname = trim($user["vorname"] ?? "");
|
|
||||||
$nachname = trim($user["nachname"] ?? "");
|
|
||||||
|
|
||||||
$fullName = trim($vorname . " " . $nachname);
|
|
||||||
|
|
||||||
if ($fullName !== "") {
|
|
||||||
$authorName = $fullName;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sendCommentResponse(
|
sendCommentResponse(
|
||||||
true,
|
true,
|
||||||
"Der Kommentar wurde erfolgreich gespeichert.",
|
"Der Kommentar wurde erfolgreich gespeichert.",
|
||||||
$articleId,
|
$articleId,
|
||||||
[
|
[
|
||||||
"commentId" => $commentId,
|
"commentId" => $commentId,
|
||||||
"author" => $authorName,
|
"author" => $_SESSION["user_email"],
|
||||||
"content" => $content,
|
"content" => $content,
|
||||||
"created" => date("Y-m-d H:i:s"),
|
"created" => date("Y-m-d H:i:s"),
|
||||||
"parentCommentId" => $parentCommentId
|
"parentCommentId" => $parentCommentId
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ require_once '../model/LocalArticleManager.php';
|
|||||||
require_once '../model/ArticleManager.php';
|
require_once '../model/ArticleManager.php';
|
||||||
require_once '../validator/article-validator.php';
|
require_once '../validator/article-validator.php';
|
||||||
require_once '../../includes/article-block-helper.php';
|
require_once '../../includes/article-block-helper.php';
|
||||||
require_once '../../includes/csrf.php';
|
|
||||||
|
|
||||||
if (!isset($_SESSION["user"])) {
|
if (!isset($_SESSION["user"])) {
|
||||||
header("Location: index.php?pfad=login");
|
header("Location: index.php?pfad=login");
|
||||||
@@ -15,13 +14,6 @@ if (!isset($_SESSION["user"])) {
|
|||||||
|
|
||||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||||
|
|
||||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
|
||||||
if (!csrf_verify()) {
|
|
||||||
$_SESSION["message"] = "invalid_csrf_token";
|
|
||||||
header("location: ../../index.php?pfad=createArticle");
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
$uploadDir = __DIR__ . '/../../uploads/';
|
$uploadDir = __DIR__ . '/../../uploads/';
|
||||||
if (!file_exists($uploadDir)) {
|
if (!file_exists($uploadDir)) {
|
||||||
mkdir($uploadDir, 0755, true);
|
mkdir($uploadDir, 0755, true);
|
||||||
|
|||||||
@@ -5,24 +5,12 @@ if (session_status() === PHP_SESSION_NONE) {
|
|||||||
|
|
||||||
require_once __DIR__ . "/../model/UserManager.php";
|
require_once __DIR__ . "/../model/UserManager.php";
|
||||||
require_once __DIR__ . "/../model/ArticleManager.php";
|
require_once __DIR__ . "/../model/ArticleManager.php";
|
||||||
require_once __DIR__ . "/../../includes/csrf.php";
|
|
||||||
|
|
||||||
if (!isset($_SESSION["user"])) {
|
if (!isset($_SESSION["user"])) {
|
||||||
header("Location: index.php?pfad=login");
|
header("Location: index.php?pfad=login");
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
|
||||||
header("Location: ../../index.php?pfad=profile");
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!csrf_verify()) {
|
|
||||||
$_SESSION["message"] = "invalid_csrf_token";
|
|
||||||
header("Location: ../../index.php?pfad=profile");
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Deregistrierung
|
Deregistrierung
|
||||||
Funktion: Entfernt User aus der Datenbank und beendet die Session
|
Funktion: Entfernt User aus der Datenbank und beendet die Session
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
require_once __DIR__ . "/../model/ArticleManager.php";
|
require_once __DIR__ . "/../model/ArticleManager.php";
|
||||||
require_once __DIR__ . "/../../includes/csrf.php";
|
|
||||||
|
|
||||||
if (!isset($_SESSION["user"])) {
|
if (!isset($_SESSION["user"])) {
|
||||||
header("Location: index.php?pfad=login");
|
header("Location: index.php?pfad=login");
|
||||||
@@ -13,13 +12,6 @@ if (!isset($_SESSION["user"])) {
|
|||||||
|
|
||||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||||
|
|
||||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
|
||||||
if (!csrf_verify()) {
|
|
||||||
$_SESSION["message"] = "invalid_csrf_token";
|
|
||||||
header("location: ../../index.php?pfad=profile");
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($_SESSION["user_email"])) {
|
if (isset($_SESSION["user_email"])) {
|
||||||
$user = $_SESSION["user_email"];
|
$user = $_SESSION["user_email"];
|
||||||
} else {
|
} else {
|
||||||
@@ -30,10 +22,9 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
|||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Die Beitrags-ID muss eine gültige numerische ID sein.
|
if (isset($_POST["id"]) && !empty($_POST["id"])) {
|
||||||
$id = filter_input(INPUT_POST, "id", FILTER_VALIDATE_INT);
|
$id = $_POST["id"];
|
||||||
|
} else {
|
||||||
if ($id === false || $id === null) {
|
|
||||||
$_SESSION["message"] = "missing_id";
|
$_SESSION["message"] = "missing_id";
|
||||||
header("location: ../../index.php?pfad=profile");
|
header("location: ../../index.php?pfad=profile");
|
||||||
exit();
|
exit();
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
require_once __DIR__ . "/../model/CommentManager.php";
|
require_once __DIR__ . "/../model/CommentManager.php";
|
||||||
require_once __DIR__ . "/../../includes/csrf.php";
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Kommentare dürfen nur über ein POST-Formular gelöscht werden.
|
* Kommentare dürfen nur über ein POST-Formular gelöscht werden.
|
||||||
@@ -45,23 +44,6 @@ if (!isset($_SESSION["user_email"])) {
|
|||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
|
||||||
if (!csrf_verify()) {
|
|
||||||
$_SESSION["comment_message"] = "Deine Sitzung ist abgelaufen. Bitte lade die Seite neu.";
|
|
||||||
$_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.
|
* Kommentar-ID und Beitrags-ID müssen gültige Zahlen sein.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -20,8 +20,6 @@ if ($pfad === "login") {
|
|||||||
include_once "php/controller/confirm-register-controller.php";
|
include_once "php/controller/confirm-register-controller.php";
|
||||||
} elseif ($pfad === "confirm-password") {
|
} elseif ($pfad === "confirm-password") {
|
||||||
include_once "php/controller/confirm-password-controller.php";
|
include_once "php/controller/confirm-password-controller.php";
|
||||||
} elseif ($pfad === "profile") {
|
|
||||||
include_once "php/controller/profile-controller.php";
|
|
||||||
} elseif ($pfad === "updateComment") {
|
} elseif ($pfad === "updateComment") {
|
||||||
include_once "php/controller/updateComment-controller.php";
|
include_once "php/controller/updateComment-controller.php";
|
||||||
} elseif($pfad === "deleteComment") {
|
} elseif($pfad === "deleteComment") {
|
||||||
|
|||||||
@@ -5,12 +5,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
|||||||
|
|
||||||
require_once __DIR__ . '/../model/Article.php';
|
require_once __DIR__ . '/../model/Article.php';
|
||||||
require_once __DIR__ . '/../model/ArticleManager.php';
|
require_once __DIR__ . '/../model/ArticleManager.php';
|
||||||
require_once __DIR__ . '/../../includes/csrf.php';
|
|
||||||
|
|
||||||
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
|
||||||
header("Location: ../../index.php");
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Prüfen, ob eine gültige Artikel-ID übergeben wurde
|
// 2. Prüfen, ob eine gültige Artikel-ID übergeben wurde
|
||||||
if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
||||||
@@ -23,13 +17,6 @@ if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
|||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
// CSRF-Token prüfen, bevor der Like-Status verändert wird
|
|
||||||
if (!csrf_verify()) {
|
|
||||||
$_SESSION["message"] = "invalid_csrf_token";
|
|
||||||
header("Location: ../../index.php?pfad=showArticle&id=" . $articleId);
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$articleManager = ArticleManager::getInstance();
|
$articleManager = ArticleManager::getInstance();
|
||||||
$articleManager->toggleLike($articleId, $userEmail);
|
$articleManager->toggleLike($articleId, $userEmail);
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
if (session_status() === PHP_SESSION_NONE) {
|
|
||||||
session_start();
|
|
||||||
}
|
|
||||||
|
|
||||||
$_SESSION = [];
|
$_SESSION = [];
|
||||||
session_destroy();
|
session_destroy();
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ require_once "php/model/Article.php";
|
|||||||
require_once "php/model/ArticleManager.php";
|
require_once "php/model/ArticleManager.php";
|
||||||
require_once "php/model/CommentManager.php";
|
require_once "php/model/CommentManager.php";
|
||||||
require_once "php/validator/user-validator.php";
|
require_once "php/validator/user-validator.php";
|
||||||
require_once "includes/csrf.php";
|
|
||||||
|
|
||||||
$error = null;
|
$error = null;
|
||||||
|
|
||||||
@@ -28,7 +27,6 @@ try {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($_SERVER["REQUEST_METHOD"] === "POST" && isset($_POST["saveProfile"])) {
|
if ($_SERVER["REQUEST_METHOD"] === "POST" && isset($_POST["saveProfile"])) {
|
||||||
|
|
||||||
$oldEmail = $_SESSION["user_email"];
|
$oldEmail = $_SESSION["user_email"];
|
||||||
|
|
||||||
$newEmail = trim($_POST["email"] ?? "");
|
$newEmail = trim($_POST["email"] ?? "");
|
||||||
@@ -36,12 +34,7 @@ try {
|
|||||||
$nachname = trim($_POST["nachname"] ?? "");
|
$nachname = trim($_POST["nachname"] ?? "");
|
||||||
$password = $_POST["password"] ?? "";
|
$password = $_POST["password"] ?? "";
|
||||||
|
|
||||||
if (!csrf_verify()) {
|
if (!userEmailValidator($newEmail)) {
|
||||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
|
||||||
$error = "Deine Sitzung ist abgelaufen. Bitte lade die Seite neu und versuche es erneut.";
|
|
||||||
$_GET["edit"] = "1";
|
|
||||||
|
|
||||||
} elseif (!userEmailValidator($newEmail)) {
|
|
||||||
$error = "Bitte gib eine gültige E-Mail-Adresse ein.";
|
$error = "Bitte gib eine gültige E-Mail-Adresse ein.";
|
||||||
$_GET["edit"] = "1";
|
$_GET["edit"] = "1";
|
||||||
|
|
||||||
|
|||||||
@@ -7,14 +7,10 @@ require_once 'php/model/Article.php';
|
|||||||
require_once 'php/model/ArticleManager.php';
|
require_once 'php/model/ArticleManager.php';
|
||||||
require_once 'php/model/UserManager.php';
|
require_once 'php/model/UserManager.php';
|
||||||
require_once 'php/model/CommentManager.php';
|
require_once 'php/model/CommentManager.php';
|
||||||
require_once 'php/validator/article-validator.php';
|
|
||||||
|
|
||||||
// Die übergebene ID muss eine gültige, positive Zahl sein, bevor sie
|
if (isset($_GET["id"]) && !empty($_GET["id"])){
|
||||||
// weiterverwendet wird. Vorher wurde jeder nicht-leere Wert akzeptiert.
|
|
||||||
$id = isset($_GET["id"]) ? articleIdValidator($_GET["id"]) : false;
|
|
||||||
|
|
||||||
if ($id !== false) {
|
|
||||||
try {
|
try {
|
||||||
|
$id = $_GET["id"];
|
||||||
$articleManager = ArticleManager::getInstance();
|
$articleManager = ArticleManager::getInstance();
|
||||||
$article = $articleManager->getArticle($id);
|
$article = $articleManager->getArticle($id);
|
||||||
if($article != null){
|
if($article != null){
|
||||||
@@ -42,7 +38,7 @@ if ($id !== false) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$commentManager = CommentManager::getInstance();
|
$commentManager = CommentManager::getInstance();
|
||||||
$comments = $commentManager->getCommentsByArticle($id); // NEU: validierte ID statt rohem $_GET["id"]
|
$comments = $commentManager->getCommentsByArticle($_GET["id"]);
|
||||||
|
|
||||||
foreach ($comments as $comment) {
|
foreach ($comments as $comment) {
|
||||||
if ($comment->isReply()) {
|
if ($comment->isReply()) {
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ require_once '../model/ArticleManager.php';
|
|||||||
require_once '../model/Article.php';
|
require_once '../model/Article.php';
|
||||||
require_once '../validator/article-validator.php';
|
require_once '../validator/article-validator.php';
|
||||||
require_once '../../includes/article-block-helper.php';
|
require_once '../../includes/article-block-helper.php';
|
||||||
require_once '../../includes/csrf.php'; // NEU: CSRF-Schutz
|
|
||||||
|
|
||||||
if (!isset($_SESSION["user"])) {
|
if (!isset($_SESSION["user"])) {
|
||||||
header("Location: index.php?pfad=login");
|
header("Location: index.php?pfad=login");
|
||||||
@@ -17,17 +16,9 @@ if (!isset($_SESSION["user"])) {
|
|||||||
|
|
||||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||||
|
|
||||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
||||||
if (!csrf_verify()) {
|
$id = $_GET["id"];
|
||||||
$_SESSION["message"] = "invalid_csrf_token";
|
} else {
|
||||||
header("location: ../../index.php?pfad=updateArticle");
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Die Beitrags-ID muss eine gültige numerische ID sein
|
|
||||||
$id = filter_input(INPUT_GET, "id", FILTER_VALIDATE_INT);
|
|
||||||
|
|
||||||
if ($id === false || $id === null) {
|
|
||||||
$_SESSION["message"] = "missing_id";
|
$_SESSION["message"] = "missing_id";
|
||||||
header("location: ../../index.php?pfad=updateArticle");
|
header("location: ../../index.php?pfad=updateArticle");
|
||||||
exit();
|
exit();
|
||||||
@@ -36,14 +27,6 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
|||||||
try {
|
try {
|
||||||
$articleManager = ArticleManager::getInstance();
|
$articleManager = ArticleManager::getInstance();
|
||||||
$article = $articleManager->getArticle($id);
|
$article = $articleManager->getArticle($id);
|
||||||
|
|
||||||
// Existenz des Beitrags prüfen, bevor auf $article zugegriffen wird.
|
|
||||||
if ($article === null) {
|
|
||||||
$_SESSION["message"] = "missing_id";
|
|
||||||
header("location: ../../index.php?pfad=updateArticle");
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($article->getAuthor() != $_SESSION["user_email"]) {
|
if ($article->getAuthor() != $_SESSION["user_email"]) {
|
||||||
$_SESSION["message"] = "unauthorized_access";
|
$_SESSION["message"] = "unauthorized_access";
|
||||||
header("location: ../../index.php");
|
header("location: ../../index.php");
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
require_once "php/model/CommentManager.php";
|
require_once "php/model/CommentManager.php";
|
||||||
require_once "includes/csrf.php";
|
|
||||||
|
|
||||||
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
||||||
header("Location: index.php");
|
header("Location: index.php");
|
||||||
@@ -17,14 +16,6 @@ if (!isset($_SESSION["user_email"])) {
|
|||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
|
||||||
if (!csrf_verify()) {
|
|
||||||
$_SESSION["comment_message"] = "Deine Sitzung ist abgelaufen. Bitte lade die Seite neu.";
|
|
||||||
$_SESSION["comment_message_type"] = "error";
|
|
||||||
header("Location: index.php");
|
|
||||||
exit();
|
|
||||||
}
|
|
||||||
|
|
||||||
$commentId = filter_input(
|
$commentId = filter_input(
|
||||||
INPUT_POST,
|
INPUT_POST,
|
||||||
"comment_id",
|
"comment_id",
|
||||||
|
|||||||
@@ -63,9 +63,12 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
VALUES (:title, :content, :author, :category, :tags);";
|
VALUES (:title, :content, :author, :category, :tags);";
|
||||||
|
|
||||||
$command = $db->prepare($sql);
|
$command = $db->prepare($sql);
|
||||||
|
if (!$command) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
|
|
||||||
// Verknüpft die übergebenen Parameter exakt mit den SQL-Platzhaltern
|
// Verknüpft die übergebenen Parameter exakt mit den SQL-Platzhaltern
|
||||||
$command->execute([
|
$success = $command->execute([
|
||||||
":title" => $title,
|
":title" => $title,
|
||||||
":content" => $content,
|
":content" => $content,
|
||||||
":author" => $author,
|
":author" => $author,
|
||||||
@@ -73,10 +76,14 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
":tags" => $tags
|
":tags" => $tags
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
if (!$success) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
|
|
||||||
return intval($db->lastInsertId());
|
return intval($db->lastInsertId());
|
||||||
|
|
||||||
} catch (PDOException $e) {
|
} catch (PDOException $e) {
|
||||||
throw new InternalServerErrorException("internal_error");
|
throw new InternalServerErrorException($e->getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,8 +106,11 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
WHERE id = :id;";
|
WHERE id = :id;";
|
||||||
|
|
||||||
$command = $db->prepare($sql);
|
$command = $db->prepare($sql);
|
||||||
|
if (!$command) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
|
|
||||||
$command->execute([
|
$success = $command->execute([
|
||||||
":id" => $id,
|
":id" => $id,
|
||||||
":title" => $article->getTitle(),
|
":title" => $article->getTitle(),
|
||||||
":content" => $article->getContent(),
|
":content" => $article->getContent(),
|
||||||
@@ -110,7 +120,7 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
// rowCount() prüft, ob eine Zeile mit dieser ID existierte und geändert werden konnte
|
// rowCount() prüft, ob eine Zeile mit dieser ID existierte und geändert werden konnte
|
||||||
if ($command->rowCount() === 0) {
|
if (!$success || $command->rowCount() === 0) {
|
||||||
// Falls die ID nicht existiert, prüfen wir, ob sie überhaupt da ist
|
// Falls die ID nicht existiert, prüfen wir, ob sie überhaupt da ist
|
||||||
if (!$this->getArticle($id)) {
|
if (!$this->getArticle($id)) {
|
||||||
throw new NotFoundException("missing_id");
|
throw new NotFoundException("missing_id");
|
||||||
@@ -138,7 +148,13 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
$sql = "DELETE FROM articles WHERE id = :id;";
|
$sql = "DELETE FROM articles WHERE id = :id;";
|
||||||
|
|
||||||
$command = $db->prepare($sql);
|
$command = $db->prepare($sql);
|
||||||
$command->execute([":id" => $id]);
|
if (!$command) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$command->execute([":id" => $id])) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
} catch (PDOException $exc) {
|
} catch (PDOException $exc) {
|
||||||
throw new InternalServerErrorException("internal_error");
|
throw new InternalServerErrorException("internal_error");
|
||||||
}
|
}
|
||||||
@@ -151,6 +167,10 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
$sql = "SELECT * FROM articles WHERE id = :id;";
|
$sql = "SELECT * FROM articles WHERE id = :id;";
|
||||||
|
|
||||||
$command = $db->prepare($sql);
|
$command = $db->prepare($sql);
|
||||||
|
if (!$command) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
|
|
||||||
$command->execute([":id" => $id]);
|
$command->execute([":id" => $id]);
|
||||||
$row = $command->fetch(PDO::FETCH_ASSOC);
|
$row = $command->fetch(PDO::FETCH_ASSOC);
|
||||||
|
|
||||||
@@ -182,6 +202,10 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
$sql = "SELECT * FROM articles;";
|
$sql = "SELECT * FROM articles;";
|
||||||
|
|
||||||
$command = $db->query($sql);
|
$command = $db->query($sql);
|
||||||
|
if (!$command) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
|
|
||||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||||
$articles = [];
|
$articles = [];
|
||||||
|
|
||||||
@@ -210,6 +234,10 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
$sql = "SELECT * FROM articles WHERE author = :author;";
|
$sql = "SELECT * FROM articles WHERE author = :author;";
|
||||||
|
|
||||||
$command = $db->prepare($sql);
|
$command = $db->prepare($sql);
|
||||||
|
if (!$command) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
|
|
||||||
$command->execute([":author" => $author]);
|
$command->execute([":author" => $author]);
|
||||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||||
$filteredArticles = [];
|
$filteredArticles = [];
|
||||||
@@ -242,6 +270,10 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
$sql = "SELECT * FROM articles WHERE category = :category;";
|
$sql = "SELECT * FROM articles WHERE category = :category;";
|
||||||
|
|
||||||
$command = $db->prepare($sql);
|
$command = $db->prepare($sql);
|
||||||
|
if (!$command) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
|
|
||||||
$command->execute([":category" => $category]);
|
$command->execute([":category" => $category]);
|
||||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||||
$filteredArticles = [];
|
$filteredArticles = [];
|
||||||
@@ -286,14 +318,20 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
OR tags LIKE :keyword;";
|
OR tags LIKE :keyword;";
|
||||||
|
|
||||||
$command = $db->prepare($sql);
|
$command = $db->prepare($sql);
|
||||||
|
if (!$command) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
|
|
||||||
// Wildcards für die Suche hinzufügen
|
// Wildcards für die SQL-Suche hinzufügen
|
||||||
$searchParam = '%' . $cleankeyword . '%';
|
$searchParam = '%' . $cleankeyword . '%';
|
||||||
|
$success = $command->execute([
|
||||||
$command->execute([
|
|
||||||
":keyword" => $searchParam
|
":keyword" => $searchParam
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
if (!$success) {
|
||||||
|
throw new InternalServerErrorException("internal_error");
|
||||||
|
}
|
||||||
|
|
||||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||||
$filteredArticles = [];
|
$filteredArticles = [];
|
||||||
|
|
||||||
@@ -320,6 +358,7 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holt alle User-IDs, die einen bestimmten Beitrag geliked haben.
|
* Holt alle User-IDs, die einen bestimmten Beitrag geliked haben.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,20 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
|
||||||
* NEU: Prüft, ob ein übergebener Wert eine gültige, positive
|
|
||||||
* Beitrags-ID ist. Wird überall dort verwendet, wo eine Artikel-ID
|
|
||||||
* aus $_GET oder $_POST entgegengenommen wird
|
|
||||||
*
|
|
||||||
* @param mixed $id
|
|
||||||
* @return int|false Die validierte ID als int, oder false bei Ungültigkeit
|
|
||||||
*/
|
|
||||||
function articleIdValidator($id)
|
|
||||||
{
|
|
||||||
$options = ["options" => ["min_range" => 1]];
|
|
||||||
|
|
||||||
return filter_var($id, FILTER_VALIDATE_INT, $options);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Prüft, ob der Titel die folgenden Bedingungen erfüllt:
|
* Prüft, ob der Titel die folgenden Bedingungen erfüllt:
|
||||||
* Buchstaben von a-z; A-Z
|
* Buchstaben von a-z; A-Z
|
||||||
|
|||||||
Reference in New Issue
Block a user