- XHTML-ified search-related code.

includes/search.inc

@@ -2,20 +2,20 @@
 
 function search_form($keys) {
   global $REQUEST_URI;
-  $output .= "<FORM ACTION=\"$REQUEST_URI\" METHOD=\"POST\">\n";
-  $output .= " <INPUT SIZE=\"50\" VALUE=\"". check_form($keys) ."\" NAME=\"keys\">";
-  $output .= " <INPUT TYPE=\"submit\" VALUE=\"". t("Search") ."\">\n";
-  $output .= "</FORM>\n";
+  $output .= "<form action=\"$REQUEST_URI\" method=\"POST\">\n";
+  $output .= " <input size=\"50\" value=\"". check_form($keys) ."\" name=\"keys\">";
+  $output .= " <input type=\"submit\" value=\"". t("Search") ."\">\n";
+  $output .= "</form>\n";
   return $output;
 }
 
 function search_data($keys, $type) {
   if ($keys && $type && $result = module_invoke($type, "search", check_query($keys))) {
     foreach ($result as $entry) {
-      $output .= "<P>\n";
-      $output .= " <B><U><A HREF=\"$entry[link]\">$entry[title]</A></U></B><BR>";
-      $output .= " <SMALL>$entry[link]". ($entry[user] ? " - ". format_username($entry[user]) : "") ."". ($entry[date] ? " - ". format_date($entry[date], "small") : "") ."</SMALL>";
-      $output .= "</P>\n";
+      $output .= "<p>\n";
+      $output .= " <b><u><a href=\"$entry[link]\" />$entry[title]</a></u></b><br />";
+      $output .= " <small>$entry[link]". ($entry[user] ? " - ". format_username($entry[user]) : "") ."". ($entry[date] ? " - ". format_date($entry[date], "small") : "") ."</small>";
+      $output .= "</p>\n";
     }
   }
   else {

search.php

@@ -12,16 +12,16 @@
   // build options list:
   foreach (module_list() as $name) {
     if (module_hook($name, "search")) {
-      $options .= "<OPTION VALUE=\"$name\"". ($name == $type ? " SELECTED" : "") .">$name</OPTION>\n";
+      $options .= "<option value=\"$name\"". ($name == $type ? " selected" : "") .">$name</option>\n";
     }
   }
 
   // build form:
-  $form .= "<FORM ACTION=\"search.php\" METHOD=\"POST\">\n";
-  $form .= " <INPUT SIZE=\"50\" VALUE=\"". check_form($keys) ."\" NAME=\"keys\" TYPE=\"text\">\n";
-  $form .= " <SELECT NAME=\"type\">$options</SELECT>\n";
-  $form .= " <INPUT TYPE=\"submit\" VALUE=\"". t("Search") ."\">\n";
-  $form .= "</FORM>\n";
+  $form .= "<form action=\"search.php\" method=\"POST\">\n";
+  $form .= " <input size=\"50\" value=\"". check_form($keys) ."\" name=\"keys\" TYPE=\"text\">\n";
+  $form .= " <select name=\"type\">$options</select>\n";
+  $form .= " <input type=\"submit\" value=\"". t("Search") ."\">\n";
+  $form .= "</form>\n";
 
   // visualize form:
   $theme->header();