From ae3db9cec1af8bb6abe4f98fbad1aacf11672edb Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Sat, 6 Mar 2021 19:06:18 -0700
Subject: [PATCH] More cleanup in overboard.php

---
 Rocksolid_Light/rocksolid/overboard.php | 29 +++++++------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/Rocksolid_Light/rocksolid/overboard.php b/Rocksolid_Light/rocksolid/overboard.php
index 0d4a7b9..7470628 100755
--- a/Rocksolid_Light/rocksolid/overboard.php
+++ b/Rocksolid_Light/rocksolid/overboard.php
@@ -60,8 +60,6 @@ $maxdisplay = 1000;
 
 # How many characters of the body to display per article
 $snippetlength = 240;
-# How short of a snippet is ok
-$snippetshort = 20;
 
 $spoolpath_regexp = '/'.preg_replace('/\//', '\\/', $spoolpath).'/';
 $thissite = '.';
@@ -292,26 +290,15 @@ foreach($files as $article) {
 			} 
 		}
 	}
-	$keywords = preg_split("/\n[^<]{0,5}>/", $mysnippet);
-	$newsnippet = preg_replace('/^.+\n/', '', end($keywords));
-	$quoteend = strlen($mysnippet) - strlen($newsnippet);
+	$mysnippet = preg_replace('/\n.{0,5}>(.*)/', '', $mysnippet);
 
-        if($quoteend) {
-		if($quoteend > (strlen($mysnippet) - $snippetshort)) {
-			$quoteend = (strlen($mysnippet) - $snippetlength);
-			if ($quoteend < 0)
-				$quoteend = 0;
-			$mysnippet = substr($mysnippet, $quoteend);
-			$mysnippet = substr($mysnippet, strpos($mysnippet, ' '));
-		} else {
-			$mysnippet = substr($mysnippet, $quoteend);
-		}
-    }
-    $mysnippet = substr($mysnippet, 0, $snippetlength);
-    $snippet = $mysnippet."<br /><br />\r\n";
-    $displayresult = explode('<', $snippet);
-    $echobody=$displayresult[0];
-    echo "<p class=np_ob_body>".$echobody."</p>\r\n";
+	$snipstart = strpos($mysnippet, ":\n");
+	if(substr_count(trim(substr($mysnippet, 0, $snipstart)), "\n") < 2) {
+		$mysnippet = substr($mysnippet, $snipstart + 1, $snippetlength);
+	} else {
+		$mysnippet = substr($mysnippet, 0, $snippetlength);
+	}
+    echo "<p class=np_ob_body>".$mysnippet."</p>\r\n";
     echo '</td></tr>';
     if($results++ > ($maxdisplay - 2))
 	break;