Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

* Fixed at least 5 bugs!!! :)

3-00
Dries Buytaert 2000-07-02 11:21:00 +00:00
parent 2240b7ec6f
commit fb14df9fab
2 changed files with 31 additions and 31 deletions

4
functions.inc
View File

@ -106,8 +106,8 @@ function displayRelatedLinks($theme, $story) {
}
### Default related links:
$content .= " <LI>More about <A HREF=\"search.php?category=$story->category\">$story->category</A>.</LI>";
$content .= " <LI>Also by <A HREF=\"search.php?author=$story->aid\">$story->userid</A>.</LI>";
$content .= " <LI>More about <A HREF=\"search.php?category=". urlencode($story->category) ."\">$story->category</A>.</LI>";
$content .= " <LI>Also by <A HREF=\"search.php?author=". urlencode($story->userid) ."\">$story->userid</A>.</LI>";
$theme->box("Related links", $content);
}

58
search.php
View File

@ -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();