From 2c78d8cb65ab7c57489f0ccc2bb6a5b6c7fdccfd Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Thu, 31 Oct 2024 10:06:16 -0700
Subject: [PATCH] Add some classes and cleanup for search.php.

---
 Rocksolid_Light/common/themes/style.css |  9 ++++++
 Rocksolid_Light/rocksolid/search.php    | 40 +++++++++++--------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/Rocksolid_Light/common/themes/style.css b/Rocksolid_Light/common/themes/style.css
index cfc4d1e..34a1294 100644
--- a/Rocksolid_Light/common/themes/style.css
+++ b/Rocksolid_Light/common/themes/style.css
@@ -1125,6 +1125,15 @@ table.np_results_table {
     font-size: 0.8em;
 }
 
+.search_hide_posts {
+	margin-top: 0;
+    margin-bottom: 0;
+    text-decoration: none;
+    color: var(--color-text);
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 0.7em;
+}
+
 /* search sort toggle */
 .np_search_sort_toggle {
     margin-top: 0;
diff --git a/Rocksolid_Light/rocksolid/search.php b/Rocksolid_Light/rocksolid/search.php
index eefa532..3dad661 100644
--- a/Rocksolid_Light/rocksolid/search.php
+++ b/Rocksolid_Light/rocksolid/search.php
@@ -34,20 +34,18 @@ if ((! isset($_POST['key']) || ! password_verify($CONFIG['thissitekey'], $_POST[
     // Block poster
     if (isset($_COOKIE['mail_name'])) {
         if (isset($_REQUEST['data'])) {
-            echo '<br><table width=100% border="0" align="center" cellpadding="0" cellspacing="1">';
-            echo '<tr>';
-            echo '<td colspan="3">Hide posts by <strong>' . $_GET['terms'] . '</strong></td>';
-            echo '</tr>';
-            echo '<tr>';
+            echo '<br>';
             echo '<form name="blockform" method="post" action="search.php">';
-            echo '<td>';
-            echo '<td><input name="command" type="hidden" id="command" value="Search" readonly="readonly"></td>';
+            echo '<table width=100% border="0" class="search_hide_posts">';
+            echo '<tr>';
+            echo '<td>Hide posts by <strong>' . $_GET['terms'] . '</strong></td>';
+            echo '</tr>';
+            echo '<input name="command" type="hidden" id="command" value="Search">';
             echo '<input type="hidden" name="key" value="' . password_hash($CONFIG['thissitekey'], PASSWORD_DEFAULT) . '">';
             if (isset($_GET['data'])) {
                 echo '<input type="hidden" name="data" value="' . $_GET['data'] . '">';
             }
             echo '<input type="hidden" name="username" value="' . $_COOKIE['mail_name'] . '">';
-            echo '</tr>';
             // Password confirmation
             echo '<tr>';
             echo '<td style="word-wrap:break-word";>Enter your password: ';
@@ -161,16 +159,16 @@ if (isset($search_group)) {
     echo '<h1 class="np_thread_headline">';
     echo '<a href="' . $file_index . '" target=' . $frame['menu'] . '>' . basename(getcwd()) . '</a> / ';
     echo 'search results for: ' . $_POST['terms'] . '</h1>';
-    echo '<table cellpadding="0" cellspacing="0" width="100%" class="np_buttonbar"><tr>';
+    echo '<form action="' . $file_index . '">';
+    echo '<table class="np_buttonbar"><tr>';
     // Newsgroups button (hidden)
     echo '<td>';
-    echo '<form action="' . $file_index . '">';
     echo '<button class="np_button_hidden" type="submit">' . $text_thread["button_grouplist"] . '</button>';
-    echo '</form>';
     echo '</td>';
     echo '</tr></table>';
+    echo '</form>';
 }
-echo '<table cellpadding="0" cellspacing="0" class="np_buttonbar"><tr>';
+echo '<table class="np_buttonbar"><tr>';
 echo '<td class="np_search_sort_toggle">';
 
 echo '<div style="float:right;">';
@@ -462,17 +460,14 @@ function display_search_tools($home = true)
         echo '<a href="' . $file_thread . '?group=' . urlencode($search_group) . '" target=' . $frame['menu'] . '>' . $search_group . '</a> / ';
     }
     echo 'search</h1>';
-    echo '<table cellpadding="0" cellspacing="0" class="np_buttonbar"><tr>';
+    echo '<form name="form1" method="post" action="search.php">';
+    echo '<table class="np_buttonbar"><tr>';
     if (isset($search_group)) {
         $searching = $search_group;
     } else {
         $searching = $config_name;
     }
-    echo '<tr>';
-    echo '<form name="form1" method="post" action="search.php">';
-    echo '<td>';
-    echo '<tr>';
-    echo '<td colspan="3">Searching <strong>' . $searching . '</strong></td>';
+    echo '<td>Searching <strong>' . $searching . '</strong></td>';
     echo '</tr>';
     echo '<tr>';
     if (! isset($_REQUEST['data'])) {
@@ -527,9 +522,7 @@ function display_search_tools($home = true)
         echo '<input type="radio" name="searchpoint" value="msgid">Message-ID';
     }
 
-    echo '</td></tr>';
-    echo '<tr>';
-    echo '<td><input name="command" type="hidden" id="command" value="Search" readonly="readonly"></td>';
+    echo '<input name="command" type="hidden" id="command" value="Search" >';
     if (isset($search_group)) {
         echo '<input type="hidden" name="group" value="' . urlencode($search_group) . '">';
     }
@@ -537,9 +530,10 @@ function display_search_tools($home = true)
     if (isset($_REQUEST['data'])) {
         echo '<input type="hidden" name="data" value="' . $_REQUEST['data'] . '">';
     }
-    echo '</tr><tr>';
+    echo '</td></tr>';
+    echo '<tr>';
     echo '<td><input type="submit" name="Submit" value="Search"></td>';
-    echo '</tr></table></td></form></tr></table>';
+    echo '</tr></table></form>';
 }
 
 function highlightStr($haystack, $needle)