December 2008 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Turn on package notification by default for new packages
by Callan Barrett 18 Jun '09

18 Jun '09

Version using package functions Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/pkgsubmit.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 78d6e50..450e9b6 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -328,6 +328,7 @@ if ($_COOKIE["AURSID"]): header('Location: packages.php?ID=' . $pdata['ID']); } else { + $uid = uid_from_sid($_COOKIE["AURSID"]); # This is a brand new package $q = sprintf("INSERT INTO Packages (Name, License, Version, CategoryID, Description, URL, LocationID, SubmittedTS, SubmitterUID, MaintainerUID, FSPath, URLPath) VALUES ('%s', '%s', '%s-%s', %d, '%s', '%s', 2, UNIX_TIMESTAMP(), %d, %d, '%s', '%s')", @@ -338,8 +339,8 @@ if ($_COOKIE["AURSID"]): mysql_real_escape_string($_REQUEST['category']), mysql_real_escape_string($new_pkgbuild['pkgdesc']), mysql_real_escape_string($new_pkgbuild['url']), - uid_from_sid($_COOKIE["AURSID"]), - uid_from_sid($_COOKIE["AURSID"]), + $uid, + $uid, mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"), mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz")); @@ -370,6 +371,8 @@ if ($_COOKIE["AURSID"]): $q .= $packageID . ", '" . mysql_real_escape_string($src) . "')"; db_query($q, $dbh); } + + pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($packageID)); header('Location: packages.php?ID=' . $packageID); -- 1.6.0.2

2 1

[aur-dev] [PATCH 3/5] Cache all front page stats in APC if available
by Dan McGee 04 Jan '09

04 Jan '09

Use the APC cache to store all of the counts and the recently updated package list in a cache, which cuts down on the number of database queries needed. If the data isn't perfectly up to date we will survive. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/lib/stats.inc | 52 +++++++++++++++++++++++----------- web/template/stats/updates_table.php | 5 +-- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/web/lib/stats.inc b/web/lib/stats.inc index 6fbc033..deb246e 100644 --- a/web/lib/stats.inc +++ b/web/lib/stats.inc @@ -2,10 +2,38 @@ include_once('aur.inc'); +# Check if APC extension is loaded +if (!defined('EXTENSION_LOADED_APC')) + define('EXTENSION_LOADED_APC', extension_loaded('apc')); + +# run a simple db query, retrieving and/or caching the value if APC +# is available for use +# +function db_cache_value($dbq, $dbh, $key) +{ + if(!(EXTENSION_LOADED_APC && ($ret = apc_fetch($key)))) { + $result = db_query($dbq, $dbh); + $row = mysql_fetch_row($result); + $ret = $row[0]; + # set the TTL here in seconds: 300 seconds = 5 minutes + apc_store($key, $ret, 300); + } + return $ret; +} + function updates_table($dbh) { - $q = 'SELECT * FROM Packages WHERE DummyPkg != 1 ORDER BY GREATEST(SubmittedTS,ModifiedTS) DESC LIMIT 0 , 10'; - $newest_packages = db_query($q, $dbh); + $key = 'aur_recent_updates'; + if(!(EXTENSION_LOADED_APC && ($newest_packages = apc_fetch($key)))) { + $q = 'SELECT * FROM Packages WHERE DummyPkg != 1 ORDER BY GREATEST(SubmittedTS,ModifiedTS) DESC LIMIT 0 , 10'; + $result = db_query($q, $dbh); + + $newest_packages = new ArrayObject(); + while ($row = mysql_fetch_assoc($result)) { + $newest_packages->append($row); + } + apc_store($key, $newest_packages, 300); + } include('stats/updates_table.php'); } @@ -42,30 +70,20 @@ function general_stats_table($dbh) { # AUR statistics $q = "SELECT count(*) FROM Packages,PackageLocations WHERE Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'unsupported'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $unsupported_count = $row[0]; + $unsupported_count = db_cache_value($q, $dbh, 'aur_unsupported_count'); $q = "SELECT count(*) FROM Packages,PackageLocations WHERE Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'community'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $community_count = $row[0]; + $community_count = db_cache_value($q, $dbh, 'aur_community_count'); $q = "SELECT count(*) from Users"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $user_count = $row[0]; + $user_count = db_cache_value($q, $dbh, 'aur_user_count'); $q = "SELECT count(*) from Users,AccountTypes WHERE Users.AccountTypeID = AccountTypes.ID AND AccountTypes.AccountType = 'Trusted User'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $tu_count = $row[0]; + $tu_count = db_cache_value($q, $dbh, 'aur_tu_count'); $targstamp = intval(strtotime("-7 days")); $q = "SELECT count(*) from Packages WHERE (Packages.SubmittedTS >= $targstamp OR Packages.ModifiedTS >= $targstamp)"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $update_count = $row[0]; + $update_count = db_cache_value($q, $dbh, 'aur_update_count'); include('stats/general_stats_table.php'); } diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index e1eb888..9d1af01 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -6,8 +6,7 @@ </th> </tr> -<?php while ($row = mysql_fetch_assoc($newest_packages)): ?> - +<?php foreach ($newest_packages->getIterator() as $row): ?> <tr> <td class="boxSoft"> <span class="f4"><span class="blue"> @@ -34,7 +33,7 @@ endif; </td> </tr> -<?php endwhile; ?> +<?php endforeach; ?> </table> -- 1.6.1

3 6

[aur-dev] [PATCH 1/2] aur.inc: remove unused code
by Dan McGee 31 Dec '08

31 Dec '08

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- If this is a bogus patch and we do need this code around, let me know. A quick git annotate shows that it is from 2004/2005 and is just old garbage. -Dan web/lib/aur.inc | 47 ----------------------------------------------- 1 files changed, 0 insertions(+), 47 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index 22bd4e7..1fc9842 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -20,53 +20,6 @@ include_once("acctfuncs.inc"); # is using... -# return an array of info for each Trusted user -# -function getTrustedUsers() { - $tus = array(); - $dbh = db_connect(); - $q = "SELECT * FROM Users WHERE AccountTypeID = 2 "; - $q.= "ORDER BY Username ASC"; - $result = db_query($q, $dbh); - if ($result) { - while ($row = mysql_fetch_assoc($result)) { - $tus[$row["ID"]] = $row; - } - } - return $tus; -} - - -# return an array of info for each Developer -# -function getDevelopers() { - $devs = array(); - $dbh = db_connect(); - $q = "SELECT * FROM Users WHERE AccountTypeID = 3 "; - $q.= "ORDER BY Username ASC"; - $result = db_query($q, $dbh); - if ($result) { - while ($row = mysql_fetch_assoc($result)) { - $devs[$row["ID"]] = $row; - } - } - return $devs; -} - -# return an array of info for each user -function getUsers() { - $users = array(); - $dbh = db_connect(); - $q = "SELECT * FROM Users ORDER BY Username ASC"; - $result = db_query($q, $dbh); - if ($result) { - while ($row = mysql_fetch_assoc($result)) { - $users[$row["ID"]] = $row; - } - } - return $users; -} - # see if the visitor is already logged in # function check_sid() { -- 1.6.1

2 3

[aur-dev] [PATCH] New search bar, toggle advanced options new style
by Callan Barrett 29 Dec '08

29 Dec '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/css/arch.css | 13 ++- web/html/css/fonts.css | 10 +- web/template/pkg_search_form.php | 300 +++++++++++++++---------------------- 3 files changed, 139 insertions(+), 184 deletions(-) diff --git a/web/html/css/arch.css b/web/html/css/arch.css index bc629e8..37997c0 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -452,4 +452,15 @@ textarea.vLargeTextField { border-collapse: separate; border-spacing: 0 15px; } - +#search_box { + margin: 5px; + text-align: center; + font-size: 11px; +} +#advanced li { + background-color: #f3f3f3; + list-style: none; + display: inline; + padding: 15px; + text-decoration: none; +} \ No newline at end of file diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css index bf5268f..de70d76 100644 --- a/web/html/css/fonts.css +++ b/web/html/css/fonts.css @@ -61,11 +61,11 @@ span.warning /* Content Text */ font-size: 12px; } /* Font Attribute Change (#6c83b0)*/ -span.blue { color: #6c83b0; } -span.white { color: #fff; } -span.black { color: #000; } -span.green { color: #6db06d; } -span.link +.blue { color: #6c83b0; } +.white { color: #fff; } +.black { color: #000; } +.green { color: #6db06d; } +.link { color: #6c83b0; font-weight: bold; diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index f74e736..edc8b38 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -1,188 +1,132 @@ <form action='packages.php' method='get'> <input type='hidden' name='O' value='0'> - <center> - <table cellspacing='3' class='boxSoft'> <tr> - <td class='boxSoftTitle' align='right'> - <span class='f3'><?php print __("Search Criteria"); ?></span> - </td> + <td class='boxSoftTitle' align='right'> + <span class='f3'><?php print __("Search Criteria"); ?></span> + </td> </tr> <tr> - <td class='boxSoft'> - <table style='width: 100%' align='center'> - <tr> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Location"); ?> - </span> - </span> - <br /> - <select name='L'> - <option value=0><?php print __("Any"); ?></option> -<?php -while (list($id, $loc) = each($locs)) { - if (intval($_REQUEST["L"]) == $id) { -?> - <option value="<?php print $id; ?>" selected="selected"><?php print $loc; ?></option> -<?php } else { ?> - <option value="<?php print $id; ?>"><?php print $loc; ?></option> -<?php - } -} -?> - </select> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Category"); ?> - </span> - </span> - <br /> - <select name='C'> - <option value='0'><?php print __("Any"); ?></option> -<?php -while (list($id, $cat) = each($cats)) { - if (intval($_REQUEST["C"]) == $id) { -?> - <option value="<?php print $id ?>" selected="selected"><?php print $cat; ?></option> -<?php } else { ?> - <option value="<?php print $id ?>"><?php print $cat; ?></option> -<?php - } -} -?> - </select> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Keywords"); ?> - </span> - </span> - <br /> - <input type='text' name='K' size='20' value="<?php print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); ?>" maxlength='35' /> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Search by"); ?> - </span> - </span> - <br /> - <select name='SeB'> -<?php -$searchby = array('nd' => 'Name' - ,'m' => 'Maintainer' - ,'s' => 'Submitter' - ); - -foreach ($searchby as $k => $v) { - if ($_REQUEST['SeB'] == $k) { -?> - <option value="<?php print $k; ?>" selected="selected"><?php print __($v); ?></option> -<?php } else { ?> - <option value="<?php print $k; ?>"><?php print __($v); ?></option> -<?php - } -} -?> - </select> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Sort by"); ?> - </span> - </span> - <br /> - <select name='SB'> -<?php -$sortby = array('n' => 'Name' - ,'c' => 'Category' - ,'l' => 'Location' - ,'v' => 'Votes' - ,'m' => 'Maintainer' - ,'a' => 'Age' - ); - -foreach ($sortby as $k => $v) { - if ($_REQUEST['SB'] == $k) { -?> - <option value='<?php print $k; ?>' selected="selected"><?php print __($v); ?></option> -<?php } else { ?> - <option value='<?php print $k; ?>'><?php print __($v); ?></option> -<?php - } -} -?> - </select> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Sort order"); ?> - </span> - </span> - <br /> - <select name='SO'> -<?php -$orderby = array('a' => 'Ascending' - ,'d' => 'Descending' - ); - -foreach ($orderby as $k => $v) { - if ($_REQUEST['SO'] == $k) { -?> - <option value='<?php print $k; ?>' selected="selected"><?php print __($v); ?></option> -<?php } else { ?> - <option value='<?php print $k; ?>'><?php print __($v); ?></option> -<?php - } -} -?> - </select> - </td> - <td align='right'> - <span class='f5'> - <span class='blue'> - <?php print __("Per page"); ?> - </span> - </span> - <br /> - <select name='PP'> -<?php -$pages = array(25, 50, 75, 100); -foreach ($pages as $i) { - if ($PP == $i) { -?> - <option value="<?php print $i; ?>" selected="selected"><?php print $i; ?></option> -<?php } else { ?> - <option value="<?php print $i; ?>"><?php print $i; ?></option> -<?php - } -} -?> - </select> - </td> - </tr> - </table> - <center> - <table> - <tr> - <td align='right' valign='bottom'> - <input type='submit' style='width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' /> - </td> - <td align='right' valign='bottom'> - <input type='submit' style='width:80px' class='button' name='do_Orphans' value='<?php print __("Orphans"); ?>' /> - </td> - </tr> - </table> - </center> - </td> + <td class='boxSoft'> + <div id="search_box" class="blue"> + <label><?php print __("Keywords"); ?></label> + <input type='text' name='K' size='20' value="<?php print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); ?>" maxlength='35' /> + <?php if (!$_GET['detail']): ?><input type='submit' style='width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' /><?php endif; ?> + <a href="packages.php?<?php print mkurl('detail=' . (($_GET['detail']) ? 0 : 1) ) ?>">Advanced</a> + <?php if ($_GET['detail']): ?> + <div id="advanced"> + <input type="hidden" name="detail" value="1" /> + <ul> + <li> + <label><?php print __("Location"); ?></label> + <select name='L'> + <option value=0><?php print __("Any"); ?></option> + <?php + while (list($id, $loc) = each($locs)): + if (intval($_REQUEST["L"]) == $id): + ?> + <option value="<?php print $id; ?>" selected="selected"><?php print $loc; ?></option> + <?php else: ?> + <option value="<?php print $id; ?>"><?php print $loc; ?></option> + <?php + endif; + endwhile; + ?> + </select> + </li> + <li> + <label><?php print __("Category"); ?></label> + <select name='C'> + <option value='0'><?php print __("Any"); ?></option> + <?php + while (list($id, $cat) = each($cats)): + if (intval($_REQUEST["C"]) == $id): + ?> + <option value="<?php print $id ?>" selected="selected"><?php print $cat; ?></option> + <?php else: ?> + <option value="<?php print $id ?>"><?php print $cat; ?></option> + <?php + endif; + endwhile; + ?> + </select> + </li> + <li> + <label><?php print __("Search by"); ?></label> + <select name='SeB'> + <?php + $searchby = array('nd' => 'Name', 'm' => 'Maintainer', 's' => 'Submitter'); + foreach ($searchby as $k => $v): + if ($_REQUEST['SeB'] == $k): + ?> + <option value="<?php print $k; ?>" selected="selected"><?php print __($v); ?></option> + <?php else: ?> + <option value="<?php print $k; ?>"><?php print __($v); ?></option> + <?php + endif; + endforeach; + ?> + </select> + </li> + <li> + <label><?php print __("Sort by"); ?></label> + <select name='SB'> + <?php + $sortby = array('n' => 'Name', 'c' => 'Category', 'l' => 'Location', 'v' => 'Votes', 'm' => 'Maintainer', 'a' => 'Age'); + foreach ($sortby as $k => $v): + if ($_REQUEST['SB'] == $k): + ?> + <option value='<?php print $k; ?>' selected="selected"><?php print __($v); ?></option> + <?php else: ?> + <option value='<?php print $k; ?>'><?php print __($v); ?></option> + <?php + endif; + endforeach; + ?> + </select> + </li> + <li> + <label><?php print __("Sort order"); ?></label> + <select name='SO'> + <?php + $orderby = array('a' => 'Ascending', 'd' => 'Descending'); + foreach ($orderby as $k => $v): + if ($_REQUEST['SO'] == $k): + ?> + <option value='<?php print $k; ?>' selected="selected"><?php print __($v); ?></option> + <?php else: ?> + <option value='<?php print $k; ?>'><?php print __($v); ?></option> + <?php + endif; + endforeach; + ?> + </select> + </li> + <li> + <label><?php print __("Per page"); ?></label> + <select name='PP'> + <?php + $pages = array(25, 50, 75, 100); + foreach ($pages as $i): + if ($PP == $i): + ?> + <option value="<?php print $i; ?>" selected="selected"><?php print $i; ?></option> + <?php else: ?> + <option value="<?php print $i; ?>"><?php print $i; ?></option> + <?php + endif; + endforeach; + ?> + </select> + </li> + </ul> + <input type='submit' style='width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' /> + <input type='submit' style='width:80px' class='button' name='do_Orphans' value='<?php print __("Orphans"); ?>' /> + </div> + <?php endif; ?> + </div> + </td> </tr> </table> </center> -- 1.6.0.2

2 1

[aur-dev] New AUR Release
by Callan Barrett 24 Dec '08

24 Dec '08

The AUR is up to 1.5.4 now, hopefully I didn't mess anything up. This is a pretty quick release because there was a major bug killing the AUR every time a PKGBUILD had errors in it, this should be fixed now. There's also some other goodies like most of the confirmation pages are gone now. Have fun. -- Callan Barrett

1 0

[aur-dev] turkish typos
by Samed Beyribey 24 Dec '08

24 Dec '08

Hi, I've found a few typos in turkish translation, and fixed 'em. As you are going to prepare a new version, could you please push my patch? Best regards, Samed.

2 1

[aur-dev] New Release
by Callan Barrett 24 Dec '08

24 Dec '08

There is a bug on the current AUR because the new chmodding stuff does no error checks so if a PKGBUILD is invalid in any way the AUR will start chmodding all package dirs hosted. PHP kills the script before it's done but it can't be good for the server and there is no feedback on what happened for the user. I think we're gonna have to do another release soon. Thoughts? -- Callan Barrett

4 4

[aur-dev] [PATCH] Make search page use mkurl function, change variables around
by Callan Barrett 22 Dec '08

22 Dec '08

Changed all the normal variables to their $_GET counterparts so everything is destructively changing the original variables, there should be no issue with this. If there I guess we need to consider making mkurl use a custom array of variables rather than $_GET Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/pkgfuncs.inc | 78 +++++++++++++++++----------------- web/template/pkg_search_results.php | 24 +++++----- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 740d786..0c0b56c 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -655,22 +655,22 @@ function pkg_search_page($SID="") { // sanitize paging variables // - if (isset($_REQUEST['O'])) { - $O = intval($_REQUEST['O']); - if ($O < 0) - $O = 0; + if (isset($_GET['O'])) { + $_GET['O'] = intval($_GET['O']); + if ($_GET['O'] < 0) + $_GET['O'] = 0; } else { - $O = 0; + $_GET['O'] = 0; } - if (isset($_REQUEST["PP"])) { - $PP = intval($_REQUEST["PP"]); - if ($PP < 25) - $PP = 25; - else if ($PP > 100) - $PP = 100; + if (isset($_GET["PP"])) { + $_GET["PP"] = intval($_GET["PP"]); + if ($_GET["PP"] < 25) + $_GET["PP"] = 25; + else if ($_GET["PP"] > 100) + $_GET["PP"] = 100; } else { - $PP = 25; + $_GET["PP"] = 25; } include('../template/pkg_search_form.php'); @@ -707,83 +707,83 @@ function pkg_search_page($SID="") { // TODO: possibly do string matching on category and // location to make request variable values more sensible - if (intval($_REQUEST["L"])) { - $q .= "AND Packages.LocationID = ".intval($_REQUEST["L"])." "; + if (intval($_GET["L"])) { + $q .= "AND Packages.LocationID = ".intval($_GET["L"])." "; } - if (intval($_REQUEST["C"])) { - $q.= "AND Packages.CategoryID = ".intval($_REQUEST["C"])." "; + if (intval($_GET["C"])) { + $q.= "AND Packages.CategoryID = ".intval($_GET["C"])." "; } - if ($_REQUEST['K']) { - $K = mysql_real_escape_string(trim($_REQUEST['K'])); + if ($_GET['K']) { + $_GET['K'] = mysql_real_escape_string(trim($_GET['K'])); //search by maintainer - if ($_REQUEST["SeB"] == "m"){ - $q.= "AND Users.Username = '".$K."' "; - } elseif ($_REQUEST["SeB"] == "s") { + if ($_GET["SeB"] == "m"){ + $q.= "AND Users.Username = '".$_GET['K']."' "; + } elseif ($_GET["SeB"] == "s") { // FIXME: this shouldn't be making 2 queries // kill the call to uid_from_username - $q.= "AND SubmitterUID = ".uid_from_username($_REQUEST['K'])." "; + $q.= "AND SubmitterUID = ".uid_from_username($_GET['K'])." "; // the default behavior, query the name/description } else { - $q.= "AND (Name LIKE '%".$K."%' OR "; - $q.= "Description LIKE '%".$K."%') "; + $q.= "AND (Name LIKE '%".$_GET['K']."%' OR "; + $q.= "Description LIKE '%".$_GET['K']."%') "; } } - if ($_REQUEST["do_Orphans"]) { + if ($_GET["do_Orphans"]) { $q.= "AND MaintainerUID = 0 "; } - $order = $_REQUEST["SO"] == 'd' ? 'DESC' : 'ASC'; + $order = $_GET["SO"] == 'd' ? 'DESC' : 'ASC'; - switch ($_REQUEST["SB"]) { + switch ($_GET["SB"]) { case 'c': $q.= "ORDER BY CategoryID ".$order.", Name ASC, LocationID ASC "; - $SB = 'c'; + $_GET["SB"] = 'c'; break; case 'l': $q.= "ORDER BY LocationID ".$order.", Name ASC, CategoryID DESC "; - $SB = 'l'; + $_GET["SB"] = 'l'; break; case 'v': $q.= "ORDER BY NumVotes ".$order.", Name ASC, CategoryID DESC "; - $SB = 'v'; + $_GET["SB"] = 'v'; break; case 'm': $q.= "ORDER BY Maintainer ".$order.", Name ASC, LocationID ASC "; - $SB = 'm'; + $_GET["SB"] = 'm'; break; case 'a': $q.= "ORDER BY GREATEST(SubmittedTS,ModifiedTS) ".$order.", Name ASC, LocationID ASC "; - $SB = 'a'; + $_GET["SB"] = 'a'; break; default: $q.= "ORDER BY Name ".$order.", LocationID ASC, CategoryID DESC "; break; } - $q.= "LIMIT ".$O.", ".$PP; + $q.= "LIMIT ".$_GET["O"].", ".$_GET["PP"]; $result = db_query($q, $dbh); $total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0); if ($result && $total > 0) { - if ($_REQUEST["SO"] == "d"){ + if ($_GET["SO"] == "d"){ $SO_next="a"; - $SO = 'd'; + $_GET["SO"] = 'd'; } else { $SO_next="d"; - $SO = 'a'; + $_GET["SO"] = 'a'; } } // figure out the results to use - $first = $O + 1; + $first = $_GET['O'] + 1; - if (($PP+$O) > $total) { + if (($_GET['PP']+$_GET['O']) > $total) { $last = $total; } else { - $last = $PP + $O; + $last = $_GET['PP'] + $_GET['O']; } include('pkg_search_results.php'); diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 12b32a1..a1cb038 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -1,6 +1,6 @@ <?php # Encode search string -$K = urlencode($K); +$_GET['K'] = urlencode($_GET['K']); ?> <form action='packages.php?<?php print $_SERVER['QUERY_STRING'] ?>' method='post'> <center> @@ -26,16 +26,16 @@ $K = urlencode($K); <th style='border-bottom: #666 1px solid; vertical-align: bottom'> </th> <?php endif; ?> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=l&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Location")."</a>"; ?> + <a href='?<?php print mkurl('SB=l&SO=' . $SO_next) ?>'><?php print __("Location") ?></a> </span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=c&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Category")."</a>"; ?> + <a href='?<?php print mkurl('SB=c&SO=' . $SO_next) ?>'><?php print __("Category") ?></a> </span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=n&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Name")."</a>"; ?> + <a href='?<?php print mkurl('SB=n&SO=' . $SO_next) ?>'><?php print __("Name") ?></a> </span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=v&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Votes")."</a>"; ?> + <a href='?<?php print mkurl('SB=v&SO=' . $SO_next) ?>'><?php print __("Votes") ?></a> </span></th> <?php if ($SID): ?> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted") ?></span></th> @@ -43,7 +43,7 @@ $K = urlencode($K); <?php endif; ?> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Description") ?></a></span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=m&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Maintainer")."</a>"; ?> + <a href='?<?php print mkurl('SB=m&SO=' . $SO_next) ?>'><?php print __("Maintainer") ?></a> </span></th> </tr> @@ -125,15 +125,15 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { </tr> <tr> <td align='left'> - <?php if (($O-$PP) >= 0): ?> - <?php print "<a href='packages.php?O=" . ($O - $PP) . "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>" ?> - <?php elseif ($O<$PP && $O>0): ?> - <?php print "<a href='packages.php?O=0&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>" ?> + <?php if (($_GET['O'] - $_GET['PP']) >= 0): ?> + <a href="packages.php?<?php print mkurl('O=' . ($_GET['O'] - $_GET['PP'])) ?>"><?php print __("Less") ?></a> + <?php elseif ($_GET['O']<$_GET['PP'] && $_GET['O']>0): ?> + <a href="packages.php?<?php print mkurl('O=0') ?>"><?php print __("Less") ?></a> <?php endif; ?> </td> <td align='right'> - <?php if ($total - $PP - $O > 0): ?> - <?php print "<a href='packages.php?O=" . ($O + $PP) . "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"]) . "&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"] . "&do_Orphans=".$_REQUEST["do_Orphans"]."'>" . __("More") . "</a>" ?> + <?php if ($total - $_GET['PP'] - $_GET['O'] > 0): ?> + <a href='packages.php?<?php print mkurl('O=' . ($_GET['O'] + $_GET['PP'])) ?>'><?php print __("More") ?></a> <?php endif; ?> </td> </tr> -- 1.6.0.2

1 2

[aur-dev] [PATCH] Make search page use mkurl function, change variables around
by Callan Barrett 22 Dec '08

22 Dec '08

Changed all the normal variables to their $_GET counterparts so everything is destructively changing the original variables, there should be no issue with this. If there I guess we need to consider making mkurl use a custom array of variables rather than $_GET Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/pkgfuncs.inc | 72 +++++++++++++++++----------------- web/template/pkg_search_results.php | 24 ++++++------ 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 740d786..6941215 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -655,22 +655,22 @@ function pkg_search_page($SID="") { // sanitize paging variables // - if (isset($_REQUEST['O'])) { - $O = intval($_REQUEST['O']); - if ($O < 0) - $O = 0; + if (isset($_GET['O'])) { + $_GET['O'] = intval($_GET['O']); + if ($_GET['O'] < 0) + $_GET['O'] = 0; } else { - $O = 0; + $_GET['O'] = 0; } - if (isset($_REQUEST["PP"])) { - $PP = intval($_REQUEST["PP"]); - if ($PP < 25) - $PP = 25; - else if ($PP > 100) - $PP = 100; + if (isset($_GET["PP"])) { + $_GET["PP"] = intval($_GET["PP"]); + if ($_GET["PP"] < 25) + $_GET["PP"] = 25; + else if ($_GET["PP"] > 100) + $_GET["PP"] = 100; } else { - $PP = 25; + $_GET["PP"] = 25; } include('../template/pkg_search_form.php'); @@ -707,22 +707,22 @@ function pkg_search_page($SID="") { // TODO: possibly do string matching on category and // location to make request variable values more sensible - if (intval($_REQUEST["L"])) { - $q .= "AND Packages.LocationID = ".intval($_REQUEST["L"])." "; + if (intval($_GET["L"])) { + $q .= "AND Packages.LocationID = ".intval($_GET["L"])." "; } - if (intval($_REQUEST["C"])) { - $q.= "AND Packages.CategoryID = ".intval($_REQUEST["C"])." "; + if (intval($_GET["C"])) { + $q.= "AND Packages.CategoryID = ".intval($_GET["C"])." "; } - if ($_REQUEST['K']) { - $K = mysql_real_escape_string(trim($_REQUEST['K'])); + if ($_GET['K']) { + $_GET['K'] = mysql_real_escape_string(trim($_GET['K'])); //search by maintainer - if ($_REQUEST["SeB"] == "m"){ + if ($_GET["SeB"] == "m"){ $q.= "AND Users.Username = '".$K."' "; - } elseif ($_REQUEST["SeB"] == "s") { + } elseif ($_GET["SeB"] == "s") { // FIXME: this shouldn't be making 2 queries // kill the call to uid_from_username - $q.= "AND SubmitterUID = ".uid_from_username($_REQUEST['K'])." "; + $q.= "AND SubmitterUID = ".uid_from_username($_GET['K'])." "; // the default behavior, query the name/description } else { $q.= "AND (Name LIKE '%".$K."%' OR "; @@ -730,60 +730,60 @@ function pkg_search_page($SID="") { } } - if ($_REQUEST["do_Orphans"]) { + if ($_GET["do_Orphans"]) { $q.= "AND MaintainerUID = 0 "; } - $order = $_REQUEST["SO"] == 'd' ? 'DESC' : 'ASC'; + $order = $_GET["SO"] == 'd' ? 'DESC' : 'ASC'; - switch ($_REQUEST["SB"]) { + switch ($_GET["SB"]) { case 'c': $q.= "ORDER BY CategoryID ".$order.", Name ASC, LocationID ASC "; - $SB = 'c'; + $_GET["SB"] = 'c'; break; case 'l': $q.= "ORDER BY LocationID ".$order.", Name ASC, CategoryID DESC "; - $SB = 'l'; + $_GET["SB"] = 'l'; break; case 'v': $q.= "ORDER BY NumVotes ".$order.", Name ASC, CategoryID DESC "; - $SB = 'v'; + $_GET["SB"] = 'v'; break; case 'm': $q.= "ORDER BY Maintainer ".$order.", Name ASC, LocationID ASC "; - $SB = 'm'; + $_GET["SB"] = 'm'; break; case 'a': $q.= "ORDER BY GREATEST(SubmittedTS,ModifiedTS) ".$order.", Name ASC, LocationID ASC "; - $SB = 'a'; + $_GET["SB"] = 'a'; break; default: $q.= "ORDER BY Name ".$order.", LocationID ASC, CategoryID DESC "; break; } - $q.= "LIMIT ".$O.", ".$PP; + $q.= "LIMIT ".$_GET["O"].", ".$_GET["PP"]; $result = db_query($q, $dbh); $total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0); if ($result && $total > 0) { - if ($_REQUEST["SO"] == "d"){ + if ($_GET["SO"] == "d"){ $SO_next="a"; - $SO = 'd'; + $_GET["SO"] = 'd'; } else { $SO_next="d"; - $SO = 'a'; + $_GET["SO"] = 'a'; } } // figure out the results to use - $first = $O + 1; + $first = $_GET['O'] + 1; - if (($PP+$O) > $total) { + if (($_GET['PP']+$_GET['O']) > $total) { $last = $total; } else { - $last = $PP + $O; + $last = $_GET['PP'] + $_GET['O']; } include('pkg_search_results.php'); diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 12b32a1..a1cb038 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -1,6 +1,6 @@ <?php # Encode search string -$K = urlencode($K); +$_GET['K'] = urlencode($_GET['K']); ?> <form action='packages.php?<?php print $_SERVER['QUERY_STRING'] ?>' method='post'> <center> @@ -26,16 +26,16 @@ $K = urlencode($K); <th style='border-bottom: #666 1px solid; vertical-align: bottom'> </th> <?php endif; ?> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=l&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Location")."</a>"; ?> + <a href='?<?php print mkurl('SB=l&SO=' . $SO_next) ?>'><?php print __("Location") ?></a> </span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=c&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Category")."</a>"; ?> + <a href='?<?php print mkurl('SB=c&SO=' . $SO_next) ?>'><?php print __("Category") ?></a> </span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=n&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Name")."</a>"; ?> + <a href='?<?php print mkurl('SB=n&SO=' . $SO_next) ?>'><?php print __("Name") ?></a> </span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=v&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Votes")."</a>"; ?> + <a href='?<?php print mkurl('SB=v&SO=' . $SO_next) ?>'><?php print __("Votes") ?></a> </span></th> <?php if ($SID): ?> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted") ?></span></th> @@ -43,7 +43,7 @@ $K = urlencode($K); <?php endif; ?> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Description") ?></a></span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=m&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Maintainer")."</a>"; ?> + <a href='?<?php print mkurl('SB=m&SO=' . $SO_next) ?>'><?php print __("Maintainer") ?></a> </span></th> </tr> @@ -125,15 +125,15 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { </tr> <tr> <td align='left'> - <?php if (($O-$PP) >= 0): ?> - <?php print "<a href='packages.php?O=" . ($O - $PP) . "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>" ?> - <?php elseif ($O<$PP && $O>0): ?> - <?php print "<a href='packages.php?O=0&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>" ?> + <?php if (($_GET['O'] - $_GET['PP']) >= 0): ?> + <a href="packages.php?<?php print mkurl('O=' . ($_GET['O'] - $_GET['PP'])) ?>"><?php print __("Less") ?></a> + <?php elseif ($_GET['O']<$_GET['PP'] && $_GET['O']>0): ?> + <a href="packages.php?<?php print mkurl('O=0') ?>"><?php print __("Less") ?></a> <?php endif; ?> </td> <td align='right'> - <?php if ($total - $PP - $O > 0): ?> - <?php print "<a href='packages.php?O=" . ($O + $PP) . "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"]) . "&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"] . "&do_Orphans=".$_REQUEST["do_Orphans"]."'>" . __("More") . "</a>" ?> + <?php if ($total - $_GET['PP'] - $_GET['O'] > 0): ?> + <a href='packages.php?<?php print mkurl('O=' . ($_GET['O'] + $_GET['PP'])) ?>'><?php print __("More") ?></a> <?php endif; ?> </td> </tr> -- 1.6.0.2

1 1

[aur-dev] [PATCH] Add search bar to index and pkg details pages
by Callan Barrett 22 Dec '08

22 Dec '08

Also changed it around a little bit so it's not tied down the search results function Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/index.php | 2 ++ web/html/packages.php | 1 + web/template/pkg_search_form.php | 16 +++++++++------- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index e2c840a..5511d7e 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -12,6 +12,8 @@ include_lang('pkgfuncs_po.inc'); html_header( __("Home") ); +include('pkg_search_form.php'); + $dbh = db_connect(); ?> diff --git a/web/html/packages.php b/web/html/packages.php index 90ab72c..9805ee2 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -64,6 +64,7 @@ if ($output): endif; if (isset($_GET["ID"])) { + include('pkg_search_form.php'); if (!intval($_GET["ID"])) { print __("Error trying to retrieve package details.")."<br />\n"; } else { diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index edc8b38..952d45a 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -1,3 +1,5 @@ +<?php include_once('pkgfuncs.inc') ?> + <form action='packages.php' method='get'> <input type='hidden' name='O' value='0'> <center> @@ -13,7 +15,7 @@ <label><?php print __("Keywords"); ?></label> <input type='text' name='K' size='20' value="<?php print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); ?>" maxlength='35' /> <?php if (!$_GET['detail']): ?><input type='submit' style='width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' /><?php endif; ?> - <a href="packages.php?<?php print mkurl('detail=' . (($_GET['detail']) ? 0 : 1) ) ?>">Advanced</a> + <a href="?<?php print mkurl('detail=' . (($_GET['detail']) ? 0 : 1) ) ?>">Advanced</a> <?php if ($_GET['detail']): ?> <div id="advanced"> <input type="hidden" name="detail" value="1" /> @@ -23,15 +25,15 @@ <select name='L'> <option value=0><?php print __("Any"); ?></option> <?php - while (list($id, $loc) = each($locs)): - if (intval($_REQUEST["L"]) == $id): + foreach (pkgLocations() as $id => $loc): + if (intval($_GET["L"]) == $id): ?> <option value="<?php print $id; ?>" selected="selected"><?php print $loc; ?></option> <?php else: ?> <option value="<?php print $id; ?>"><?php print $loc; ?></option> <?php endif; - endwhile; + endforeach; ?> </select> </li> @@ -40,15 +42,15 @@ <select name='C'> <option value='0'><?php print __("Any"); ?></option> <?php - while (list($id, $cat) = each($cats)): - if (intval($_REQUEST["C"]) == $id): + foreach (pkgCategories() as $id => $cat): + if (intval($_GET["C"]) == $id): ?> <option value="<?php print $id ?>" selected="selected"><?php print $cat; ?></option> <?php else: ?> <option value="<?php print $id ?>"><?php print $cat; ?></option> <?php endif; - endwhile; + endforeach; ?> </select> </li> -- 1.6.0.2

1 0