* Fixed at least 5 bugs!!! :)

1 files changed, 29 insertions, 29 deletions

diff --git a/search.php b/search.php
index 8228b4162..48e761c0e 100644
--- a/search.php
+++ b/search.php
@@ -7,43 +7,44 @@
 
  $terms = stripslashes($terms);
 
- $output .= "<TABLE WIDTH=\"100%\" BORDER=\"0\">";
- $output .= " <TR VALIGN=\"center\">";
- $output .= "  <TD COLSPAN=3>";
- $output .= "   <FORM ACTION=\"". basename($GLOBALS[PHP_SELF]) ."\" METHOD=\"POST\">";
- $output .= "    <INPUT SIZE=\"50\" VALUE=\"$terms\" NAME=\"terms\" TYPE=\"text\"><BR>";
+ $output .= "<TABLE WIDTH=\"100%\" BORDER=\"0\">\n";
+ $output .= " <TR VALIGN=\"center\">\n";
+ $output .= "  <TD COLSPAN=3>\n";
+ $output .= "   <FORM ACTION=\"". basename($GLOBALS[PHP_SELF]) ."\" METHOD=\"POST\">\n";
+ $output .= "    <INPUT SIZE=\"50\" VALUE=\"$terms\" NAME=\"terms\" TYPE=\"text\"><BR>\n";
 
  ### category:
- $output .= "    <SELECT NAME=\"category\">";
- if ($category != "") $output .= " <OPTION VALUE=\"$category\">$category</OPTION>";
- $output .= "<OPTION VALUE=\"\">All categories</OPTION>";
+ $output .= "    <SELECT NAME=\"category\">\n";
+ if ($category != "") $output .= " <OPTION VALUE=\"$category\">$category</OPTION>\n";
+ $output .= "<OPTION VALUE=\"\">All categories</OPTION>\n";
  for ($i = 0; $i < sizeof($categories); $i++) {
-   $output .= " <OPTION VALUE=\"$categories[$i]\">$categories[$i]";
+   $output .= " <OPTION VALUE=\"$categories[$i]\">$categories[$i]</OPTION>\n";
  }
- $output .= "</SELECT>";
+ $output .= "</SELECT>\n";
 
  ### order:
- $output .= "<SELECT NAME=\"order\">";
+ $output .= "<SELECT NAME=\"order\">\n";
  if ($order == "Oldest first") {
-   $output .= "<OPTION VALUE=\"Oldest first\">Oldest first";
-   $output .= "<OPTION VALUE=\"Newest first\">Newest first";
+   $output .= " <OPTION VALUE=\"Oldest first\">Oldest first</OPTION>\n";
+   $output .= " <OPTION VALUE=\"Newest first\">Newest first</OPTION>\n";
  }
  else {
-   $output .= "<OPTION VALUE=\"Newest first\">Newest first";
-   $output .= "<OPTION VALUE=\"Oldest first\">Oldest first";
+   $output .= " <OPTION VALUE=\"Newest first\">Newest first</OPTION>\n";
+   $output .= " <OPTION VALUE=\"Oldest first\">Oldest first</OPTION>\n";
  }
- $output .= "</SELECT>";
+ $output .= "</SELECT>\n";
 
- $output .= "   <INPUT TYPE=\"submit\" VALUE=\"Search\">";
- $output .= "  </TD>";
- $output .= " </TR>";
- $output .= " <TR>";
- $output .= "  <TD>";
+ $output .= "   <INPUT TYPE=\"submit\" VALUE=\"Search\">\n";
+ $output .= "  </TD>\n";
+ $output .= " </TR>\n";
+ $output .= " <TR>\n";
+ $output .= "  <TD>\n";
    
  ### Compose query:
  $query = "SELECT DISTINCT s.id, s.subject, u.userid, s.timestamp FROM stories s LEFT JOIN users u ON s.author = u.id WHERE s.status = 2 ";
  if ($terms != "") $query .= "AND (s.subject LIKE '%$terms%' OR s.abstract LIKE '%$terms%' OR s.comments LIKE '%$terms%') ";
  if ($category != "") $query .= "AND s.category = '$category' ";
+ if ($author != "") $query .= "AND u.userid = '$author' ";
  if ($order == "Oldest first") $query .= " ORDER BY s.timestamp ASC";
  else $query .= " ORDER BY s.timestamp DESC";
    
@@ -51,7 +52,7 @@
  $result = db_query("$query");
  
  ### Display search results:
- $output .= "<HR>";
+ $output .= "<HR>\n";
  while ($entry = db_fetch_object($result)) {
    $num++;
 
@@ -66,16 +67,15 @@
      $link = "<A HREF=\"article.php?id=$entry->id&mode=threaded&order=1&thold=0\">$entry->subject</A>";
    }
  
-   $output .= "<P>$num) <B>$link</B><BR><SMALL>by <B><A HREF=\"account.php?op=userinfo&uname=$entry->userid\">$entry->userid</A></B>, posted on ". date("l, F d, Y - H:i A", $entry->timestamp) .".</SMALL></P>\n";
+   $output .= "<P>$num) <B>$link</B><BR><SMALL>by <B><A HREF=\"account.php?op=info&uname=$entry->userid\">$entry->userid</A></B>, posted on ". date("l, F d, Y - H:i A", $entry->timestamp) .".</SMALL></P>\n";
  }
 
- if ($num == 0) $output .= "<P>Your search did <B>not</B> match any articles in our database: <UL><LI>Try using fewer words.</LI><LI>Try using more general keywords.</LI><LI>Try using different keywords.</LI></UL></P>";
- else $output .= "<P><B>$num</B> results matched your search query.</P>";
+ if ($num == 0) $output .= "<P>Your search did <B>not</B> match any articles in our database: <UL><LI>Try using fewer words.</LI><LI>Try using more general keywords.</LI><LI>Try using different keywords.</LI></UL></P>\n";
+ else $output .= "<P><B>$num</B> results matched your search query.</P>\n";
  
-
- $output .= "  </TD>";
- $output .= " </TR>";
- $output .= "</TABLE>";
+ $output .= "  </TD>\n";
+ $output .= " </TR>\n";
+ $output .= "</TABLE>\n";
 
  $theme->box("Search", $output);
  $theme->footer();