Move search form to web/template/pkg_search_form.php

Nothing fancy here, just cut & paste

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
Signed-off-by: Simo Leone <simo@archlinux.org>

2 files changed, 122 insertions, 118 deletions

diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index 1feceb6..5031aa4 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -668,124 +668,7 @@ function pkg_search_page($SID="") {
         $PP = 25;
     }
 
-    // The search form - XXX: split into own function?
-    //
-    // FIXME: highly fugly. whoever makes this use
-    //        less print statements gets a cookie
-    // FIXME: ugly html. whoever un-tables this gets
-    //        another cookie
-    print "<form action='/packages.php' method='get'>\n";
-    print "<input type='hidden' name='O' value='0'>\n";
-
-    print "<center>\n";
-    print "<table cellspacing='3' class='boxSoft'>\n";
-    print "<tr>\n";
-    print "  <td class='boxSoftTitle' align='right'>\n";
-    print "    <span class='f3'>".__("Search Criteria")."</span>\n";
-    print "  </td>\n";
-    print "</tr>\n";
-    print "<tr>\n";
-    print "  <td class='boxSoft'>\n";
-    print "<table style='width: 100%' align='center'>\n";
-
-    print "<tr>\n";
-    print "<td align='right'>\n";
-    print "  <span class='f5'><span class='blue'>".__("Location");
-    print "</span></span><br />\n";
-    print "  <select name='L'>\n";
-    print "  <option value=0> ".__("Any")."\n";
-    while (list($id, $loc) = each($locs)) {
-        if (intval($_REQUEST["L"]) == $id) {
-            print "  <option value=".$id." selected> ".$loc."\n";
-        } else {
-            print "  <option value=".$id."> ".$loc."\n";
-        }
-    }
-    print "  </select>\n";
-    print "</td>\n";
-
-    print "<td align='right'>\n";
-    print "  <span class='f5'><span class='blue'>".__("Category");
-    print "</span></span><br />\n";
-    print "  <select name='C'>\n";
-    print "  <option value=0> ".__("Any")."\n";
-    while (list($id, $cat) = each($cats)) {
-        if (intval($_REQUEST["C"]) == $id) {
-            print "  <option value=".$id." selected> ".$cat."\n";
-        } else {
-            print "  <option value=".$id."> ".$cat."\n";
-        }
-    }
-    print "  </select>\n";
-    print "</td>\n";
-
-    print "<td align='right'>\n";
-    print "  <span class='f5'><span class='blue'>".__("Keywords");
-    print "</span></span><br />\n";
-    print "  <input type='text' name='K' size='20'";
-
-    $K = trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES));
-    print " value=\"".stripslashes($K)."\" maxlength='35'>\n";
-    print "</td>\n";
-
-    print "<td align='right'>\n";
-    print "  <span class='f5'><span class='blue'>".__("Search by");
-    print "</span></span><br />\n";
-
-    print "  <select name='SeB'>\n";
-    # by name/description
-    print "  <option value=nd";
-    $_REQUEST["SeB"] == "nd" ? print " selected> " : print "> ";
-    print __("Name")."</option>\n";
-    # by maintainer
-    print "  <option value=m";
-    $_REQUEST["SeB"] == "m" ? print " selected> " : print "> ";
-    print __("Maintainer")."</option>\n";
-    print "  <option value=s";
-    $_REQUEST["SeB"] == "s" ? print " selected> " : print "> ";
-    print __("Submitter")."</option>\n";
-
-    print "  </select>\n";
-    print "</td>\n";
-
-    print "<td align='right'>\n";
-    print "  <span class='f5'><span class='blue'>".__("Per page");
-    print "</span></span><br />\n";
-    print "  <select name='PP'>\n";
-    print "  <option value=25";
-    $PP == 25 ? print " selected> 25\n" : print "> 25\n";
-    print "  <option value=50";
-    $PP == 50 ? print " selected> 50\n" : print "> 50\n";
-    print "  <option value=75";
-    $PP == 75 ? print " selected> 75\n" : print "> 75\n";
-    print "  <option value=100";
-    $PP == 100 ? print " selected> 100\n" : print "> 100\n";
-    print "  </select>\n";
-    print "</td>\n";
-
-    // Added to break put the buttons in a new line
-    print"</tr></table><center><table><tr>";
-
-    print "<td align='right' valign='bottom'>&nbsp;\n";
-    print "  <input type='submit' style='width:80px' class='button' name='do_Search'";
-    print " value='".__("Go")."'>\n";
-    print "</td>\n";
-
-    print "<td align='right' valign='bottom'>&nbsp;\n";
-    print "  <input type='submit' style='width:80px'  class='button' name='do_Orphans'";
-    print " value='".__("Orphans")."'>\n";
-    print "</td>\n";
-
-    print "</tr>\n";
-    print "</table>\n";
-
-    print "  </td>\n";
-    print "</tr>\n";
-    print "</table>\n";
-    print "</center>\n";
-    print "</form>\n";
-    print "<br />\n";
-
+    include('../template/pkg_search_form.php');
 
     // FIXME: pull out DB-related code. all of it.
     //        this one's worth a choco-chip cookie,
diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
new file mode 100644
index 0000000..3c4d2a9
--- /dev/null
+++ b/web/template/pkg_search_form.php
@@ -0,0 +1,121 @@
+<?php
+
+    // The search form - XXX: split into own function?
+    //
+    // FIXME: highly fugly. whoever makes this use
+    //        less print statements gets a cookie
+    // FIXME: ugly html. whoever un-tables this gets
+    //        another cookie
+    print "<form action='/packages.php' method='get'>\n";
+    print "<input type='hidden' name='O' value='0'>\n";
+
+    print "<center>\n";
+    print "<table cellspacing='3' class='boxSoft'>\n";
+    print "<tr>\n";
+    print "  <td class='boxSoftTitle' align='right'>\n";
+    print "    <span class='f3'>".__("Search Criteria")."</span>\n";
+    print "  </td>\n";
+    print "</tr>\n";
+    print "<tr>\n";
+    print "  <td class='boxSoft'>\n";
+    print "<table style='width: 100%' align='center'>\n";
+
+    print "<tr>\n";
+    print "<td align='right'>\n";
+    print "  <span class='f5'><span class='blue'>".__("Location");
+    print "</span></span><br />\n";
+    print "  <select name='L'>\n";
+    print "  <option value=0> ".__("Any")."\n";
+    while (list($id, $loc) = each($locs)) {
+        if (intval($_REQUEST["L"]) == $id) {
+            print "  <option value=".$id." selected> ".$loc."\n";
+        } else {
+            print "  <option value=".$id."> ".$loc."\n";
+        }
+    }
+    print "  </select>\n";
+    print "</td>\n";
+
+    print "<td align='right'>\n";
+    print "  <span class='f5'><span class='blue'>".__("Category");
+    print "</span></span><br />\n";
+    print "  <select name='C'>\n";
+    print "  <option value=0> ".__("Any")."\n";
+    while (list($id, $cat) = each($cats)) {
+        if (intval($_REQUEST["C"]) == $id) {
+            print "  <option value=".$id." selected> ".$cat."\n";
+        } else {
+            print "  <option value=".$id."> ".$cat."\n";
+        }
+    }
+    print "  </select>\n";
+    print "</td>\n";
+
+    print "<td align='right'>\n";
+    print "  <span class='f5'><span class='blue'>".__("Keywords");
+    print "</span></span><br />\n";
+    print "  <input type='text' name='K' size='20'";
+
+    $K = trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES));
+    print " value=\"".stripslashes($K)."\" maxlength='35'>\n";
+    print "</td>\n";
+
+    print "<td align='right'>\n";
+    print "  <span class='f5'><span class='blue'>".__("Search by");
+    print "</span></span><br />\n";
+
+    print "  <select name='SeB'>\n";
+    # by name/description
+    print "  <option value=nd";
+    $_REQUEST["SeB"] == "nd" ? print " selected> " : print "> ";
+    print __("Name")."</option>\n";
+    # by maintainer
+    print "  <option value=m";
+    $_REQUEST["SeB"] == "m" ? print " selected> " : print "> ";
+    print __("Maintainer")."</option>\n";
+    print "  <option value=s";
+    $_REQUEST["SeB"] == "s" ? print " selected> " : print "> ";
+    print __("Submitter")."</option>\n";
+
+    print "  </select>\n";
+    print "</td>\n";
+
+    print "<td align='right'>\n";
+    print "  <span class='f5'><span class='blue'>".__("Per page");
+    print "</span></span><br />\n";
+    print "  <select name='PP'>\n";
+    print "  <option value=25";
+    $PP == 25 ? print " selected> 25\n" : print "> 25\n";
+    print "  <option value=50";
+    $PP == 50 ? print " selected> 50\n" : print "> 50\n";
+    print "  <option value=75";
+    $PP == 75 ? print " selected> 75\n" : print "> 75\n";
+    print "  <option value=100";
+    $PP == 100 ? print " selected> 100\n" : print "> 100\n";
+    print "  </select>\n";
+    print "</td>\n";
+
+    // Added to break put the buttons in a new line
+    print"</tr></table><center><table><tr>";
+
+    print "<td align='right' valign='bottom'>&nbsp;\n";
+    print "  <input type='submit' style='width:80px' class='button' name='do_Search'";
+    print " value='".__("Go")."'>\n";
+    print "</td>\n";
+
+    print "<td align='right' valign='bottom'>&nbsp;\n";
+    print "  <input type='submit' style='width:80px'  class='button' name='do_Orphans'";
+    print " value='".__("Orphans")."'>\n";
+    print "</td>\n";
+
+    print "</tr>\n";
+    print "</table>\n";
+
+    print "  </td>\n";
+    print "</tr>\n";
+    print "</table>\n";
+    print "</center>\n";
+    print "</form>\n";
+    print "<br />\n";
+
+?>