From cebdafb82cf69f30dced713c66bb67932e2e3ccc Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Thu, 8 Feb 2024 00:52:38 +0700
Subject: [PATCH] Minor improvements (#1383)

* Minor improvements

* Update CHANGELOG.md
---
 CHANGELOG.md                            | 2 +-
 library/language/source/main.php        | 1 +
 modcp.php                               | 2 ++
 privmsg.php                             | 3 +--
 styles/templates/admin/admin_forums.tpl | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 262b60124..e2e7a3782 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 
 - Release 2.4.2 🐯 ([belomaxorka](https://github.com/belomaxorka))
 - Created template file for AJAX quick actions [\#1381](https://github.com/torrentpier/torrentpier/pull/1381) ([belomaxorka](https://github.com/belomaxorka))
-- Minor improvements [\#1382](https://github.com/torrentpier/torrentpier/pull/1382) ([belomaxorka](https://github.com/belomaxorka))
+- Minor improvements [\#1382](https://github.com/torrentpier/torrentpier/pull/1382), [\#1383](https://github.com/torrentpier/torrentpier/pull/1383) ([belomaxorka](https://github.com/belomaxorka))
 - Some bugfixes [\#1380](https://github.com/torrentpier/torrentpier/pull/1380) ([belomaxorka](https://github.com/belomaxorka))
 
 ## [v2.4.1](https://github.com/torrentpier/torrentpier/tree/v2.4.1) (2024-02-04)
diff --git a/library/language/source/main.php b/library/language/source/main.php
index 9eb29daa1..8fb799c36 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -1809,6 +1809,7 @@ $lang['FORUM_ADMIN_MAIN'] = 'Forum Administration';
 $lang['FORUM_ADMIN_EXPLAIN'] = 'From this panel you can add, delete, edit, re-order and re-synchronise categories and forums';
 $lang['EDIT_FORUM'] = 'Edit forum';
 $lang['CREATE_FORUM'] = 'Create new forum';
+$lang['CREATE_SUB_FORUM'] = 'Create subforum';
 $lang['CREATE_CATEGORY'] = 'Create new category';
 $lang['REMOVE'] = 'Remove';
 $lang['UPDATE_ORDER'] = 'Update Order';
diff --git a/modcp.php b/modcp.php
index 6ee84edfc..fc7d5696f 100644
--- a/modcp.php
+++ b/modcp.php
@@ -132,6 +132,8 @@ if ($topic_id) {
 // Start session management
 $user->session_start(['req_login' => true]);
 
+set_die_append_msg($forum_id, $topic_id);
+
 // Check if user did or did not confirm. If they did not, forward them to the last page they were on
 if (isset($_POST['cancel']) || IS_GUEST) {
     $redirect = 'index.php';
diff --git a/privmsg.php b/privmsg.php
index 687364377..cd1eaa6d4 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -65,7 +65,7 @@ $template->assign_vars([
 //
 // Set mode for quick reply
 //
-if ($bb_cfg['show_quick_reply'] && $folder == 'inbox' && $mode == 'read' && $preview) {
+if (empty($mode) && $bb_cfg['show_quick_reply'] && $folder == 'inbox' && $preview) {
     $mode = 'reply';
 }
 
@@ -323,7 +323,6 @@ if ($mode == 'read') {
     }
 
     $s_hidden_fields = '<input type="hidden" name="mark[]" value="' . $privmsgs_id . '" />';
-    $s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />';
 
     $page_title = $lang['READ_PM'];
 
diff --git a/styles/templates/admin/admin_forums.tpl b/styles/templates/admin/admin_forums.tpl
index 2cdb99d83..951ffbdf5 100644
--- a/styles/templates/admin/admin_forums.tpl
+++ b/styles/templates/admin/admin_forums.tpl
@@ -204,8 +204,8 @@ function hl (id, on)
 	<!-- BEGIN f -->
 	<tr class="row1 hl-tr" onmouseover="hl('fname_{c.f.FORUM_ID}', 1);" onmouseout="hl('fname_{c.f.FORUM_ID}', 0);">
 		<td class="gen tCenter"><a class="gen" title="{L_MOVE_UP}" href="{c.f.U_FORUM_MOVE_UP}"><b>&nbsp;&#8593;&nbsp;</b></a><a class="gen" title="{L_MOVE_DOWN}" href="{c.f.U_FORUM_MOVE_DOWN}"><b>&nbsp;&#8595;&nbsp;</b></a></td>
-		<td class="small nowrap tCenter"><!-- IF c.f.ADD_SUB_HREF --><a class="small" href="{c.f.ADD_SUB_HREF}" title="Add subforum">+sub</a><!-- ENDIF --></td>
-		<td width="100%" {c.f.SF_PAD}><a title="{c.f.FORUM_DESC}" class="{c.f.FORUM_NAME_CLASS}" href="{c.f.U_VIEWFORUM}" target="_new"><!-- IF c.f.SHOW_ON_INDEX --><b><!-- ENDIF --><span id="fname_{c.f.FORUM_ID}">{c.f.FORUM_NAME}</span><!-- IF c.f.SHOW_ON_INDEX --></b><!-- ENDIF --></a></td>
+		<td class="small nowrap tCenter"><!-- IF c.f.ADD_SUB_HREF --><a class="small" href="{c.f.ADD_SUB_HREF}" title="{L_CREATE_SUB_FORUM}">+sub</a><!-- ENDIF --></td>
+		<td width="100%" {c.f.SF_PAD}><a title="{c.f.FORUM_DESC}" class="{c.f.FORUM_NAME_CLASS}" href="{c.f.U_VIEWFORUM}" target="_blank"><!-- IF c.f.SHOW_ON_INDEX --><b><!-- ENDIF --><span id="fname_{c.f.FORUM_ID}">{c.f.FORUM_NAME}</span><!-- IF c.f.SHOW_ON_INDEX --></b><!-- ENDIF --></a></td>
 		<td class="small tCenter" title="{L_TOPICS_SHORT}"><em class="med" style="color: grey">{L_TOPICS_SHORT}:</em> {c.f.NUM_TOPICS}</td>
 		<td class="small tCenter" title="{L_POSTS_SHORT}"><em class="med" style="color: grey">{L_POSTS_SHORT}:</em> {c.f.NUM_POSTS}</td>
 		<td class="med nowrap tCenter">