- Aur-dev - lists.archlinux.org

[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

[aur-dev] [PATCH] Add function to generate clean urls
by Callan Barrett 22 Dec '08

22 Dec '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/aur.inc | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index e82f0ea..c62f5fb 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -438,3 +438,37 @@ function uid_from_username($username="") return $row[0]; } +/** + * Generate clean url with edited/added user values + * + * Makes a clean string of variables for use in URLs based on current $_GET and + * list of values to edit/add to that. Any empty variables are discarded. + * + * ex. print "http://example.com/test.php?" . mkurl("foo=bar&bar=baz") + * + * @param string $append string of variables and values formatted as in URLs + * ex. mkurl("foo=bar&bar=baz") + * @return string clean string of variables to append to URL, urlencoded + * @author Callan Barrett + */ +function mkurl($append) { + $get = $_GET; + $append = explode('&', $append); + $uservars = array(); + $out = ''; + + foreach ($append as $i) { + $ex = explode('=', $i); + $uservars[$ex[0]] = $ex[1]; + } + + foreach ($uservars as $k => $v) { $get[$k] = $v; } + + foreach ($get as $k => $v) { + if ($v !== '') { + $out .= '&' . urlencode($k) . '=' . urlencode($v); + } + } + + return substr($out, 5); +} -- 1.6.0.2

1 0

[aur-dev] [PATCH] Don't require login to see out of date packages from package search.
by Loui Chang 22 Dec '08

22 Dec '08

Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/template/pkg_search_results.php | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 2087abc..12b32a1 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -47,9 +47,13 @@ $K = urlencode($K); </span></th> </tr> -<?php for ($i=0; $row = mysql_fetch_assoc($result); $i++) { (($i % 2) == 0) ? $c = "data1" : $c = "data2"; ?> +<?php +for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { + (($i % 2) == 0) ? $c = "data1" : $c = "data2"; + if ($row["OutOfDate"]): $c = "outofdate"; endif; +?> <tr> - <?php if ($SID): if ($row["OutOfDate"]): $c = "outofdate"; endif; ?> + <?php if ($SID): ?> <td class='<?php print $c ?>'><input type='checkbox' name='IDs[<?php print $row["ID"] ?>]' value='1'></td> <?php endif; ?> <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row["Location"] ?></span></span></td> @@ -114,10 +118,9 @@ $K = urlencode($K); <?php print __("Showing results %s - %s of %s", $first, $last, $total) ?> </span></span></td></tr> <td colspan='2' align='center'> - <span class='f5'> - <?php if ($SID): ?> - <span class="outofdate"><?php print __("Out of Date") ?></span>     - <?php endif; ?> + <span class='f3'> + <?php echo __('Legend') ?> + <span class="outofdate"><?php print __('Out of Date') ?></span> </span></td> </tr> <tr> -- 1.6.0.5

2 3

[aur-dev] [PATCH] Encode search string for use in anchor tags.
by Loui Chang 22 Dec '08

22 Dec '08

Sorting, and viewing more results resets the search if you search for '#' in 1.5.3. This should fix that bug. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/template/pkg_search_results.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 5af02ef..2087abc 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -1,3 +1,7 @@ +<?php +# Encode search string +$K = urlencode($K); +?> <form action='packages.php?<?php print $_SERVER['QUERY_STRING'] ?>' method='post'> <center> -- 1.6.0.5

2 3

[aur-dev] [PATCH] Make some translatable strings friendlier to common usage.
by Loui Chang 22 Dec '08

22 Dec '08

Removing trailing colons and whitespace makes them more usable. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/html/addvote.php | 6 +++--- web/template/tu_details.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/html/addvote.php b/web/html/addvote.php index a31a1ff..5c1ff33 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -68,15 +68,15 @@ if ($atype == "Trusted User" OR $atype == "Developer") { <p><?php print __("Submit a proposal to vote on.") ?></p> <?php if (!empty($error)) { print $error . "<br />"; } ?> <form action='addvote.php' method='post'> -<b><?php print __("Applicant/TU:") ?></b> +<b><?php print __('Applicant/TU') ?></b> <input type='text' name='user' value='<?php if (!empty($_POST['user'])) { print htmlentities($_POST['user'], ENT_QUOTES); } ?>'> <?php print __("(empty if not applicable)") ?> <br /> -<b><?php print __("Length in days:") ?></b> +<b><?php print __('Length in days') ?></b> <input type='text' name='length' value='<?php if (!empty($_POST['length'])) { print htmlentities($_POST['length'], ENT_QUOTES); } ?>'> <?php print __("(defaults to 7 if empty)") ?> <br /> -<b><?php print __("Proposal:") ?></b><br /> +<b><?php print __('Proposal') ?></b><br /> <textarea name='agenda' rows='10' cols='50'><?php if (!empty($_POST['agenda'])) { print htmlentities($_POST['agenda']); } ?></textarea><br /> <input type='hidden' name='addVote' value='1'> <input type='submit' class='button' value='Submit'> diff --git a/web/template/tu_details.php b/web/template/tu_details.php index b1d69f6..7fc9f09 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -4,8 +4,8 @@ <?php if ($isrunning == 1) { ?> <div style='text-align: center; font-weight: bold; color: red'><?php print __("This vote is still running.") ?></div> <br /> -<?php } ?> -User: <b> +<?php } +echo __('User') ?>: <b> <?php if (!empty($row['User'])) { ?> <a href='packages.php?K=<?php print $row['User'] ?>&SeB=m'><?php print $row['User'] ?></a> <?php } else { ?> @@ -13,7 +13,7 @@ N/A <?php } ?> </b><br /> <?php print __("Submitted: %s by %s", "<b>" . gmdate("r", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?><br /> -<?php print __("End: ") ?><b><?php print gmdate("r", $row['End']) ?></b><br /><br /> +<?php print __('End') ?>: <b><?php print gmdate("r", $row['End']) ?></b><br /><br /> <?php print str_replace("\n", "<br />\n", htmlentities($row['Agenda'])) ?><br /><br /> <center> <table cellspacing='3' class='boxSoft' style='width: 50%'> @@ -26,7 +26,7 @@ N/A <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Abstain") ?></span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Total") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted?") ?></span></th> +<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __('Voted') ?></span></th> </tr> <tr> <td class='data1'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td> -- 1.6.0.5

3 3

[aur-dev] [PATCH] Really make all web paths relative.
by Loui Chang 22 Dec '08

22 Dec '08

I forgot about the forms. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/html/pkgedit.php | 6 ++---- web/html/pkgsubmit.php | 2 +- web/lib/acctfuncs.inc | 8 ++++---- web/template/pkg_search_form.php | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php index ff82663..2296470 100644 --- a/web/html/pkgedit.php +++ b/web/html/pkgedit.php @@ -8,7 +8,6 @@ include_lang("pkgedit_po.inc"); # i18n translations for this script set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in html_header(); # print out the HTML header -$svn_idstr = "\$Id$"; # Make sure this visitor is logged in # @@ -102,7 +101,7 @@ if ($_REQUEST["add_Comment"]) { # Prompt visitor for comment # print "<div align='center'>\n"; - print "<form action='/pkgedit.php' method='post'>\n"; + print "<form action='pkgedit.php' method='post'>\n"; print "<input type='hidden' name='add_Comment' value='1'>\n"; print "<input type='hidden' name='ID' value=\"".$_REQUEST["ID"]."\">\n"; print __("Enter your comment below.")."<br /> <br />\n"; @@ -143,7 +142,7 @@ if ($_REQUEST["change_Category"]) { if ($result != NULL) { $catid = mysql_fetch_row($result); } - print "<form action='/pkgedit.php' method='post'>\n"; + print "<form action='pkgedit.php' method='post'>\n"; print "<input type='hidden' name='change_Category' value='1'>\n"; print "<input type='hidden' name='ID' value=\"".$_REQUEST["ID"]."\">\n"; print __("Select new category").": \n"; @@ -170,4 +169,3 @@ print __("You've found a bug if you see this....")."<br />\n"; html_footer(AUR_VERSION); -?> diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index a3949ed..257e3b5 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -415,7 +415,7 @@ html_header("Submit"); $pkg_locations = pkgLocations(); ?> -<form action='/pkgsubmit.php' method='post' enctype='multipart/form-data'> +<form action='pkgsubmit.php' method='post' enctype='multipart/form-data'> <input type='hidden' name='pkgsubmit' value='1' /> <table border='0' cellspacing='5'> <tr> diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc index 959ae4a..1ee2d9e 100644 --- a/web/lib/acctfuncs.inc +++ b/web/lib/acctfuncs.inc @@ -21,7 +21,7 @@ function display_account_form($UTYPE,$A,$U="",$T="",$S="", global $SUPPORTED_LANGS; - print "<form action='/account.php' method='post'>\n"; + print "<form action='account.php' method='post'>\n"; print "<input type='hidden' name='Action' value='".$A."'>\n"; if ($UID) { print "<input type='hidden' name='ID' value='".$UID."'>\n"; @@ -491,7 +491,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", # print " </span></td>"; } else { - $edit_url = "/account.php?Action=DisplayAccount&ID=".$row["ID"]; + $edit_url = "account.php?Action=DisplayAccount&ID=".$row["ID"]; print "<a href='".$edit_url . "'>"; print "Edit</a></span></td>"; } @@ -503,7 +503,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", print "<tr>"; print "<td align='left'>"; - print "<form action='/account.php' method='post'>\n"; + print "<form action='account.php' method='post'>\n"; print "<input type='hidden' name='Action' value='SearchAccounts'>\n"; print "<input type='hidden' name='O'"; print " value='".($OFFSET-$HITS_PER_PAGE)."'>\n"; @@ -517,7 +517,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", print "</form>\n"; print "</td>"; print "<td align='right'>"; - print "<form action='/account.php' method='post'>\n"; + print "<form action='account.php' method='post'>\n"; print "<input type='hidden' name='Action' value='SearchAccounts'>\n"; print "<input type='hidden' name='O'"; print " value='".($OFFSET+$HITS_PER_PAGE)."'>\n"; diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 5478cdb..f74e736 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -1,4 +1,4 @@ -<form action='/packages.php' method='get'> +<form action='packages.php' method='get'> <input type='hidden' name='O' value='0'> <center> -- 1.6.0.5

2 1

[aur-dev] [PATCH] Modify and fix typos in comment notification email.
by Loui Chang 22 Dec '08

22 Dec '08

Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/html/pkgedit.php | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php index ff82663..3c61a59 100644 --- a/web/html/pkgedit.php +++ b/web/html/pkgedit.php @@ -91,11 +91,14 @@ if ($_REQUEST["add_Comment"]) { #TODO: native language emails for users, based on their prefs # Simply making these strings translatable won't work, users would be # getting emails in the language that the user who posted the comment was in - $body = "A comment has been added to ".$row['Name']." by " . username_from_sid($_COOKIE["AURSID"]) . ", you may view it at:\nhttp://aur.archlinux.org/packages.php?ID=".$_REQUEST["ID"]."\n\n\"" . $_POST['comment'] . "\"\n\n---\nYou received this e-mail because you chose to receive notifications of new comments on this package, if you no longer wish to recieve notifications about this package, please go the the above package page and click the UnNotify button."; + $body = "\nAuthor: " . username_from_sid($_COOKIE["AURSID"]) + . "\nFrom http://aur.archlinux.org/packages.php?ID=" + . $_REQUEST["ID"]."\n\n" . $_POST['comment'] + . "\n\n---\nIf you no longer wish to receive notifications about this package, please go the the above package page and click the UnNotify button."; $body = wordwrap($body, 70); $bcc = implode(', ', $bcc); - $headers = "Bcc: $bcc\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; - @mail(' ', "AUR Comment Notification for ".$row['Name'], $body, $headers); + $headers = "Bcc: $bcc\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: AUR\n"; + @mail(' ', "AUR Comment for ".$row['Name'], $body, $headers); } } else { -- 1.6.0.5

2 1