summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcanyonknight <canyonknight@gmail.com>2012-05-23 21:18:36 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2012-07-06 11:26:50 +0200
commit09e50568e41a470093486dbd20f3aa4f4da08444 (patch)
tree3f268cccf8d4c3fe085d2c0fcbd762bffa7fafe9
parent091c2b5f5523773604699b914c19e6b02ce290bc (diff)
downloadaur-09e50568e41a470093486dbd20f3aa4f4da08444.tar.gz
aur-09e50568e41a470093486dbd20f3aa4f4da08444.tar.xz
voters.php: Pull out DB code
* Create new function in pkgfuncs.inc.php with SQL queries from voters.php * Centralization of DB code important in a future transition to PDO interface Signed-off-by: canyonknight <canyonknight@gmail.com> Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
-rw-r--r--web/html/voters.php15
-rw-r--r--web/lib/pkgfuncs.inc.php25
2 files changed, 27 insertions, 13 deletions
diff --git a/web/html/voters.php b/web/html/voters.php
index cf119a65..231e3230 100644
--- a/web/html/voters.php
+++ b/web/html/voters.php
@@ -3,14 +3,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
include('aur.inc.php');
include('pkgfuncs.inc.php');
-function getvotes($pkgid) {
- $dbh = db_connect();
- $pkgid = db_escape_string($pkgid);
-
- $result = db_query("SELECT UsersID,Username FROM PackageVotes LEFT JOIN Users on (UsersID = ID) WHERE PackageID = $pkgid ORDER BY Username", $dbh);
- return $result;
-}
-
$SID = $_COOKIE['AURSID'];
$pkgid = intval($_GET['ID']);
@@ -27,11 +19,8 @@ if ($atype == 'Trusted User' || $atype== 'Developer'):
<div class="boxbody">
<?php
- while ($row = mysql_fetch_assoc($votes)):
- $uid = $row['UsersID'];
- $username = $row['Username'];
-?>
- <a href="account.php?Action=AccountInfo&amp;ID=<?php echo $uid ?>"><?php echo htmlspecialchars($username) ?></a><br />
+ while (list($indx, $row) = each($votes)): ?>
+ <a href="account.php?Action=AccountInfo&amp;ID=<?php echo $row['UsersID'] ?>"><?php echo htmlspecialchars($row['Username']) ?></a><br />
<?php endwhile; ?>
</div>
</div>
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index 0d4fe8c8..5696321f 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -948,6 +948,31 @@ function pkg_vote ($atype, $ids, $action=true, $dbh=NULL) {
}
}
+# Get all usernames and ids for a specifc package id
+function getvotes($pkgid, $dbh=NULL) {
+ if(!$dbh) {
+ $dbh = db_connect();
+ }
+
+ $pkgid = db_escape_string($pkgid);
+
+ $q = "SELECT UsersID,Username FROM PackageVotes ";
+ $q.= "LEFT JOIN Users on (UsersID = ID) ";
+ $q.= "WHERE PackageID = ". $pkgid . " ";
+ $q.= "ORDER BY Username";
+ $result = db_query($q, $dbh);
+
+ if (!$result) {
+ return;
+ }
+
+ while ($row = mysql_fetch_assoc($result)) {
+ $votes[] = $row;
+ }
+
+ return $votes;
+}
+
/**
* Toggle notification of packages
*