From 6ff39dcca3437ca9898492742cdca96458349956 Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Sat, 24 Feb 2024 18:57:10 -0700
Subject: [PATCH] Fix post.php to know where to return after replying to a
 crossposted message.

---
 INSTALL.md                                  | 10 ++++++++++
 Rocksolid_Light/rocksolid/lang/english.lang |  2 +-
 Rocksolid_Light/rocksolid/post.php          | 12 ++++++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index d297f1f..b3fa34c 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,5 +1,15 @@
 Installing Rocksolid Light (rslight) - a web based Usenet news client
 
+IMPORTANT 0.9.6 UPGRADE INFORMATION:
+There has been a new config option added to rslight.inc.php:
+    'server_path' => '@example.com',
+You need to add this to the file. It's best to add it just above email_tail.
+This is the domain that is added to the Message-ID.
+
+If you have custom SECTION.inc.php files, you will need to manually add it to
+those files as well:
+    'server_path' => $CONFIG['server_path'],
+
 IMPORTANT 0.9.0 UPGRADE INFORMATION:
 The articles-overview.db3 database has changed in this version. It is required to update it before running the site. SEE INFORMATION BELOW.
 
diff --git a/Rocksolid_Light/rocksolid/lang/english.lang b/Rocksolid_Light/rocksolid/lang/english.lang
index fa144e8..5268c37 100644
--- a/Rocksolid_Light/rocksolid/lang/english.lang
+++ b/Rocksolid_Light/rocksolid/lang/english.lang
@@ -48,7 +48,7 @@ $text_post["missing_subject"]="You must include a subject.";
 $text_post["button_post"]="Post Article";
 $text_post["remember"]="Remember name";
 $text_post["message"]="Message";
-$text_post["group_head"]="Compose a new post in ";
+$text_post["group_head"]="Compose a post in ";
 $text_post["group_tail"]="";
 $text_post["followup_not_allowed"]="You aren't allowed to post to the groups:";
 $text_post["message_posted"]="Message posted";
diff --git a/Rocksolid_Light/rocksolid/post.php b/Rocksolid_Light/rocksolid/post.php
index 48f2b78..192be76 100644
--- a/Rocksolid_Light/rocksolid/post.php
+++ b/Rocksolid_Light/rocksolid/post.php
@@ -98,10 +98,15 @@ if ($testgroup) {
 } else {
     $newsgroups = $thisgroup;
 }
-$returngroup = $thisgroup;
+if($_REQUEST['returngroup']) {
+    $returngroup = $_REQUEST['returngroup'];
+} else {
+    $returngroup = $thisgroup;
+}
+
 echo '<h1 class="np_thread_headline">';
 echo '<a href="' . $file_index . '" target=' . $frame['menu'] . '>' . basename(getcwd()) . '</a> / ';
-echo '<a href="' . $file_thread . '?group=' . rawurlencode($thisgroup) . '" target=' . $frame["content"] . '>' . htmlspecialchars(group_display_name($thisgroup)) . '</a>';
+echo '<a href="' . $file_thread . '?group=' . rawurlencode($thisgroup) . '" target=' . $frame["content"] . '>' . htmlspecialchars(group_display_name($returngroup)) . '</a>';
 if (isset($type) && $type == 'post') {
     echo ' / ' . $subject . '</h1>';
 } else {
@@ -490,7 +495,6 @@ function quoten() {
         }
         ?>
 
-
 </table>
 </div>
 <input type="hidden" name="type" value="post">
@@ -501,7 +505,7 @@ function quoten() {
 <input type="hidden" name="group"
 	value="<?php echo htmlspecialchars($newsgroups); ?>">
 <input type="hidden" name="returngroup"
-	value="<?php echo htmlspecialchars($head->followup); ?>">
+	value="<?php echo htmlspecialchars($thisgroup); ?>">
 <input type="hidden" name="fielddecrypt"
 	value="<?php echo htmlspecialchars($fieldencrypt);?>">
 </form>