From 81c083596d1a63b2f1bf5edf25b59fd798214c6a Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Sun, 1 Aug 2021 11:23:35 +0000
Subject: [PATCH] Allow article-flat.php to find article by message-id in url

---
 Rocksolid_Light/rocksolid/article-flat.php | 21 +++++++++++++++++++--
 Rocksolid_Light/rocksolid/config.inc.php   |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Rocksolid_Light/rocksolid/article-flat.php b/Rocksolid_Light/rocksolid/article-flat.php
index 8855c9f..0304f0c 100644
--- a/Rocksolid_Light/rocksolid/article-flat.php
+++ b/Rocksolid_Light/rocksolid/article-flat.php
@@ -24,14 +24,31 @@
     die();
   }
 
+  if(strpos($id, '@') !== false) {
+    if($CONFIG['article_database'] == '1') {
+      $database = $spooldir.'/'.$group.'-articles.db3';
+      $articles_dbh = article_db_open($database);
+      $articles_query = $articles_dbh->prepare('SELECT * FROM articles WHERE msgid=:messageid');
+      $articles_query->execute(['messageid' => $id]);
+      while ($row = $articles_query->fetch()) {
+        $id = $row['number'];
+        break;
+      }
+      $dbh = null;
+      $newurl = 'article-flat.php?id='.$id.'&group='.$group.'#'.$id;
+//      $newurl.='#'.$id;
+
+      header("Location: $newurl");
+      die();
+    }
+  }
+
   if(isset($_REQUEST["first"]))
     $first=$_REQUEST["first"];
 
   $_SESSION['rsactive'] = true;
 
   $location = $_SERVER['REQUEST_URI'].$_SERVER['REQUEST_STRING'];
-//  preg_match('/id=(.*)&/', $location, $hash);
-//  $_SESSION['return_page'] = $location.'#'.$hash[1];
   $_SESSION['return_page'] = $location.'#'.$id;
 
   file_put_contents($accessfile, "\n".format_log_date()." ".$config_name." ".$group.":".$id, FILE_APPEND);  
diff --git a/Rocksolid_Light/rocksolid/config.inc.php b/Rocksolid_Light/rocksolid/config.inc.php
index 87694e4..4b37185 100644
--- a/Rocksolid_Light/rocksolid/config.inc.php
+++ b/Rocksolid_Light/rocksolid/config.inc.php
@@ -144,7 +144,7 @@ $article_show["Organization"]=true;
 $article_show["Date"]=true;
 $article_show["Message-ID"]=false;
 $article_show["User-Agent"]=false;
-$article_show["References"]=false;
+$article_show["References"]=true;
 $article_show["From_link"]=false;
 $article_show["trigger_headers"]=true;
 //$article_show["From_rewrite"]=array('@',' (at) ');