From 673ef07f9aef1593d2b57e80918542603bca7eaf Mon Sep 17 00:00:00 2001
From: dairiki <dairiki@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Wed, 7 Nov 2001 21:42:34 +0000
Subject: [PATCH] Fix SF bug #445108: Empty search string results in phpwiki
 error.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/branches/release-1_2-branch@611 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/fullsearch.php | 49 +++++++++++++++++++++++++---------------------
 lib/search.php     | 17 ++++++++++------
 2 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/lib/fullsearch.php b/lib/fullsearch.php
index 342120ac9..1be5086c2 100644
--- a/lib/fullsearch.php
+++ b/lib/fullsearch.php
@@ -1,6 +1,6 @@
 <?php
    // Search the text of pages for a match.
-   rcs_id('$Id: fullsearch.php,v 1.4.2.1 2001-11-07 20:30:47 dairiki Exp $');
+   rcs_id('$Id: fullsearch.php,v 1.4.2.2 2001-11-07 21:42:34 dairiki Exp $');
 
    if(get_magic_quotes_gpc())
       $full = stripslashes($full);
@@ -10,32 +10,37 @@
 	   . sprintf(gettext ("Searching for \"%s\" ....."),
 		   htmlspecialchars($full))
 	   . "</B></P>\n<DL>\n";
-
-   // search matching pages
-   $query = InitFullSearch($dbi, $full);
-
-   // quote regexp chars (space are treated as "or" operator)
-   $full = preg_replace("/\s+/", "|", preg_quote($full));
-
    $found = 0;
    $count = 0;
-   while ($pagehash = FullSearchNextMatch($dbi, $query)) {
-      $html .= "<DT><B>" . LinkExistingWikiWord($pagehash["pagename"]) . "</B>\n";
-      $count++;
 
-      // print out all matching lines, highlighting the match
-      for ($j = 0; $j < (count($pagehash["content"])); $j++) {
+   if (strlen($full)) {           
+     // search matching pages
+     $query = InitFullSearch($dbi, $full);
+      
+     // quote regexp chars (space are treated as "or" operator)
+     $full = preg_replace("/\s+/", "|", preg_quote($full));
+
+     while ($pagehash = FullSearchNextMatch($dbi, $query)) {
+       $html .= "<DT><B>" . LinkExistingWikiWord($pagehash["pagename"]) . "</B>\n";
+       $count++;
+
+       // print out all matching lines, highlighting the match
+       for ($j = 0; $j < (count($pagehash["content"])); $j++) {
          if ($hits = preg_match_all(":$full:i", $pagehash["content"][$j], $dummy)) {
-            $matched = preg_replace(":$full:i",
-				"${FieldSeparator}OT\\0${FieldSeparator}CT",
-                                $pagehash["content"][$j]);
-	    $matched = htmlspecialchars($matched);
-	    $matched = str_replace("${FieldSeparator}OT", '<b>', $matched);
-	    $matched = str_replace("${FieldSeparator}CT", '</b>', $matched);
-            $html .= "<dd><small>$matched</small></dd>\n";
-            $found += $hits;
+           $matched = preg_replace(":$full:i",
+                                   "${FieldSeparator}OT\\0${FieldSeparator}CT",
+                                   $pagehash["content"][$j]);
+           $matched = htmlspecialchars($matched);
+           $matched = str_replace("${FieldSeparator}OT", '<b>', $matched);
+           $matched = str_replace("${FieldSeparator}CT", '</b>', $matched);
+           $html .= "<dd><small>$matched</small></dd>\n";
+           $found += $hits;
          }
-      }
+       }
+     }
+   }
+   else {
+     $html .= "<dd>" . gettext("(You entered an empty search string)") . "</dd>\n";
    }
 
    $html .= "</dl>\n<hr noshade>"
diff --git a/lib/search.php b/lib/search.php
index ad16914bd..13fa3e003 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -1,6 +1,6 @@
 <?php
    // Title search: returns pages having a name matching the search term
-   rcs_id('$Id: search.php,v 1.3.2.1 2001-11-07 20:30:47 dairiki Exp $');
+   rcs_id('$Id: search.php,v 1.3.2.2 2001-11-07 21:42:34 dairiki Exp $');
 
    if(get_magic_quotes_gpc())
       $search = stripslashes($search);
@@ -14,13 +14,18 @@
    //$search = preg_quote($search);
 
    // search matching pages
-   $query = InitTitleSearch($dbi, $search);
    $found = 0;
-   while ($page = TitleSearchNextMatch($dbi, $query)) {
-      $found++;
-      $html .= LinkExistingWikiWord($page) . "<br>\n";
+   if (strlen($search)) {           
+      $query = InitTitleSearch($dbi, $search);
+      while ($page = TitleSearchNextMatch($dbi, $query)) {
+         $found++;
+         $html .= LinkExistingWikiWord($page) . "<br>\n";
+      }
    }
-
+   else {
+      $html .= gettext("(You entered an empty search string)") . "<br>\n";
+   }   
+     
    $html .= "<hr noshade>\n"
 	    . sprintf(gettext ("%d pages match your query."), $found)
 	    . "\n";
-- 
2.45.0