external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure all variables are set in package search form

Browse source 
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Dan McGee 2011-03-01 11:56:33 -06:00 • committed by Lukas Fleischer
parent 3d5b735fae
commit ef8fab0c12
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
web/lib/pkgfuncs.inc
View file

@ -463,24 +463,23 @@ function pkg_search_page($SID="") {
// TODO: possibly do string matching on category // TODO: possibly do string matching on category
// to make request variable values more sensible // to make request variable values more sensible
if (intval($_GET["C"])) { if (isset($_GET["C"]) && intval($_GET["C"])) {
$q.= "AND Packages.CategoryID = ".intval($_GET["C"])." "; $q.= "AND Packages.CategoryID = ".intval($_GET["C"])." ";
} }
if ($_GET['K']) { if (isset($_GET['K'])) {
$_GET['K'] = mysql_real_escape_string(trim($_GET['K'])); $_GET['K'] = mysql_real_escape_string(trim($_GET['K']));
# Search by maintainer # Search by maintainer
if ($_GET["SeB"] == "m") { if (isset($_GET["SeB"]) && $_GET["SeB"] == "m") {
$q.= "AND Users.Username = '".$_GET['K']."' "; $q.= "AND Users.Username = '".$_GET['K']."' ";
} }
# Search by submitter # Search by submitter
elseif ($_GET["SeB"] == "s") { elseif (isset($_GET["SeB"]) && $_GET["SeB"] == "s") {
// FIXME: this shouldn't be making 2 queries
// kill the call to uid_from_username
$q.= "AND SubmitterUID = ".uid_from_username($_GET['K'])." "; $q.= "AND SubmitterUID = ".uid_from_username($_GET['K'])." ";
# Search by name # Search by name
} }
elseif ($_GET["SeB"] == "n") { elseif (isset($_GET["SeB"]) && $_GET["SeB"] == "n") {
$q.= "AND (Name LIKE '%".$_GET['K']."%') "; $q.= "AND (Name LIKE '%".$_GET['K']."%') ";
} }
# Search by name and description (Default) # Search by name and description (Default)
@ -490,7 +489,7 @@ function pkg_search_page($SID="") {
} }
} }
if ($_GET["do_Orphans"]) { if (isset($_GET["do_Orphans"]) && $_GET["do_Orphans"] == 'Orphans') {
$q.= "AND MaintainerUID IS NULL "; $q.= "AND MaintainerUID IS NULL ";
} }
@ -503,37 +502,32 @@ function pkg_search_page($SID="") {
} }
} }
$order = $_GET["SO"] == 'd' ? 'DESC' : 'ASC'; $order = (isset($_GET["SO"]) && $_GET["SO"] == 'd') ? 'DESC' : 'ASC';
$q_sort = "ORDER BY Name ".$order.", CategoryID DESC "; $q_sort = "ORDER BY Name ".$order.", CategoryID DESC ";
switch ($_GET["SB"]) { $sort_by = isset($_GET["SB"]) ? $_GET["SB"] : '';
switch ($sort_by) {
case 'c': case 'c':
$q_sort = "ORDER BY CategoryID ".$order.", Name ASC "; $q_sort = "ORDER BY CategoryID ".$order.", Name ASC ";
$_GET["SB"] = 'c';
break; break;
case 'v': case 'v':
$q_sort = "ORDER BY NumVotes ".$order.", Name ASC, CategoryID DESC "; $q_sort = "ORDER BY NumVotes ".$order.", Name ASC, CategoryID DESC ";
$_GET["SB"] = 'v';
break; break;
case 'w': case 'w':
if ($SID) { if ($SID) {
$q_sort = "ORDER BY Voted ".$order.", Name ASC, CategoryID DESC "; $q_sort = "ORDER BY Voted ".$order.", Name ASC, CategoryID DESC ";
} }
$_GET["SB"] = 'w';
break; break;
case 'o': case 'o':
if ($SID) { if ($SID) {
$q_sort = "ORDER BY Notify ".$order.", Name ASC, CategoryID DESC "; $q_sort = "ORDER BY Notify ".$order.", Name ASC, CategoryID DESC ";
} }
$_GET["SB"] = 'o';
break; break;
case 'm': case 'm':
$q_sort = "ORDER BY Maintainer ".$order.", Name ASC "; $q_sort = "ORDER BY Maintainer ".$order.", Name ASC ";
$_GET["SB"] = 'm';
break; break;
case 'a': case 'a':
$q_sort = "ORDER BY GREATEST(SubmittedTS,ModifiedTS) ".$order.", Name ASC "; $q_sort = "ORDER BY GREATEST(SubmittedTS,ModifiedTS) ".$order.", Name ASC ";
$_GET["SB"] = 'a';
break; break;
default: default:
break; break;
@ -547,13 +541,11 @@ function pkg_search_page($SID="") {
$total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0); $total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0);
if ($result && $total > 0) { if ($result && $total > 0) {
if ($_GET["SO"] == "d"){ if (isset($_GET["SO"]) && $_GET["SO"] == "d"){
$SO_next = "a"; $SO_next = "a";
$_GET["SO"] = 'd';
} }
else { else {
$SO_next = "d"; $SO_next = "d";
$_GET["SO"] = 'a';
} }
} }