From 1d4c0ceda97f2cd267ce3ac2ef97a7e49a77f74f Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Sat, 18 Dec 2021 22:30:47 +0000
Subject: [PATCH] Correct searchpoint value for message-id in search and search
 msig across entire site

---
 Rocksolid_Light/rocksolid/search.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Rocksolid_Light/rocksolid/search.php b/Rocksolid_Light/rocksolid/search.php
index 750a1bd..e8b06ba 100644
--- a/Rocksolid_Light/rocksolid/search.php
+++ b/Rocksolid_Light/rocksolid/search.php
@@ -306,11 +306,14 @@ function get_header_search($group, $terms) {
   GLOBAL $CONFIG, $config_name, $spooldir, $snippet_size;
   $terms = preg_replace('/\%/', '\%', $terms);
   $searchterms = "%".$terms."%";
-    if(isset($_POST['group']) && $_POST['searchpoint'] != 'Message-ID') {
+    if(isset($_POST['group']) && $_POST['searchpoint'] != 'msgid') {
       $grouplist[0] = $_POST['group'];
+    } elseif($_POST['searchpoint'] != 'msgid') {
+        $local_groupfile=$spooldir."/".$config_name."/local_groups.txt";
+        $grouplist = file($local_groupfile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
     } else {
-      $local_groupfile=$spooldir."/".$config_name."/local_groups.txt";
-      $grouplist = file($local_groupfile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+        $local_groupfile=$spooldir."/spoolnews/groups.txt";
+        $grouplist = file($local_groupfile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
     }
     # Prepare search database
     $database = $spooldir.'/articles-overview.db3';