From 6249c40e9417aff0ab8eb6f84c1f6693771c7b81 Mon Sep 17 00:00:00 2001
From: eric <eric>
Date: Tue, 29 Jun 2004 00:56:31 +0000
Subject: fleshing out the package logic, renamed pkg include files for
 consistency

---
 web/lib/acctfuncs.inc |   1 +
 web/lib/pkgfuncs.inc  | 421 ++++++++++++++++++++++++++++++++++++++++++++++++++
 web/lib/pkgs.inc      | 417 -------------------------------------------------
 3 files changed, 422 insertions(+), 417 deletions(-)
 create mode 100644 web/lib/pkgfuncs.inc
 delete mode 100644 web/lib/pkgs.inc

(limited to 'web/lib')

diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc
index 9cd7fab..d27b96f 100644
--- a/web/lib/acctfuncs.inc
+++ b/web/lib/acctfuncs.inc
@@ -464,6 +464,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="",
 	}
 	$search_vars[] = "SB";
 	$q.= "LIMIT ". $OFFSET . ", " . $HITS_PER_PAGE;
+
 	$result = db_query($q, $dbh);
 	if (!$result) {
 		print __("No results matched your search criteria.");
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
new file mode 100644
index 0000000..c8427ab
--- /dev/null
+++ b/web/lib/pkgfuncs.inc
@@ -0,0 +1,421 @@
+<?
+include_once("pkgfuncs_po.inc");
+
+# grab the current list of PackageCategories
+#
+function pkgCategories() {
+	$cats = array();
+	$dbh = db_connect();
+	$q = "SELECT * FROM PackageCategories ";
+	$q.= "ORDER BY Category ASC";
+	$result = db_query($q, $dbh);
+	if ($result) {
+		while ($row = mysql_fetch_row($result)) {
+			$cats[$row[0]] = $row[1];
+		}
+	}
+	return $cats;
+}
+
+# grab the current list of PackageLocations
+#
+function pkgLocations() {
+	$locs = array();
+	$dbh = db_connect();
+	$q = "SELECT * FROM PackageLocations ";
+	$q.= "ORDER BY Location ASC";
+	$result = db_query($q, $dbh);
+	if ($result) {
+		while ($row = mysql_fetch_row($result)) {
+			$locs[$row[0]] = $row[1];
+		}
+	}
+	return $locs;
+}
+
+# display the search form in a boxSoft style
+#
+function pkg_search_page($SID="") {
+	global $_REQUEST;
+	# SID: session id cookie
+	# L: PackageLocations.ID
+	# C: PackageCategories.ID
+	# K: Keywords
+	# SB: Sort by
+	# M: search "my packages"
+	# O: Row offset
+	# PP: Per page
+	# D: Direction to advance (Less/More)
+	$locs = pkgLocations();
+	$cats = pkgCategories();
+	$devs = getDevelopers();
+	$tus = getTrustedUsers();
+	$dbh = db_connect();
+
+
+	# determine paging variables
+	#
+	isset($_REQUEST["PP"]) ? $PP = intval($_REQUEST["PP"]) : $PP = 25;
+	isset($_REQUEST["O"]) ? $O = intval($_REQUEST["O"]) : $O = 0;
+	if (isset($_REQUEST["do_More"])) {
+		$O += $PP;
+	} elseif (isset($_REQUEST["do_Less"])) {
+		$O -= $PP;
+	}
+	if ($O < 0) {
+		$O = 0;
+	}
+
+
+	# grab info for user if they're logged in
+	#
+	if ($SID) {
+		$myuid = uid_from_sid($SID);
+		$acct = account_from_sid($SID);
+	}
+
+	# The search form
+	#
+	$K = str_replace("\"", "", $_REQUEST["K"]); # TODO better testing for
+                                              # SQL trickery...
+	print "<form action='/pkgsearch.php' method='post'>\n";
+	print "<input type='hidden' name='O' value='".$O."'>\n";
+	print "<input type='hidden' name='L' value='".$_REQUEST["L"]."'>\n";
+	print "<input type='hidden' name='M' value='".$_REQUEST["M"]."'>\n";
+	print "<input type='hidden' name='C' value='".$_REQUEST["C"]."'>\n";
+	print "<input type='hidden' name='K' value='".$K."'>\n";
+	print "<input type='hidden' name='SB' value='".$_REQUEST["SB"]."'>\n";
+	print "<input type='hidden' name='PP' value='".$PP."'>\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 ($_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 ($_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='35'";
+	print " value=\"".stripslashes($K)."\" maxlength='35'>\n";
+	print "</td>\n";
+
+	print "<td align='right'>\n";
+	print "  <span class='f5'><span class='blue'>".__("Sort by");
+	print "</span></span><br />\n";
+	print "  <select name='SB'>\n";
+	print "  <option value=n";
+	$_REQUEST["SB"] == "n" ? print " selected> " : print "> ";
+	print __("Name")."\n";
+	print "  <option value=c";
+	$_REQUEST["SB"] == "c" ? print " selected> " : print "> ";
+	print __("Category")."\n";
+	print "  <option value=l";
+	$_REQUEST["SB"] == "l" ? print " selected> " : print "> ";
+	print __("Location")."\n";
+	print "  <option value=v";
+	$_REQUEST["SB"] == "v" ? print " selected> " : print "> ";
+	print __("Votes")."\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";
+
+	print "<td align='right' valign='bottom'>&nbsp;\n";
+	print "  <input type='submit' class='button' name='do_Search'";
+	print " value='".__("Go")."'>\n";
+	print "</td>\n";
+
+	if ($SID) {
+		print "<td align='right' valign='bottom'>&nbsp;\n";
+		print "  <input type='submit' class='button' name='do_MyPackages'";
+	 	print "	value='".__("My Packages")."'>\n";
+		print "</td>\n";
+	}
+
+	print "</tr>\n";
+	print "</table>\n";
+
+	print "  </td>\n";
+	print "</tr>\n";
+	print "</table>\n";
+	print "</center>\n";
+	print "<br />\n";
+
+	# query to pull out package info
+	#
+#	$q = "SELECT Packages.*, IF(ISNULL(PackageID), 0, COUNT(*)) AS Votes ";
+#	$q.= "FROM Packages LEFT JOIN PackageVotes ";
+#	$q.= "ON Packages.ID = PackageVotes.PackageID ";
+	$q = "SELECT * FROM Packages ";
+	$has_where = 0;
+	if (isset($_REQUEST["L"]) && $_REQUEST["L"]) {
+		$q.= "WHERE LocationID = ".mysql_escape_string($_REQUEST["L"])." ";
+		$has_where = 1;
+	}
+	if (isset($_REQUEST["C"]) && $_REQUEST["C"]) {
+		if (!$has_where) {
+			$q.= "WHERE CategoryID = ".mysql_escape_string($_REQUEST["C"])." ";
+			$has_where = 1;
+		} else {
+			$q.= "AND CategoryID = ".mysql_escape_string($_REQUEST["C"])." ";
+		}
+	}
+	if ($K) {
+		if (!$has_where) {
+			$q.= "WHERE (Name LIKE '".mysql_escape_string($K)."%' OR ";
+			$q.= "Description LIKE '%".mysql_escape_string($K)."%') ";
+			$has_where = 1;
+		} else {
+			$q.= "AND (Name LIKE '".mysql_escape_string($K)."%' OR ";
+			$q.= "Description LIKE '%".mysql_escape_string($K)."%') ";
+		}
+	}
+	if (isset($_REQUEST["M"]) && $_REQUEST["M"] && $SID) {
+		if ($myuid) {
+			if (!$has_where) {
+				$q.= "WHERE MaintainerUID = ".$myuid." ";
+				$has_where = 1;
+			} else {
+				$q.= "AND MaintainerUID = ".$myuid." ";
+			}
+		}
+	}
+
+	switch (isset($_REQUEST["SB"])) {
+		case 'c':
+			$q.= "ORDER BY CategoryID ASC, Name ASC, LocationID ASC ";
+			break;
+		case 'l':
+			$q.= "ORDER BY LocationID ASC, Name ASC, CategoryID ASC ";
+			break;
+		case 'v':
+			$q.= "ORDER BY NumVotes DESC, Name ASC, CategoryID ASC ";
+			break;
+		default:
+			$q.= "ORDER BY Name ASC, LocationID ASC, CategoryID ASC ";
+			break;
+	}
+	$q.= "LIMIT ".$O.", ".$PP;
+
+	print $q."<br />\n";
+
+	$result = db_query($q, $dbh);
+	if (!$result) {
+		print __("Error retrieving package list.");
+
+	} elseif (!mysql_num_rows($result)) {
+		print __("No packages matched your search criteria.");
+
+	} else {
+		# TODO need an "action" table in here like on /devel?  It would
+		# allow the visitor to flag packages out-of-date, vote, adopt/disown?
+		# Probably need to think about the overall UI of this - the package
+		# name will be a link that goes to 'details'.  There should also be
+		# a column for 'manage/edit'
+
+		if ($SID) {
+			print "<center>\n";
+			print "<table cellspacing='3' class='boxSoft'>\n";
+			print "<tr>\n";
+			print "  <td class='boxSoftTitle' align='right'>\n";
+			print "    <span class='f3'>".__("Actions")."</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='center'>";
+			print "<input type='submit' class='button' name='do_Flag'";
+			print "	value='".__("Flag Out-of-date")."'></td>\n";
+			print "  <td align='center'>";
+			print "<input type='submit' class='button' name='do_Adopt'";
+			print "	value='".__("Adopt Packages")."'></td>\n";
+			print "  <td align='center'>";
+			print "<input type='submit' class='button' name='do_Disown'";
+			print "	value='".__("Disown Packages")."'></td>\n";
+			print "  <td align='center'>";
+			print "<input type='submit' class='button' name='do_Vote'";
+			print "	value='".__("Vote")."'></td>\n";
+			print "</tr>\n";
+			print "</table>\n";
+			print "  </td>\n";
+			print "</tr>\n";
+			print "</table>\n";
+			print "</center>\n";
+			print "<br />\n";
+		}
+
+		# print out package search results
+		#
+		print "<center>\n";
+		print "<table cellspacing='3' class='boxSoft'>\n";
+		print "<tr>\n";
+		print "  <td class='boxSoftTitle' align='right'>\n";
+		print "    <span class='f3'>Package Listing</span>\n";
+		print "  </td>\n";
+		print "</tr>\n";
+		print "<tr>\n";
+		print "  <td class='boxSoft'>\n";
+		print "<table width='100%' cellspacing='0' cellpadding='2'>\n";
+		print "<tr>\n";
+		if ($SID) {
+			print "  <th style='border-bottom: #666 1px solid; vertical-align:";
+			print " bottom'>&nbsp;</th>\n";
+		}
+		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
+		print " bottom'><span class='f2'>".__("Location")."</span></th>\n";
+		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
+		print " bottom'><span class='f2'>".__("Category")."</span></th>\n";
+		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
+		print " bottom'><span class='f2'>".__("Name")."</span></th>\n";
+		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
+		print " bottom'><span class='f2'>".__("Votes")."</span></th>\n";
+		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
+		print " bottom'><span class='f2'>".__("Description")."</span></th>\n";
+		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
+		print " bottom'><span class='f2'>".__("Maintainer")."</span></th>\n";
+		if ($SID) {
+			print "  <th style='border-bottom: #666 1px solid; vertical-align:";
+			print " bottom'><span class='f2'>".__("Manage")."</span></th>\n";
+		}
+		print "</tr>\n";
+
+		for ($i=0; $row = mysql_fetch_assoc($result); $i++) {
+			(($i % 2) == 0) ? $c = "data1" : $c = "data2";
+			print "<tr>\n";
+			if ($SID) {
+				print "  <td class='".$c."'>";
+				if ($row["OutOfDate"]) {
+					print "<span style='background-color: red'>";
+				}
+				print "<input type='checkbox' name='IDs[]' value='".$row["ID"]."'>";
+				if ($i == 0) {
+					$all_ids = $row["ID"];
+				} else {
+					$all_ids .= ":".$row["ID"];
+				}
+				if ($row["OutOfDate"]) {
+					print "</span>";
+				}
+				print "</td>\n";
+			}
+			print "  <td class='".$c."'><span class='f5'><span class='blue'>";
+			print $locs[$row["LocationID"]]."</span></span></td>\n";
+			print "  <td class='".$c."'><span class='f5'><span class='blue'>";
+			print $cats[$row["CategoryID"]]."</span></span></td>\n";
+			print "  <td class='".$c."'><span class='f4'>";
+			$details_url = "<a href='/pkgsearch.php?do_Details=1&ID=";
+			$details_url.= $row["ID"]."'><span class='black'>".$row["Name"];
+			$details_url.= "-".$row["Version"]."</span></a>";
+			print $details_url."</span></td>\n";
+			print "  <td class='".$c."'><span class='f5'><span class='blue'>";
+			print "&nbsp;&nbsp;&nbsp;".$row["NumVotes"]."</span></span></td>\n";
+			print "  <td class='".$c."'><span class='f4'><span class='blue'>";
+			print $row["Description"]."</span></span></td>\n";
+			print "  <td class='".$c."'><span class='f5'><span class='blue'>";
+			$not_managed = 0;
+			if (isset($devs[$row["MaintainerUID"]])) {
+				print $devs[$row["MaintainerUID"]]["Username"];
+			} elseif (isset($tus[$row["MaintainerUID"]])) {
+				print $tus[$row["MaintainerUID"]]["Username"];
+			} else {
+				print "None";
+				$not_managed = 1;
+			}
+			print "</span></span></td>\n";
+			if ($myuid == $row["MaintainerUID"] || $not_managed) {
+				$manage_url = "<a href='/pkgmgmnt.php?ID=";
+				$manage_url.= $row["ID"]."'><span class='black'>Manage</span></a>";
+				print "  <td class='".$c."'><span class='f4'>";
+				print $manage_url."</span></td>\n";
+			} else {
+				print "<td class='".$c."'><span class='f4'>&nbsp;</span></td>\n";
+			}
+
+			print "</tr>\n";
+
+		}
+		print "</table>\n";
+		print "  </td>\n";
+		print "</tr>\n";
+		print "</table>\n";
+		print "<input type='hidden' name='All_IDs' value='".$all_ids."'>\n";
+
+		print "<table width='90%' cellspacing='0' cellpadding='2'>\n";
+		print "<tr>\n";
+		print "  <td>\n";
+		print "  <table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
+		print "  <tr>\n";
+		print "    <td align='left'>";
+		print "    <input type='submit' class='button' name='do_Less'";
+		print " value='&lt;-- ".__("Less")."'>\n";
+		print "    </td>\n";
+		print "    <td align='right'>";
+		print "    <input type='submit' class='button' name='do_More'";
+		print " value='".__("More")." --&gt;'>\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";
+
+	return;
+}
+
+# vim: ts=2 sw=2 noet ft=php
+?>
diff --git a/web/lib/pkgs.inc b/web/lib/pkgs.inc
deleted file mode 100644
index 9fd70cb..0000000
--- a/web/lib/pkgs.inc
+++ /dev/null
@@ -1,417 +0,0 @@
-<?
-include_once("pkgs_po.inc");
-
-# grab the current list of PackageCategories
-#
-function pkgCategories() {
-	$cats = array();
-	$dbh = db_connect();
-	$q = "SELECT * FROM PackageCategories ";
-	$q.= "ORDER BY Category ASC";
-	$result = db_query($q, $dbh);
-	if ($result) {
-		while ($row = mysql_fetch_row($result)) {
-			$cats[$row[0]] = $row[1];
-		}
-	}
-	return $cats;
-}
-
-# grab the current list of PackageLocations
-#
-function pkgLocations() {
-	$locs = array();
-	$dbh = db_connect();
-	$q = "SELECT * FROM PackageLocations ";
-	$q.= "ORDER BY Location ASC";
-	$result = db_query($q, $dbh);
-	if ($result) {
-		while ($row = mysql_fetch_row($result)) {
-			$locs[$row[0]] = $row[1];
-		}
-	}
-	return $locs;
-}
-
-# display the search form in a boxSoft style
-#
-function pkg_search_page($SID="",$L="",$C="",$K="",$SB="",$M=0,$O=0,$PP=25,
-		$D="") {
-	# SID: session id cookie
-	# L: PackageLocations.ID
-	# C: PackageCategories.ID
-	# K: Keywords
-	# SB: Sort by
-	# M: search "my packages"
-	# O: Row offset
-	# PP: Per page
-	# D: Direction to advance (Less/More)
-	$locs = pkgLocations();
-	$cats = pkgCategories();
-	$devs = getDevelopers();
-	$tus = getTrustedUsers();
-	$dbh = db_connect();
-
-
-	if (!$PP) {$PP = 25;}
-	if ($O) {
-		$OFFSET = intval($O);
-	} else {
-		$OFFSET = 0;
-	}
-	if ($OFFSET < 0) {
-		$OFFSET = 0;
-	}
-
-	# grab info for user if they're logged in
-	#
-	if ($SID) {
-		$myuid = uid_from_sid($SID);
-		$acct = account_from_sid($SID);
-	}
-
-	# The search form
-	#
-	print "SID=$SID, L=$L, C=$C, K=$K, SB=$SB, M=$M, O=$O, PP=$PP<br />\n";
-
-	print "<form action='/pkgsearch.php' method='post'>\n";
-	print "<input type='hidden' name='O' value='".($OFFSET+intval($PP))."'>\n";
-	print "<input type='hidden' name='L' value='".$L."'>\n";
-	print "<input type='hidden' name='M' value='".$M."'>\n";
-	print "<input type='hidden' name='C' value='".$C."'>\n";
-	print "<input type='hidden' name='K' value='".$K."'>\n";
-	print "<input type='hidden' name='SB' value='".$SB."'>\n";
-	print "<input type='hidden' name='PP' value='".$PP."'>\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 ($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 ($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='35'";
-	print " value='".$K."' maxlength='35'>\n";
-	print "</td>\n";
-
-	print "<td align='right'>\n";
-	print "  <span class='f5'><span class='blue'>".__("Sort by");
-	print "</span></span><br />\n";
-	print "  <select name='SB'>\n";
-	print "  <option value=n";
-	$SB == "n" ? print " selected> " : print "> ";
-	print __("Name")."\n";
-	print "  <option value=c";
-	$SB == "c" ? print " selected> " : print "> ";
-	print __("Category")."\n";
-	print "  <option value=l";
-	$SB == "l" ? print " selected> " : print "> ";
-	print __("Location")."\n";
-	print "  <option value=v";
-	$SB == "v" ? print " selected> " : print "> ";
-	print __("Votes")."\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";
-
-	print "<td align='right' valign='bottom'>&nbsp;\n";
-	print "  <input type='submit' class='button' name='do_Search'";
-	print " value='".__("Go")."'>\n";
-	print "</td>\n";
-
-	if ($SID) {
-		print "<td align='right' valign='bottom'>&nbsp;\n";
-		print "  <input type='submit' class='button' name='do_MyPackages'";
-	 	print "	value='".__("My Packages")."'>\n";
-		print "</td>\n";
-	}
-
-	print "</tr>\n";
-	print "</table>\n";
-
-	print "  </td>\n";
-	print "</tr>\n";
-	print "</table>\n";
-	print "</center>\n";
-	print "<br />\n";
-
-	# query to pull out package info
-	#
-#	$q = "SELECT Packages.*, IF(ISNULL(PackageID), 0, COUNT(*)) AS Votes ";
-#	$q.= "FROM Packages LEFT JOIN PackageVotes ";
-#	$q.= "ON Packages.ID = PackageVotes.PackageID ";
-	$q = "SELECT * FROM Packages ";
-	$has_where = 0;
-	if ($L) {
-		$q.= "WHERE LocationID = ".intval($L)." ";
-		$has_where = 1;
-	}
-	if ($C) {
-		if (!$has_where) {
-			$q.= "WHERE CategoryID = ".intval($C)." ";
-			$has_where = 1;
-		} else {
-			$q.= "AND CategoryID = ".intval($C)." ";
-		}
-	}
-	if ($K) {
-		if (!$has_where) {
-			$q.= "WHERE (Name LIKE '".mysql_escape_string($K)."%' OR ";
-			$q.= "Description LIKE '%".mysql_escape_string($K)."%') ";
-			$has_where = 1;
-		} else {
-			$q.= "AND (Name LIKE '".mysql_escape_string($K)."%' OR ";
-			$q.= "Description LIKE '%".mysql_escape_string($K)."%') ";
-		}
-	}
-	if ($M && $SID) {
-		if ($myuid) {
-			if (!$has_where) {
-				$q.= "WHERE MaintainerUID = ".$myuid." ";
-				$has_where = 1;
-			} else {
-				$q.= "AND MaintainerUID = ".$myuid." ";
-			}
-		}
-	}
-
-	switch ($SB) {
-		case 'c':
-			$q.= "ORDER BY CategoryID ASC, Name ASC, LocationID ASC ";
-			break;
-		case 'l':
-			$q.= "ORDER BY LocationID ASC, Name ASC, CategoryID ASC ";
-			break;
-		case 'v':
-			$q.= "ORDER BY NumVotes DESC, Name ASC, CategoryID ASC ";
-			break;
-		default:
-			$q.= "ORDER BY Name ASC, LocationID ASC, CategoryID ASC ";
-			break;
-	}
-	$q.= "LIMIT ".$OFFSET.", ".intval($PP);
-
-	print $q."<br />\n";
-
-	$result = db_query($q, $dbh);
-	if (!$result) {
-		print __("No packages matched your search criteria.");
-
-	} elseif (!mysql_num_rows($result)) {
-		print __("No packages matched your search criteria.");
-
-	} else {
-		# TODO need an "action" table in here like on /devel?  It would
-		# allow the visitor to flag packages out-of-date, vote, adopt/disown?
-		# Probably need to think about the overall UI of this - the package
-		# name will be a link that goes to 'details'.  There should also be
-		# a column for 'manage/edit'
-
-		if ($SID) {
-			print "<center>\n";
-			print "<table cellspacing='3' class='boxSoft'>\n";
-			print "<tr>\n";
-			print "  <td class='boxSoftTitle' align='right'>\n";
-			print "    <span class='f3'>".__("Actions")."</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='center'>";
-			print "<input type='submit' class='button' name='do_Flag'";
-			print "	value='".__("Flag Out-of-date")."'></td>\n";
-			print "  <td align='center'>";
-			print "<input type='submit' class='button' name='do_Adopt'";
-			print "	value='".__("Adopt Packages")."'></td>\n";
-			print "  <td align='center'>";
-			print "<input type='submit' class='button' name='do_Disown'";
-			print "	value='".__("Disown Packages")."'></td>\n";
-			print "  <td align='center'>";
-			print "<input type='submit' class='button' name='do_Vote'";
-			print "	value='".__("Vote")."'></td>\n";
-			print "</tr>\n";
-			print "</table>\n";
-			print "  </td>\n";
-			print "</tr>\n";
-			print "</table>\n";
-			print "</center>\n";
-			print "<br />\n";
-		}
-
-		# print out package search results
-		#
-		print "<center>\n";
-		print "<table cellspacing='3' class='boxSoft'>\n";
-		print "<tr>\n";
-		print "  <td class='boxSoftTitle' align='right'>\n";
-		print "    <span class='f3'>Package Listing</span>\n";
-		print "  </td>\n";
-		print "</tr>\n";
-		print "<tr>\n";
-		print "  <td class='boxSoft'>\n";
-		print "<table width='100%' cellspacing='0' cellpadding='2'>\n";
-		print "<tr>\n";
-		if ($SID) {
-			print "  <th style='border-bottom: #666 1px solid; vertical-align:";
-			print " bottom'>&nbsp;</th>\n";
-		}
-		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
-		print " bottom'><span class='f2'>".__("Location")."</span></th>\n";
-		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
-		print " bottom'><span class='f2'>".__("Category")."</span></th>\n";
-		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
-		print " bottom'><span class='f2'>".__("Name")."</span></th>\n";
-		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
-		print " bottom'><span class='f2'>".__("Votes")."</span></th>\n";
-		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
-		print " bottom'><span class='f2'>".__("Description")."</span></th>\n";
-		print "  <th style='border-bottom: #666 1px solid; vertical-align:";
-		print " bottom'><span class='f2'>".__("Maintainer")."</span></th>\n";
-		if ($SID) {
-			print "  <th style='border-bottom: #666 1px solid; vertical-align:";
-			print " bottom'><span class='f2'>".__("Manage")."</span></th>\n";
-		}
-		print "</tr>\n";
-
-		for ($i=0; $row = mysql_fetch_assoc($result); $i++) {
-			(($i % 2) == 0) ? $c = "data1" : $c = "data2";
-			print "<tr>\n";
-			if ($SID) {
-				print "  <td class='".$c."'>";
-				if ($row["OutOfDate"]) {
-					print "<span style='background-color: red'>";
-				}
-				print "<input type='checkbox' name='IDs[]' value='".$row["ID"]."'>";
-				if ($i == 0) {
-					$all_ids = $row["ID"];
-				} else {
-					$all_ids .= ":".$row["ID"];
-				}
-				if ($row["OutOfDate"]) {
-					print "</span>";
-				}
-				print "</td>\n";
-			}
-			print "  <td class='".$c."'><span class='f5'><span class='blue'>";
-			print $locs[$row["LocationID"]]."</span></span></td>\n";
-			print "  <td class='".$c."'><span class='f5'><span class='blue'>";
-			print $cats[$row["CategoryID"]]."</span></span></td>\n";
-			print "  <td class='".$c."'><span class='f4'>";
-			$details_url = "<a href='/pkgsearch.php?do_Details=1&ID=";
-			$details_url.= $row["ID"]."'><span class='black'>".$row["Name"];
-			$details_url.= "-".$row["Version"]."</span></a>";
-			print $details_url."</span></td>\n";
-			print "  <td class='".$c."'><span class='f5'><span class='blue'>";
-			print "&nbsp;&nbsp;&nbsp;".$row["NumVotes"]."</span></span></td>\n";
-			print "  <td class='".$c."'><span class='f4'><span class='blue'>";
-			print $row["Description"]."</span></span></td>\n";
-			print "  <td class='".$c."'><span class='f5'><span class='blue'>";
-			$not_managed = 0;
-			if (isset($devs[$row["MaintainerUID"]])) {
-				print $devs[$row["MaintainerUID"]]["Username"];
-			} elseif (isset($tus[$row["MaintainerUID"]])) {
-				print $tus[$row["MaintainerUID"]]["Username"];
-			} else {
-				print "None";
-				$not_managed = 1;
-			}
-			print "</span></span></td>\n";
-			if ($myuid == $row["MaintainerUID"] || $not_managed) {
-				$manage_url = "<a href='/pkgmgmnt.php?ID=";
-				$manage_url.= $row["ID"]."'><span class='black'>Manage</span></a>";
-				print "  <td class='".$c."'><span class='f4'>";
-				print $manage_url."</span></td>\n";
-			} else {
-				print "<td class='".$c."'><span class='f4'>&nbsp;</span></td>\n";
-			}
-
-			print "</tr>\n";
-
-		}
-		print "</table>\n";
-		print "  </td>\n";
-		print "</tr>\n";
-		print "</table>\n";
-		print "<input type='hidden' name='All_IDs' value='".$all_ids."'>\n";
-
-		print "<table width='90%' cellspacing='0' cellpadding='2'>\n";
-		print "<tr>\n";
-		print "  <td>\n";
-		print "  <table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
-		print "  <tr>\n";
-		print "    <td align='left'>";
-		print "    <input type='submit' class='button' name='do_Less'";
-		print " value='&lt;-- ".__("Less")."'>\n";
-		print "    </td>\n";
-		print "    <td align='right'>";
-		print "    <input type='submit' class='button' name='do_More'";
-		print " value='".__("More")." --&gt;'>\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";
-
-	return;
-}
-
-# vim: ts=2 sw=2 noet ft=php
-?>
-- 
cgit v1.2.3-70-g09d2