diff --git a/Rocksolid_Light/rocksolid/search.php b/Rocksolid_Light/rocksolid/search.php index 90774b7..1611391 100644 --- a/Rocksolid_Light/rocksolid/search.php +++ b/Rocksolid_Light/rocksolid/search.php @@ -23,23 +23,26 @@ echo ''; } else { // echo htmlspecialchars($CONFIG['title_full']); } -?> + if(isset($_GET['group'])) { + $searching = $_GET['group']; + } else { + $searching = $config_name; + } + echo ''; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
Search recent messages
(Body searches '.$searching.' - Subject, Poster, Message-ID search entire site)
Search Terms: '; + echo '
'; - - - - -
- - - - - - -'; -echo ''; + echo ''; + echo ''; + if(isset($_GET['group'])) { + echo ''; + } + echo ''; + ?> - - -';?> @@ -257,8 +264,12 @@ function get_body_search($group, $terms) { $terms = preg_replace('/"OR"/', 'OR', $terms); $terms = preg_replace('/"NOT"/', 'NOT', $terms); $terms = '"'.$terms.'"'; - $local_groupfile=$spooldir."/".$config_name."/local_groups.txt"; - $grouplist = file($local_groupfile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); + if(isset($_POST['group'])) { + $grouplist[0] = $_POST['group']; + } else { + $local_groupfile=$spooldir."/".$config_name."/local_groups.txt"; + $grouplist = file($local_groupfile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); + } foreach($grouplist as $thisgroup) { $name = explode(':', $thisgroup); $group=$name[0]; diff --git a/Rocksolid_Light/rocksolid/thread.php b/Rocksolid_Light/rocksolid/thread.php index d025730..57ddaf1 100644 --- a/Rocksolid_Light/rocksolid/thread.php +++ b/Rocksolid_Light/rocksolid/thread.php @@ -72,6 +72,13 @@ if(isset($frames_on) && $frames_on === true) { echo ''; echo ''; } +// Search button + echo ''; // Newsgroups button (hidden) if(isset($frames_on) && $frames_on === true) { echo '
Search recent messages
(searches last articles per group)
Search Terms:  -
'; if ($_GET['searchpoint'] == 'Poster') { if($CONFIG['article_database'] == '1') { echo 'Body '; @@ -56,10 +59,14 @@ if ($_GET['searchpoint'] == 'Poster') { echo 'Message-ID'; } echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '		';