summaryrefslogtreecommitdiffstats
path: root/web/template
diff options
context:
space:
mode:
authorelij <elij.mx@gmail.com>2011-05-12 01:17:12 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2011-05-17 10:43:42 +0200
commit0898f1447a2d6bdc893f55f4718f867734841361 (patch)
tree22ab9736ad4b92af12daeb3a5215b126c3a8c22c /web/template
parentd38f3460e55ad4e8486c63902f3b581684d6f188 (diff)
downloadaur-0898f1447a2d6bdc893f55f4718f867734841361.tar.gz
aur-0898f1447a2d6bdc893f55f4718f867734841361.tar.xz
test return value from db_query before assuming it is valid
make the sql query form consistent in usage by cleaning up instances where db_query's result was not inspected before attempting to fetch row data from the handle Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Diffstat (limited to 'web/template')
-rw-r--r--web/template/actions_form.php52
-rw-r--r--web/template/tu_list.php8
2 files changed, 36 insertions, 24 deletions
diff --git a/web/template/actions_form.php b/web/template/actions_form.php
index 45bc09bc..058002f8 100644
--- a/web/template/actions_form.php
+++ b/web/template/actions_form.php
@@ -8,39 +8,45 @@
#
$q = "SELECT * FROM PackageVotes WHERE UsersID = ". $uid;
$q.= " AND PackageID = ".$row["ID"];
- if (!mysql_num_rows(db_query($q, $dbh))) {
- echo " <input type='submit' class='button' name='do_Vote'";
- echo " value='".__("Vote")."' /> ";
- } else {
- echo "<input type='submit' class='button' name='do_UnVote'";
- echo " value='".__("UnVote")."' /> ";
+ $result = db_query($q, $dbh);
+ if ($result) {
+ if (!mysql_num_rows($result)) {
+ echo " <input type='submit' class='button' name='do_Vote'";
+ echo " value='".__("Vote")."' /> ";
+ } else {
+ echo "<input type='submit' class='button' name='do_UnVote'";
+ echo " value='".__("UnVote")."' /> ";
+ }
}
# Comment Notify Button
#
$q = "SELECT * FROM CommentNotify WHERE UserID = ". $uid;
$q.= " AND PkgID = ".$row["ID"];
- if (!mysql_num_rows(db_query($q, $dbh))) {
- echo "<input type='submit' class='button' name='do_Notify'";
- echo " value='".__("Notify")."' title='".__("New Comment Notification")."' /> ";
- } else {
- echo "<input type='submit' class='button' name='do_UnNotify'";
- echo " value='".__("UnNotify")."' title='".__("No New Comment Notification")."' /> ";
+ $result = db_query($q, $dbh);
+ if ($result) {
+ if (!mysql_num_rows($result)) {
+ echo "<input type='submit' class='button' name='do_Notify'";
+ echo " value='".__("Notify")."' title='".__("New Comment Notification")."' /> ";
+ } else {
+ echo "<input type='submit' class='button' name='do_UnNotify'";
+ echo " value='".__("UnNotify")."' title='".__("No New Comment Notification")."' /> ";
+ }
}
-if ($row["OutOfDateTS"] === NULL) {
- echo "<input type='submit' class='button' name='do_Flag'";
- echo " value='".__("Flag Out-of-date")."' />\n";
-} else {
- echo "<input type='submit' class='button' name='do_UnFlag'";
- echo " value='".__("UnFlag Out-of-date")."' />\n";
+ if ($row["OutOfDateTS"] === NULL) {
+ echo "<input type='submit' class='button' name='do_Flag'";
+ echo " value='".__("Flag Out-of-date")."' />\n";
+ } else {
+ echo "<input type='submit' class='button' name='do_UnFlag'";
+ echo " value='".__("UnFlag Out-of-date")."' />\n";
}
-if ($row["MaintainerUID"] === NULL) {
- echo "<input type='submit' class='button' name='do_Adopt'";
- echo " value='".__("Adopt Packages")."' />\n";
-} else if ($uid == $row["MaintainerUID"] ||
- $atype == "Trusted User" || $atype == "Developer") {
+ if ($row["MaintainerUID"] === NULL) {
+ echo "<input type='submit' class='button' name='do_Adopt'";
+ echo " value='".__("Adopt Packages")."' />\n";
+ } else if ($uid == $row["MaintainerUID"] ||
+ $atype == "Trusted User" || $atype == "Developer") {
echo "<input type='submit' class='button' name='do_Disown'";
echo " value='".__("Disown Packages")."' />\n";
}
diff --git a/web/template/tu_list.php b/web/template/tu_list.php
index 3a927d9a..75d9414e 100644
--- a/web/template/tu_list.php
+++ b/web/template/tu_list.php
@@ -40,7 +40,13 @@
<td class='<?php print $c ?>'>
<?php
$q = "SELECT * FROM TU_Votes WHERE VoteID = " . $row['ID'] . " AND UserID = " . uid_from_sid($_COOKIE["AURSID"]);
- $hasvoted = mysql_num_rows(db_query($q, $dbh));
+ $result_tulist = db_query($q, $dbh);
+ if ($result_tulist) {
+ $hasvoted = mysql_num_rows($result_tulist);
+ }
+ else {
+ $hasvoted = 0;
+ }
?>
<span class='f5'><span class='blue'>
<?php if ($hasvoted == 0) { ?>