From e98a5dfe9c5f1d931ae9a39a7c36a8f4a584933f Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Fri, 22 Dec 2023 15:47:17 +0700
Subject: [PATCH] Updated

---
 group.php     | 20 ++++++++++----------
 viewtopic.php | 12 ++++--------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/group.php b/group.php
index 0b647e7e3..82c824d15 100644
--- a/group.php
+++ b/group.php
@@ -162,7 +162,7 @@ if (!$group_id) {
         bb_die($lang['NO_GROUPS_EXIST']);
     }
     if ($row['user_id']) {
-        set_die_append_msg(false, false, $group_id);
+        set_die_append_msg(group_id: $group_id);
         bb_die($lang['ALREADY_MEMBER_GROUP']);
     }
 
@@ -185,12 +185,12 @@ if (!$group_id) {
         $emailer->send();
     }
 
-    set_die_append_msg(false, false, $group_id);
+    set_die_append_msg(group_id: $group_id);
     bb_die($lang['GROUP_JOINED']);
 } elseif (!empty($_POST['unsub']) || !empty($_POST['unsubpending'])) {
     \TorrentPier\Legacy\Group::delete_user_group($group_id, $userdata['user_id']);
 
-    set_die_append_msg(false, false, $group_id);
+    set_die_append_msg(group_id: $group_id);
     bb_die($lang['UNSUB_SUCCESS']);
 } else {
     // Handle Additions, removals, approvals and denials
@@ -198,26 +198,26 @@ if (!$group_id) {
 
     if (!empty($_POST['add']) || !empty($_POST['remove']) || !empty($_POST['approve']) || !empty($_POST['deny'])) {
         if (!$is_moderator) {
-            set_die_append_msg(false, false, $group_id);
+            set_die_append_msg(group_id: $group_id);
             bb_die($lang['NOT_GROUP_MODERATOR']);
         }
 
         if (!empty($_POST['add'])) {
             if (isset($_POST['username']) && !($row = get_userdata($_POST['username'], true))) {
-                set_die_append_msg(false, false, $group_id);
+                set_die_append_msg(group_id: $group_id);
                 bb_die($lang['COULD_NOT_ADD_USER']);
             }
 
             // Prevent adding moderator
             if ($row['user_id'] == $group_moderator) {
-                set_die_append_msg(false, false, $group_id);
+                set_die_append_msg(group_id: $group_id);
                 bb_die(sprintf($lang['USER_IS_MOD_GROUP'], profile_url($row)));
             }
 
             // Prevent infinity user adding into group
             if ($is_member = DB()->fetch_row("SELECT user_id FROM " . BB_USER_GROUP . " WHERE group_id = $group_id AND user_id = " . $row['user_id'] . " LIMIT 1")) {
                 if ($is_member['user_id']) {
-                    set_die_append_msg(false, false, $group_id);
+                    set_die_append_msg(group_id: $group_id);
                     bb_die(sprintf($lang['USER_IS_MEMBER_GROUP'], profile_url($row)));
                 }
             }
@@ -248,7 +248,7 @@ if (!$group_id) {
                     $sql_in[] = (int)$members_id;
                 }
                 if (!$sql_in = implode(',', $sql_in)) {
-                    set_die_append_msg(false, false, $group_id);
+                    set_die_append_msg(group_id: $group_id);
                     bb_die($lang['NONE_SELECTED']);
                 }
 
@@ -418,7 +418,7 @@ if (!$group_id) {
             // TODO Correct SQL to posts with attach and limit them, optimization
 
             if (!$group_info['release_group']) {
-                set_die_append_msg(false, false, $group_id);
+                set_die_append_msg(group_id: $group_id);
                 bb_die($lang['NOT_A_RELEASE_GROUP']);
             }
 
@@ -449,7 +449,7 @@ if (!$group_id) {
 			";
 
             if (!$releases = DB()->fetch_rowset($sql)) {
-                set_die_append_msg(false, false, $group_id);
+                set_die_append_msg(group_id: $group_id);
                 bb_die($lang['NO_SEARCH_MATCH']);
             }
 
diff --git a/viewtopic.php b/viewtopic.php
index e721014f9..85bc8cc51 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -12,6 +12,9 @@ define('BB_SCRIPT', 'topic');
 require __DIR__ . '/common.php';
 require INC_DIR . '/bbcode.php';
 
+// Start session
+$user->session_start();
+
 $datastore->enqueue([
     'ranks',
     'cat_forums'
@@ -29,11 +32,6 @@ $start = isset($_GET['start']) ? abs((int)$_GET['start']) : 0;
 $topic_id = isset($_GET[POST_TOPIC_URL]) ? (int)$_GET[POST_TOPIC_URL] : 0;
 $post_id = (!$topic_id && isset($_GET[POST_POST_URL])) ? (int)$_GET[POST_POST_URL] : 0;
 
-// Start session
-$user->session_start();
-
-set_die_append_msg();
-
 // Posts per page
 $posts_per_page = $bb_cfg['posts_per_page'];
 $select_ppp = '';
@@ -127,7 +125,7 @@ if ($topic_attachment) {
     $datastore->enqueue(['attach_extensions']);
 }
 
-set_die_append_msg($forum_id);
+set_die_append_msg($forum_id, $topic_id);
 
 // Find newest post
 if (($next_topic_id || @$_GET['view'] === 'newest') && !IS_GUEST && $topic_id) {
@@ -240,7 +238,6 @@ if ($bb_cfg['topic_notify_enabled']) {
                     DB()->query("DELETE FROM " . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']}");
                 }
 
-                set_die_append_msg($forum_id, $topic_id);
                 bb_die($lang['NO_LONGER_WATCHING']);
             } else {
                 $is_watching_topic = true;
@@ -260,7 +257,6 @@ if ($bb_cfg['topic_notify_enabled']) {
 					");
                 }
 
-                set_die_append_msg($forum_id, $topic_id);
                 bb_die($lang['YOU_ARE_WATCHING']);
             } else {
                 $is_watching_topic = 0;