Compare commits
49 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c22853d802 | |||
| 4abc5f4167 | |||
| 9f4343cc53 | |||
| a5998cffca | |||
| 153a612ad6 | |||
| 437da98add | |||
| a4b0dfe7ec | |||
| 3a819d6ed2 | |||
| 4f4ad9599d | |||
| d9da018ac2 | |||
| 2148ba75f3 | |||
| c4ffc1c797 | |||
| a785d862d8 | |||
| a728a8a556 | |||
| ae34afda15 | |||
| 59e0b9f111 | |||
| cd50840b19 | |||
| 3bce65a1a5 | |||
| 50b29c96d6 | |||
| d5fc5f3065 | |||
| 0427d52a58 | |||
| cc804757ff | |||
| b55a6592f0 | |||
| e12a98cc98 | |||
| 320141855a | |||
| 12801344f1 | |||
| 83387de103 | |||
| dfb8e1dc89 | |||
| bdbc38a339 | |||
| e6356525b9 | |||
| ca74690952 | |||
| 75f9fdbeb8 | |||
| 81a27135d5 | |||
| a58576637a | |||
| 997957a5d3 | |||
| ec794db706 | |||
| ba749bca68 | |||
| 12a6af55b0 | |||
| 400f018104 | |||
| 80f4b623f9 | |||
| 6546d264b0 | |||
| e7e120e5b8 | |||
| ec66889a1f | |||
| f1703a476e | |||
| bac296b58a | |||
| bfb2d2b0d8 | |||
| ad9a00fd49 | |||
| 42faab17e8 | |||
| 1da4842847 |
@@ -27,6 +27,8 @@ $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">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<main class="editor-main">
|
||||
<?php include_once "includes/alertMessages.php"?>
|
||||
|
||||
|
||||
+4
-1
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
include_once 'php/controller/profile-controller.php';
|
||||
|
||||
$user = $user ?? null;
|
||||
$isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
@@ -18,6 +17,8 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
|
||||
<form method="post" action="index.php?pfad=profile">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<label class="input-label">Vorname</label>
|
||||
<input type="text"
|
||||
name="vorname"
|
||||
@@ -82,6 +83,7 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
<br>
|
||||
|
||||
<form action="php/controller/deleteAccount-controller.php" method="POST">
|
||||
<?php csrf_field(); ?>
|
||||
<button type="submit"
|
||||
class="button"
|
||||
onclick="return confirm('Möchtest du deinen Account und alle deine Beiträge wirklich unwiderruflich löschen?');">
|
||||
@@ -155,6 +157,7 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
</a>
|
||||
|
||||
<form action="php/controller/deleteArticle-controller.php" method="POST">
|
||||
<?php csrf_field(); ?>
|
||||
<input type="hidden"
|
||||
name="id"
|
||||
value="<?php echo htmlspecialchars($userArticle->getID()); ?>">
|
||||
|
||||
@@ -137,17 +137,6 @@ $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>
|
||||
</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 -->
|
||||
<div class="s-res-list">
|
||||
<?php if (!empty($results)): ?>
|
||||
|
||||
+57
-16
@@ -5,6 +5,30 @@ $repliesByParent = [];
|
||||
$articleObj = null;
|
||||
|
||||
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
|
||||
* geantwortet werden soll.
|
||||
@@ -56,9 +80,14 @@ if ($replyAuthor === null) {
|
||||
<span>❤️ <span class="like-count"><?php echo $articleObj->getLikeCount(); ?></span></span>
|
||||
|
||||
<?php if (isset($_SESSION["user_email"])): ?>
|
||||
<a href="php/controller/like-controller.php?id=<?php echo $articleObj->getId(); ?>" class="like-toggle-btn">
|
||||
<form method="post"
|
||||
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'; ?>
|
||||
</a>
|
||||
</button>
|
||||
</form>
|
||||
<?php else: ?>
|
||||
<span class="login-hint">(Anmelden zum Liken)</span>
|
||||
<?php endif; ?>
|
||||
@@ -173,7 +202,14 @@ if ($replyAuthor === null) {
|
||||
|
||||
<p>
|
||||
<strong>
|
||||
<?php echo htmlspecialchars($comment->getAuthor()); ?>
|
||||
<?php
|
||||
echo htmlspecialchars(
|
||||
getCommentAuthorName(
|
||||
$comment->getAuthor(),
|
||||
$userManager
|
||||
)
|
||||
);
|
||||
?>
|
||||
</strong>
|
||||
|
||||
<span>
|
||||
@@ -202,6 +238,8 @@ if ($replyAuthor === null) {
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
@@ -239,6 +277,8 @@ if ($replyAuthor === null) {
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
@@ -304,7 +344,14 @@ if ($replyAuthor === null) {
|
||||
|
||||
<p>
|
||||
<strong>
|
||||
<?php echo htmlspecialchars($reply->getAuthor()); ?>
|
||||
<?php
|
||||
echo htmlspecialchars(
|
||||
getCommentAuthorName(
|
||||
$reply->getAuthor(),
|
||||
$userManager
|
||||
)
|
||||
);
|
||||
?>
|
||||
</strong>
|
||||
|
||||
<span>
|
||||
@@ -334,6 +381,8 @@ if ($replyAuthor === null) {
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
@@ -371,6 +420,8 @@ if ($replyAuthor === null) {
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
@@ -412,6 +463,8 @@ if ($replyAuthor === null) {
|
||||
method="post"
|
||||
action="php/ajax/add-comment.php">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<input type="hidden"
|
||||
name="article_id"
|
||||
value="<?php echo htmlspecialchars(
|
||||
@@ -457,18 +510,6 @@ if ($replyAuthor === null) {
|
||||
<button type="submit" class="button">
|
||||
Kommentar senden
|
||||
</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>
|
||||
<?php else: ?>
|
||||
<div class="comment-login-hint">
|
||||
|
||||
@@ -113,17 +113,6 @@ $resultCount = count($results);
|
||||
</p>
|
||||
</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 -->
|
||||
<div class="s-res-list">
|
||||
<?php if (!empty($results)): ?>
|
||||
|
||||
@@ -27,6 +27,8 @@ $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">
|
||||
|
||||
<?php csrf_field(); ?>
|
||||
|
||||
<main class="editor-main">
|
||||
<?php include_once "includes/alertMessages.php"?>
|
||||
|
||||
|
||||
+184
-25
@@ -154,21 +154,32 @@ h1 {
|
||||
|
||||
.button {
|
||||
width: 100%;
|
||||
padding: 12px;
|
||||
padding: 14px;
|
||||
background-color: #2563eb;
|
||||
color: white;
|
||||
border: none;
|
||||
border: 2px solid transparent;
|
||||
border-radius: 8px;
|
||||
font-size: 1rem;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.2s, transform 0.2s, box-shadow 0.2s;
|
||||
transition:
|
||||
background-color 0.2s ease,
|
||||
transform 0.2s ease,
|
||||
box-shadow 0.2s ease,
|
||||
border-color 0.2s ease;
|
||||
}
|
||||
|
||||
.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;
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 10px rgba(0,0,0,0.15);
|
||||
transform: translateY(1px) scale(0.99);
|
||||
box-shadow: 0 2px 5px rgba(37, 99, 235, 0.25);
|
||||
}
|
||||
|
||||
.register-link {
|
||||
@@ -226,33 +237,181 @@ h1 {
|
||||
text-decoration: none;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.comment-loading {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin-top: 10px;
|
||||
|
||||
/* Deutlichere Klickreaktion für Kategorien */
|
||||
.category-link:active {
|
||||
transform: translateY(1px);
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.comment-loading[hidden] {
|
||||
/* 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;
|
||||
flex-direction: column;
|
||||
gap: 20px;
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
#comments-list > div,
|
||||
.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;
|
||||
}
|
||||
|
||||
.comment-spinner {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
border: 2px solid #cbd5e1;
|
||||
border-top-color: #1f2937;
|
||||
border-radius: 50%;
|
||||
animation: comment-spinner-rotation 0.8s linear infinite;
|
||||
/* Eigenes Symbol vor dem Text */
|
||||
.edit-comment-button::before {
|
||||
content: "✏ ";
|
||||
}
|
||||
|
||||
@keyframes comment-spinner-rotation {
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
.edit-comment-button:hover {
|
||||
background-color: #1e40af;
|
||||
border-color: #1e40af;
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 5px 12px rgba(37, 99, 235, 0.3);
|
||||
}
|
||||
|
||||
#comment-form button[type="submit"]:disabled {
|
||||
cursor: wait;
|
||||
opacity: 0.65;
|
||||
.edit-comment-button:active {
|
||||
transform: translateY(1px);
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.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: "▲ ";
|
||||
}
|
||||
+111
-1
@@ -285,6 +285,32 @@ CSS für die navbar
|
||||
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 {
|
||||
display: block;
|
||||
list-style: none;
|
||||
@@ -302,5 +328,89 @@ CSS für die navbar
|
||||
padding: 0.8rem 1rem;
|
||||
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,33 +271,4 @@ CSS für die Suchergebnis-Seite
|
||||
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,6 +89,12 @@
|
||||
Es ist ein Datenbankfehler aufgetreten. Bitte versuche es erneut.
|
||||
</p>
|
||||
<?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
|
||||
unset($_SESSION["message"]);
|
||||
?>
|
||||
@@ -0,0 +1,88 @@
|
||||
<?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,6 +2,7 @@
|
||||
if (session_status() === PHP_SESSION_NONE) {
|
||||
session_start();
|
||||
}
|
||||
include_once "includes/csrf.php";
|
||||
include_once "php/controller/index-controller.php";
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
|
||||
+25
-38
@@ -11,19 +11,7 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
const parentCommentInput = document.getElementById("parent-comment-id");
|
||||
const replyInfo = document.getElementById("reply-info");
|
||||
|
||||
const submitButton = form
|
||||
? form.querySelector('button[type="submit"]')
|
||||
: null;
|
||||
|
||||
const loadingMessage = document.getElementById("comment-loading");
|
||||
|
||||
if (
|
||||
!form
|
||||
|| !commentsList
|
||||
|| !commentContent
|
||||
|| !parentCommentInput
|
||||
|| !submitButton
|
||||
) {
|
||||
if (!form || !commentsList || !commentContent || !parentCommentInput) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -65,23 +53,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
form.addEventListener("submit", function (event) {
|
||||
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 parentCommentId = parentCommentInput.value;
|
||||
|
||||
@@ -138,6 +109,12 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="csrf_token"
|
||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
@@ -166,6 +143,12 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="csrf_token"
|
||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
@@ -216,6 +199,12 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
action="index.php?pfad=updateComment"
|
||||
class="edit-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="csrf_token"
|
||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
@@ -244,6 +233,12 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form"
|
||||
>
|
||||
<input
|
||||
type="hidden"
|
||||
name="csrf_token"
|
||||
value="${escapeHtml(formData.get("csrf_token"))}"
|
||||
>
|
||||
|
||||
<input
|
||||
type="hidden"
|
||||
name="comment_id"
|
||||
@@ -298,14 +293,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
.catch(function (error) {
|
||||
console.error(error);
|
||||
alert("Kommentar konnte nicht gesendet werden.");
|
||||
})
|
||||
.finally(function () {
|
||||
submitButton.disabled = false;
|
||||
submitButton.textContent = originalButtonText;
|
||||
|
||||
if (loadingMessage) {
|
||||
loadingMessage.hidden = true;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
+4
-23
@@ -25,7 +25,6 @@
|
||||
|
||||
let listContainer, sortRadios, categorySelect, limitSelect;
|
||||
let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
|
||||
let loadingElement;
|
||||
|
||||
function init() {
|
||||
listContainer = document.querySelector('.s-res-list');
|
||||
@@ -39,41 +38,23 @@
|
||||
numbersContainer = document.getElementById('dynamic-page-numbers');
|
||||
jsNav = document.getElementById('js-page-navigation');
|
||||
resultCountEl = document.getElementById('s-res-result-count');
|
||||
loadingElement = document.getElementById('results-loading');
|
||||
|
||||
const checkedRadio = document.querySelector('.sort-radio:checked');
|
||||
state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
|
||||
state.category = categorySelect ? categorySelect.value : 'all';
|
||||
state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
|
||||
|
||||
if (loadingElement) {
|
||||
loadingElement.hidden = false;
|
||||
}
|
||||
|
||||
fetchFullDataset()
|
||||
.then(function (data) {
|
||||
state.allItems = data.results || [];
|
||||
attachEvents();
|
||||
render();
|
||||
|
||||
if (jsNav) {
|
||||
jsNav.style.display = 'flex';
|
||||
}
|
||||
if (jsNav) jsNav.style.display = 'flex';
|
||||
})
|
||||
.catch(function (err) {
|
||||
/*
|
||||
* Falls das Nachladen nicht funktioniert, bleibt die bereits
|
||||
* serverseitig ausgegebene Ergebnisliste sichtbar.
|
||||
*/
|
||||
console.error(
|
||||
'Suchergebnisse konnten nicht nachgeladen werden:',
|
||||
err
|
||||
);
|
||||
})
|
||||
.finally(function () {
|
||||
if (loadingElement) {
|
||||
loadingElement.hidden = true;
|
||||
}
|
||||
// JSON-Endpoint nicht erreichbar: die serverseitig gerenderte
|
||||
// (No-JS-)Ansicht bleibt sichtbar und funktioniert weiter.
|
||||
console.error('Suchergebnisse konnten nicht nachgeladen werden:', err);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
+4
-23
@@ -21,7 +21,6 @@
|
||||
|
||||
let listContainer, sortRadios, searchInput, limitSelect;
|
||||
let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
|
||||
let loadingElement;
|
||||
let searchDebounceTimer;
|
||||
|
||||
function init() {
|
||||
@@ -36,41 +35,23 @@
|
||||
numbersContainer = document.getElementById('dynamic-page-numbers');
|
||||
jsNav = document.getElementById('js-page-navigation');
|
||||
resultCountEl = document.getElementById('s-res-result-count');
|
||||
loadingElement = document.getElementById('results-loading');
|
||||
|
||||
const checkedRadio = document.querySelector('.sort-radio:checked');
|
||||
state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
|
||||
state.query = searchInput ? searchInput.value : '';
|
||||
state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
|
||||
|
||||
if (loadingElement) {
|
||||
loadingElement.hidden = false;
|
||||
}
|
||||
|
||||
fetchFullDataset()
|
||||
.then(function (data) {
|
||||
state.allItems = data.results || [];
|
||||
attachEvents();
|
||||
render();
|
||||
|
||||
if (jsNav) {
|
||||
jsNav.style.display = 'flex';
|
||||
}
|
||||
if (jsNav) jsNav.style.display = 'flex';
|
||||
})
|
||||
.catch(function (err) {
|
||||
/*
|
||||
* Falls das Nachladen nicht funktioniert, bleibt die bereits
|
||||
* serverseitig ausgegebene Kategorieansicht sichtbar.
|
||||
*/
|
||||
console.error(
|
||||
'Kategorie-Beiträge konnten nicht nachgeladen werden:',
|
||||
err
|
||||
);
|
||||
})
|
||||
.finally(function () {
|
||||
if (loadingElement) {
|
||||
loadingElement.hidden = true;
|
||||
}
|
||||
// JSON-Endpoint nicht erreichbar: die serverseitig gerenderte
|
||||
// (No-JS-)Ansicht bleibt sichtbar und funktioniert weiter.
|
||||
console.error('Kategorie-Beiträge konnten nicht nachgeladen werden:', err);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,9 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
}
|
||||
|
||||
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.
|
||||
@@ -96,6 +99,17 @@ 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.
|
||||
*/
|
||||
@@ -128,6 +142,18 @@ 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 === "") {
|
||||
sendCommentResponse(
|
||||
false,
|
||||
@@ -152,6 +178,30 @@ 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 {
|
||||
$commentManager = CommentManager::getInstance();
|
||||
|
||||
@@ -162,13 +212,29 @@ try {
|
||||
$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(
|
||||
true,
|
||||
"Der Kommentar wurde erfolgreich gespeichert.",
|
||||
$articleId,
|
||||
[
|
||||
"commentId" => $commentId,
|
||||
"author" => $_SESSION["user_email"],
|
||||
"author" => $authorName,
|
||||
"content" => $content,
|
||||
"created" => date("Y-m-d H:i:s"),
|
||||
"parentCommentId" => $parentCommentId
|
||||
|
||||
@@ -6,6 +6,7 @@ require_once '../model/LocalArticleManager.php';
|
||||
require_once '../model/ArticleManager.php';
|
||||
require_once '../validator/article-validator.php';
|
||||
require_once '../../includes/article-block-helper.php';
|
||||
require_once '../../includes/csrf.php';
|
||||
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
@@ -14,6 +15,13 @@ if (!isset($_SESSION["user"])) {
|
||||
|
||||
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/';
|
||||
if (!file_exists($uploadDir)) {
|
||||
mkdir($uploadDir, 0755, true);
|
||||
|
||||
@@ -5,12 +5,24 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
|
||||
require_once __DIR__ . "/../model/UserManager.php";
|
||||
require_once __DIR__ . "/../model/ArticleManager.php";
|
||||
require_once __DIR__ . "/../../includes/csrf.php";
|
||||
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
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
|
||||
Funktion: Entfernt User aus der Datenbank und beendet die Session
|
||||
|
||||
@@ -4,6 +4,7 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
}
|
||||
|
||||
require_once __DIR__ . "/../model/ArticleManager.php";
|
||||
require_once __DIR__ . "/../../includes/csrf.php";
|
||||
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
@@ -12,6 +13,13 @@ if (!isset($_SESSION["user"])) {
|
||||
|
||||
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"])) {
|
||||
$user = $_SESSION["user_email"];
|
||||
} else {
|
||||
@@ -22,9 +30,10 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
exit();
|
||||
}
|
||||
|
||||
if (isset($_POST["id"]) && !empty($_POST["id"])) {
|
||||
$id = $_POST["id"];
|
||||
} else {
|
||||
// Die Beitrags-ID muss eine gültige numerische ID sein.
|
||||
$id = filter_input(INPUT_POST, "id", FILTER_VALIDATE_INT);
|
||||
|
||||
if ($id === false || $id === null) {
|
||||
$_SESSION["message"] = "missing_id";
|
||||
header("location: ../../index.php?pfad=profile");
|
||||
exit();
|
||||
|
||||
@@ -5,6 +5,7 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
}
|
||||
|
||||
require_once __DIR__ . "/../model/CommentManager.php";
|
||||
require_once __DIR__ . "/../../includes/csrf.php";
|
||||
|
||||
/*
|
||||
* Kommentare dürfen nur über ein POST-Formular gelöscht werden.
|
||||
@@ -44,6 +45,23 @@ if (!isset($_SESSION["user_email"])) {
|
||||
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.
|
||||
*/
|
||||
|
||||
@@ -20,6 +20,8 @@ if ($pfad === "login") {
|
||||
include_once "php/controller/confirm-register-controller.php";
|
||||
} elseif ($pfad === "confirm-password") {
|
||||
include_once "php/controller/confirm-password-controller.php";
|
||||
} elseif ($pfad === "profile") {
|
||||
include_once "php/controller/profile-controller.php";
|
||||
} elseif ($pfad === "updateComment") {
|
||||
include_once "php/controller/updateComment-controller.php";
|
||||
} elseif($pfad === "deleteComment") {
|
||||
|
||||
@@ -5,6 +5,12 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
|
||||
require_once __DIR__ . '/../model/Article.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
|
||||
if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
||||
@@ -17,6 +23,13 @@ if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
||||
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 {
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$articleManager->toggleLike($articleId, $userEmail);
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
<?php
|
||||
if (session_status() === PHP_SESSION_NONE) {
|
||||
session_start();
|
||||
}
|
||||
|
||||
$_SESSION = [];
|
||||
session_destroy();
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ require_once "php/model/Article.php";
|
||||
require_once "php/model/ArticleManager.php";
|
||||
require_once "php/model/CommentManager.php";
|
||||
require_once "php/validator/user-validator.php";
|
||||
require_once "includes/csrf.php";
|
||||
|
||||
$error = null;
|
||||
|
||||
@@ -27,6 +28,7 @@ try {
|
||||
}
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST" && isset($_POST["saveProfile"])) {
|
||||
|
||||
$oldEmail = $_SESSION["user_email"];
|
||||
|
||||
$newEmail = trim($_POST["email"] ?? "");
|
||||
@@ -34,7 +36,12 @@ try {
|
||||
$nachname = trim($_POST["nachname"] ?? "");
|
||||
$password = $_POST["password"] ?? "";
|
||||
|
||||
if (!userEmailValidator($newEmail)) {
|
||||
if (!csrf_verify()) {
|
||||
// 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.";
|
||||
$_GET["edit"] = "1";
|
||||
|
||||
|
||||
@@ -7,10 +7,14 @@ require_once 'php/model/Article.php';
|
||||
require_once 'php/model/ArticleManager.php';
|
||||
require_once 'php/model/UserManager.php';
|
||||
require_once 'php/model/CommentManager.php';
|
||||
require_once 'php/validator/article-validator.php';
|
||||
|
||||
if (isset($_GET["id"]) && !empty($_GET["id"])){
|
||||
// Die übergebene ID muss eine gültige, positive Zahl sein, bevor sie
|
||||
// weiterverwendet wird. Vorher wurde jeder nicht-leere Wert akzeptiert.
|
||||
$id = isset($_GET["id"]) ? articleIdValidator($_GET["id"]) : false;
|
||||
|
||||
if ($id !== false) {
|
||||
try {
|
||||
$id = $_GET["id"];
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$article = $articleManager->getArticle($id);
|
||||
if($article != null){
|
||||
@@ -38,7 +42,7 @@ if (isset($_GET["id"]) && !empty($_GET["id"])){
|
||||
}
|
||||
|
||||
$commentManager = CommentManager::getInstance();
|
||||
$comments = $commentManager->getCommentsByArticle($_GET["id"]);
|
||||
$comments = $commentManager->getCommentsByArticle($id); // NEU: validierte ID statt rohem $_GET["id"]
|
||||
|
||||
foreach ($comments as $comment) {
|
||||
if ($comment->isReply()) {
|
||||
|
||||
@@ -8,6 +8,7 @@ require_once '../model/ArticleManager.php';
|
||||
require_once '../model/Article.php';
|
||||
require_once '../validator/article-validator.php';
|
||||
require_once '../../includes/article-block-helper.php';
|
||||
require_once '../../includes/csrf.php'; // NEU: CSRF-Schutz
|
||||
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
@@ -16,9 +17,17 @@ if (!isset($_SESSION["user"])) {
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
|
||||
if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
||||
$id = $_GET["id"];
|
||||
} else {
|
||||
// CSRF-Token prüfen, bevor irgendeine Änderung vorgenommen wird
|
||||
if (!csrf_verify()) {
|
||||
$_SESSION["message"] = "invalid_csrf_token";
|
||||
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";
|
||||
header("location: ../../index.php?pfad=updateArticle");
|
||||
exit();
|
||||
@@ -27,6 +36,14 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
try {
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$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"]) {
|
||||
$_SESSION["message"] = "unauthorized_access";
|
||||
header("location: ../../index.php");
|
||||
|
||||
@@ -5,6 +5,7 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
}
|
||||
|
||||
require_once "php/model/CommentManager.php";
|
||||
require_once "includes/csrf.php";
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] !== "POST") {
|
||||
header("Location: index.php");
|
||||
@@ -16,6 +17,14 @@ if (!isset($_SESSION["user_email"])) {
|
||||
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(
|
||||
INPUT_POST,
|
||||
"comment_id",
|
||||
|
||||
@@ -63,12 +63,9 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
VALUES (:title, :content, :author, :category, :tags);";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
// Verknüpft die übergebenen Parameter exakt mit den SQL-Platzhaltern
|
||||
$success = $command->execute([
|
||||
$command->execute([
|
||||
":title" => $title,
|
||||
":content" => $content,
|
||||
":author" => $author,
|
||||
@@ -76,14 +73,10 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
":tags" => $tags
|
||||
]);
|
||||
|
||||
if (!$success) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
return intval($db->lastInsertId());
|
||||
|
||||
} catch (PDOException $e) {
|
||||
throw new InternalServerErrorException($e->getMessage());
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,11 +99,8 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
WHERE id = :id;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$success = $command->execute([
|
||||
$command->execute([
|
||||
":id" => $id,
|
||||
":title" => $article->getTitle(),
|
||||
":content" => $article->getContent(),
|
||||
@@ -120,7 +110,7 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
]);
|
||||
|
||||
// rowCount() prüft, ob eine Zeile mit dieser ID existierte und geändert werden konnte
|
||||
if (!$success || $command->rowCount() === 0) {
|
||||
if ($command->rowCount() === 0) {
|
||||
// Falls die ID nicht existiert, prüfen wir, ob sie überhaupt da ist
|
||||
if (!$this->getArticle($id)) {
|
||||
throw new NotFoundException("missing_id");
|
||||
@@ -148,13 +138,7 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
$sql = "DELETE FROM articles WHERE id = :id;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
if (!$command->execute([":id" => $id])) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
$command->execute([":id" => $id]);
|
||||
} catch (PDOException $exc) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
@@ -167,10 +151,6 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
$sql = "SELECT * FROM articles WHERE id = :id;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$command->execute([":id" => $id]);
|
||||
$row = $command->fetch(PDO::FETCH_ASSOC);
|
||||
|
||||
@@ -202,10 +182,6 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
$sql = "SELECT * FROM articles;";
|
||||
|
||||
$command = $db->query($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||
$articles = [];
|
||||
|
||||
@@ -234,10 +210,6 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
$sql = "SELECT * FROM articles WHERE author = :author;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$command->execute([":author" => $author]);
|
||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||
$filteredArticles = [];
|
||||
@@ -270,10 +242,6 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
$sql = "SELECT * FROM articles WHERE category = :category;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$command->execute([":category" => $category]);
|
||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||
$filteredArticles = [];
|
||||
@@ -318,20 +286,14 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
OR tags LIKE :keyword;";
|
||||
|
||||
$command = $db->prepare($sql);
|
||||
if (!$command) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
// Wildcards für die SQL-Suche hinzufügen
|
||||
// Wildcards für die Suche hinzufügen
|
||||
$searchParam = '%' . $cleankeyword . '%';
|
||||
$success = $command->execute([
|
||||
|
||||
$command->execute([
|
||||
":keyword" => $searchParam
|
||||
]);
|
||||
|
||||
if (!$success) {
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
$rows = $command->fetchAll(PDO::FETCH_ASSOC);
|
||||
$filteredArticles = [];
|
||||
|
||||
@@ -358,7 +320,6 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Holt alle User-IDs, die einen bestimmten Beitrag geliked haben.
|
||||
*
|
||||
|
||||
@@ -1,5 +1,20 @@
|
||||
<?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:
|
||||
* Buchstaben von a-z; A-Z
|
||||
|
||||
Reference in New Issue
Block a user