From d03f7a890f52505180ab19c350d1f610fc41a11d Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Wed, 16 Jul 2014 17:21:08 +0200 Subject: 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 Signed-off-by: Lukas Fleischer --- web/lib/pkgbasefuncs.inc.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'web/lib/pkgbasefuncs.inc.php') diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 176b144..0d6b22b 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); -- cgit v1.2.3-70-g09d2