From 95bfdb59b6a1e04e474551c23c7caef619c79839 Mon Sep 17 00:00:00 2001 From: Jonas Kohl Date: Thu, 19 Sep 2024 14:19:35 +0200 Subject: Topic locking --- src/application/messages/de.msg | 9 +++ src/application/mystic/forum/orm/Topic.php | 2 + src/application/views/view_post.php | 3 + src/application/views/view_search_results.php | 4 +- src/application/views/view_topic_locked.php | 4 ++ src/application/views/view_topic_start.php | 31 ++++++++- src/application/views/view_topics.php | 7 +- src/application/views/view_user.php | 4 +- src/index.php | 94 ++++++++++++++++++++++++++- 9 files changed, 153 insertions(+), 5 deletions(-) create mode 100644 src/application/views/view_topic_locked.php (limited to 'src') diff --git a/src/application/messages/de.msg b/src/application/messages/de.msg index c2d8416..d1b2389 100644 --- a/src/application/messages/de.msg +++ b/src/application/messages/de.msg @@ -455,3 +455,12 @@ metadata({ : "Failed to send verification email" = "Konnte Bestätigungsmail nicht versenden" + +: "This topic has been locked" += "Dieses Thema wurde gesperrt" + +: "Lock topic" += "Thema sperren" + +: "Unlock topic" += "Thema entsperren" diff --git a/src/application/mystic/forum/orm/Topic.php b/src/application/mystic/forum/orm/Topic.php index 421f5ec..cfd0c78 100644 --- a/src/application/mystic/forum/orm/Topic.php +++ b/src/application/mystic/forum/orm/Topic.php @@ -3,6 +3,7 @@ declare(strict_types=1); namespace mystic\forum\orm; +use mystic\forum\attributes\DefaultValue; use mystic\forum\attributes\PrimaryKey; use mystic\forum\attributes\References; use mystic\forum\attributes\Table; @@ -13,4 +14,5 @@ class Topic extends Entity { public string $title; public \DateTimeImmutable $creationDate; #[References("public.users", onDelete: References::SET_NULL)] public ?string $createdBy; + #[DefaultValue("false")] public bool $isLocked; } diff --git a/src/application/views/view_post.php b/src/application/views/view_post.php index 62b2d18..0f86896 100644 --- a/src/application/views/view_post.php +++ b/src/application/views/view_post.php @@ -5,6 +5,7 @@ use mystic\forum\orm\Attachment; /** @var mystic\forum\orm\Post $post */ /** @var mystic\forum\orm\User $postAuthor */ +/** @var mystic\forum\orm\Topic $topic */ $isImage = fn(string $m) => str_starts_with($m, "image/") || str_starts_with($m, "video/"); @@ -16,6 +17,8 @@ $canReply = $GLOBALS["currentUser"]?->hasPermission(UserPermissions::CREATE_OWN_ $canEdit = ($GLOBALS["currentUser"]?->id === $postAuthor?->id && $postAuthor?->hasPermission(UserPermissions::EDIT_OWN_POST)) || ($GLOBALS["currentUser"]?->hasPermission(UserPermissions::EDIT_OTHER_POST)); +$canEdit = $canEdit && !$topic->isLocked; + $canDelete = ($GLOBALS["currentUser"]?->id === $postAuthor?->id && $postAuthor?->hasPermission(UserPermissions::DELETE_OWN_POST)) || ($GLOBALS["currentUser"]?->hasPermission(UserPermissions::DELETE_OTHER_POST)); diff --git a/src/application/views/view_search_results.php b/src/application/views/view_search_results.php index e21fbb8..914d2b2 100644 --- a/src/application/views/view_search_results.php +++ b/src/application/views/view_search_results.php @@ -20,7 +20,9 @@ use mystic\forum\utils\StringUtils; '' . htmlentities($users[$post->authorId]?->displayName ?? __("unknown")) . '', "post_date" => '' . htmlentities($post->postDate->format("c")) . '', - "topic" => '' . htmlentities($topics[$post->topicId]?->title ?? "unknown") . '', + "topic" => '' + . ($topics[$post->topicId]?->isLocked ? ' ' : '') + . htmlentities($topics[$post->topicId]?->title ?? "unknown") . '', ]) ?> diff --git a/src/application/views/view_topic_locked.php b/src/application/views/view_topic_locked.php new file mode 100644 index 0000000..ac59fcb --- /dev/null +++ b/src/application/views/view_topic_locked.php @@ -0,0 +1,4 @@ +
+ + +
diff --git a/src/application/views/view_topic_start.php b/src/application/views/view_topic_start.php index da8c0cd..fe85afa 100644 --- a/src/application/views/view_topic_start.php +++ b/src/application/views/view_topic_start.php @@ -1,5 +1,6 @@ hasPermission(UserPermissions::CREATE_OWN_POST) ?? false; @@ -111,17 +112,45 @@ $canDelete = ($GLOBALS["currentUser"]?->id === $topicAuthor->id && $topicAuthor- + $_formError]); +} + +if (($_formError = RequestUtils::getAndClearFormError("locktopic")) !== null) { + _view("alert_error", ["message" => $_formError]); +} +?> +
+ isLocked): ?> + + title) ?>
- + isLocked): ?> + + isLocked): ?> +
+ + + +
+ +
+ + + +
+ +
diff --git a/src/application/views/view_topics.php b/src/application/views/view_topics.php index 291fbdc..a762f8c 100644 --- a/src/application/views/view_topics.php +++ b/src/application/views/view_topics.php @@ -12,7 +12,12 @@ if ($GLOBALS["currentUser"]?->hasPermission(UserPermissions::CREATE_OWN_TOPIC)):
-

title) ?>

+

+ isLocked): ?> + + + title) ?> +

