summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2014-07-16 17:21:08 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2014-07-16 19:22:58 +0200
commitd03f7a890f52505180ab19c350d1f610fc41a11d (patch)
tree51df2edb13eea80f5c5cb5f1e3d0399926478eff /web
parente9b13cef3f73996ead4361b7f601c2c8f0cb36db (diff)
downloadaur-d03f7a890f52505180ab19c350d1f610fc41a11d.tar.gz
aur-d03f7a890f52505180ab19c350d1f610fc41a11d.tar.xz
Fix pkgbase_votes_from_name()
In 676595f (Prefix package functions with pkg_/pkgbase_, 2014-04-05), votes_for_pkgname() was renamed to pkgbase_votes_from_name() without changing the semantics. Slightly adapt the implementation and interpret the argument as a package base name instead of a package name. Also fix the call site. Reported-by: Felix Yan <felixonmars@gmail.com> Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Diffstat (limited to 'web')
-rw-r--r--web/html/voters.php8
-rw-r--r--web/lib/pkgbasefuncs.inc.php17
2 files changed, 13 insertions, 12 deletions
diff --git a/web/html/voters.php b/web/html/voters.php
index 8766fa73..b0753b96 100644
--- a/web/html/voters.php
+++ b/web/html/voters.php
@@ -1,11 +1,11 @@
<?php
set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
include_once('aur.inc.php');
-include_once('pkgfuncs.inc.php');
+include_once('pkgbasefuncs.inc.php');
$SID = $_COOKIE['AURSID'];
-$pkgname = htmlspecialchars($_GET['N']);
-$votes = pkgbase_votes_from_name($pkgname);
+$pkgbase_name = htmlspecialchars($_GET['N']);
+$votes = pkgbase_votes_from_name($pkgbase_name);
html_header(__("Voters"));
@@ -13,7 +13,7 @@ if (has_credential(CRED_PKGBASE_LIST_VOTERS)):
?>
<div class="box">
- <h2>Votes for <a href="<?= get_pkg_uri($pkgname); ?>"><?= $pkgname ?></a></h2>
+ <h2>Votes for <a href="<?= get_pkgbase_uri($pkgbase_name); ?>"><?= $pkgbase_name ?></a></h2>
<div class="boxbody">
<ul>
<?php while (list($indx, $row) = each($votes)): ?>
diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index 176b1448..0d6b22bf 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -683,19 +683,20 @@ function pkgbase_vote ($base_ids, $action=true) {
}
/**
- * Get all usernames and IDs that voted for a specific package
+ * Get all usernames and IDs that voted for a specific package base
*
- * @param string $pkgname The name of the package to retrieve votes for
+ * @param string $pkgbase_name The package base to retrieve votes for
*
- * @return array User IDs and usernames that voted for a specific package
+ * @return array User IDs and usernames that voted for a specific package base
*/
-function pkgbase_votes_from_name($pkgname) {
+function pkgbase_votes_from_name($pkgbase_name) {
$dbh = DB::connect();
- $q = "SELECT UsersID,Username,Name FROM PackageVotes ";
- $q.= "LEFT JOIN Users on (UsersID = Users.ID) ";
- $q.= "LEFT JOIN Packages on (PackageVotes.PackageBaseID = Packages.PackageBaseID) ";
- $q.= "WHERE Name = ". $dbh->quote($pkgname) . " ";
+ $q = "SELECT UsersID, Username, Name FROM PackageVotes ";
+ $q.= "LEFT JOIN Users ON UsersID = Users.ID ";
+ $q.= "LEFT JOIN PackageBases ";
+ $q.= "ON PackageVotes.PackageBaseID = PackageBases.ID ";
+ $q.= "WHERE PackageBases.Name = ". $dbh->quote($pkgbase_name) . " ";
$q.= "ORDER BY Username";
$result = $dbh->query($q);