creationDate->format("c")) ?>

 diff --git a/src/application/views/view_user.php b/src/application/views/view_user.php index d3ebe04..5c89411 100644 --- a/src/application/views/view_user.php +++ b/src/application/views/view_user.php @@ -59,7 +59,9 @@ $emailPending = $isOwnProfile && $user->pendingEmail !== null; content)), 100)) ?>
'' . htmlentities($post->postDate->format("c")) . '', - "topic" => '' . htmlentities($topics[$post->topicId]?->title ?? "unknown") . '', + "topic" => '' . + ($topics[$post->topicId]?->isLocked ? ' ' : '') . + htmlentities($topics[$post->topicId]?->title ?? "unknown") . '', ]) ?> diff --git a/src/index.php b/src/index.php index d651400..cc9e99d 100644 --- a/src/index.php +++ b/src/index.php @@ -572,6 +572,12 @@ if ($_action === "auth") { msg_error("You need to be logged in to add new posts!"); exit; } + + if ($topic->isLocked) { + http_response_code(403); + msg_error("This topic is locked!"); + exit; + } $attachments = reArrayFiles($_FILES["files"]); @@ -658,12 +664,15 @@ if ($_action === "auth") { "postAuthor" => $postAuthor, "topicAuthor" => $topicAuthor, "attachments" => $attachments, + "topic" => $topic, ]); } _view("view_topic_end"); - if ($currentUser) { + if ($topic->isLocked) { + _view("view_topic_locked"); + } elseif ($currentUser) { _view("form_addpost"); } else { _view("view_logintoreply"); @@ -709,6 +718,7 @@ if ($_action === "auth") { $topic->id = $db->generateId(); $topic->title = $title; $topic->creationDate = new DateTimeImmutable(); + $topic->isLocked = false; $db->insert($topic); @@ -1169,6 +1179,12 @@ if ($_action === "auth") { if (!$db->fetch($topicAuthor)) $topicAuthor = null; + $topic = new Topic(); + $topic->id = $post->topicId; + + if (!$db->fetch($topic)) + $topic = null; + $canEdit = ($currentUser->id === $topicAuthor?->id && $topicAuthor?->hasPermission(UserPermissions::DELETE_OWN_POST)) || ($currentUser->hasPermission(UserPermissions::DELETE_OTHER_POST)); @@ -1217,6 +1233,7 @@ if ($_action === "auth") { "postAuthor" => $topicAuthor, "topicAuthor" => null, "attachments" => $attachments, + "topic" => $topic, ]); _view("template_end", [...getThemeAndLangInfo()]); } @@ -1251,6 +1268,18 @@ if ($_action === "auth") { $canEdit = ($currentUser->id === $topicAuthor?->id && $topicAuthor?->hasPermission(UserPermissions::EDIT_OWN_POST)) || ($currentUser->hasPermission(UserPermissions::EDIT_OTHER_POST)); + $topic = new Topic(); + $topic->id = $post->topicId; + + if (!$db->fetch($topic)) + $topic = null; + + if ($topic->isLocked) { + http_response_code(403); + msg_error(__("This topic has been locked")); + exit; + } + if (!$canEdit) { http_response_code(403); msg_error(__("You don't have permission to edit this post")); @@ -1360,6 +1389,12 @@ if ($_action === "auth") { if (!$db->fetch($topicAuthor)) $topicAuthor = null; + if ($topic->isLocked) { + http_response_code(403); + msg_error(__("This topic has been locked")); + exit; + } + $canEdit = ($currentUser->id === $topicAuthor?->id && $topicAuthor?->hasPermission(UserPermissions::EDIT_OWN_TOPIC)) || ($currentUser->hasPermission(UserPermissions::EDIT_OTHER_TOPIC)); @@ -1378,6 +1413,63 @@ if ($_action === "auth") { } header("Location: ./?_action=viewtopic&topic=" . urlencode($topicId)); +} elseif ($_action === "locktopic") { + RequestUtils::ensureRequestMethod("POST"); + $topicId = $_POST["topic"] ?? null; + if ($topicId === null) { + http_response_code(400); + msg_error(__("Missing topic id")); + exit; + } + RequestUtils::setFormErrorDestination($dest = "Location: ./?_action=viewtopic&topic=" . urlencode($topicId)); + + if (!$currentUser) { + http_response_code(403); + msg_error(__("You need to be logged in to lock topics!")); + exit; + } + + $formId = "locktopic"; + $locked = RequestUtils::getRequiredField("locked", $formId); + if ($locked === "true") { + $locked = true; + } elseif ($locked === "false") { + $locked = false; + } else RequestUtils::triggerFormError("Invalid value", $formId); + + $topic = new Topic(); + $topic->id = $topicId; + + if (!$db->fetch($topic)) { + http_response_code(404); + msg_error(__("No topic exists with this id")); + exit; + } + + $topicAuthor = new User(); + $topicAuthor->id = $topic->createdBy; + + if (!$db->fetch($topicAuthor)) + $topicAuthor = null; + + $canEdit = ($currentUser->id === $topicAuthor?->id && $topicAuthor?->hasPermission(UserPermissions::EDIT_OWN_TOPIC)) + || ($currentUser->hasPermission(UserPermissions::EDIT_OTHER_TOPIC)); + + if (!$canEdit) { + http_response_code(403); + msg_error(__("You don't have permission to lock or unlock this topic")); + exit; + } + + $topic->isLocked = $locked; + + if (!$db->update($topic)) { + http_response_code(500); + msg_error(__("Failed to lock or unlock topic")); + exit; + } + + header($dest); } elseif ($_action === "search") { $query = $_GET["query"] ?? null; if ($query !== null) { -- cgit v1.2.3