From 23867a211ce90d86938bea6a899d219cf8c08aab Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Tue, 27 Aug 2013 11:18:20 +0200
Subject: Add boolean return values to several pkg_*() functions

Change the return values of following functions to return both
error/success and an error/success message:

* pkg_flag()
* pkg_unflag()
* pkg_adopt()
* pkg_vote()
* pkg_delete()
* pkg_notify()
* pkg_delete_comment()
* pkg_change_category()

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 web/html/packages.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'web/html/packages.php')

diff --git a/web/html/packages.php b/web/html/packages.php
index b390d76..046a942 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -54,30 +54,31 @@ if (isset($_POST['IDs'])) {
 }
 
 # Determine what action to do
+$ret = false;
 $output = "";
 if (check_token()) {
 	if (current_action("do_Flag")) {
-		$output = pkg_flag($atype, $ids);
+		list($ret, $output) = pkg_flag($atype, $ids);
 	} elseif (current_action("do_UnFlag")) {
-		$output = pkg_unflag($atype, $ids);
+		list($ret, $output) = pkg_unflag($atype, $ids);
 	} elseif (current_action("do_Adopt")) {
-		$output = pkg_adopt($atype, $ids, true);
+		list($ret, $output) = pkg_adopt($atype, $ids, true);
 	} elseif (current_action("do_Disown")) {
-		$output = pkg_adopt($atype, $ids, False);
+		list($ret, $output) = pkg_adopt($atype, $ids, False);
 	} elseif (current_action("do_Vote")) {
-		$output = pkg_vote($atype, $ids, true);
+		list($ret, $output) = pkg_vote($atype, $ids, true);
 	} elseif (current_action("do_UnVote")) {
-		$output = pkg_vote($atype, $ids, False);
+		list($ret, $output) = pkg_vote($atype, $ids, False);
 	} elseif (current_action("do_Delete")) {
 		if (isset($_POST['confirm_Delete'])) {
 			if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) {
-				$output = pkg_delete($atype, $ids, NULL);
+				list($ret, $output) = pkg_delete($atype, $ids, NULL);
 				unset($_GET['ID']);
 			}
 			else {
 				$mergepkgid = pkgid_from_name($_POST['merge_Into']);
 				if ($mergepkgid) {
-					$output = pkg_delete($atype, $ids, $mergepkgid);
+					list($ret, $output) = pkg_delete($atype, $ids, $mergepkgid);
 					unset($_GET['ID']);
 				}
 				else {
@@ -89,13 +90,13 @@ if (check_token()) {
 			$output = __("The selected packages have not been deleted, check the confirmation checkbox.");
 		}
 	} elseif (current_action("do_Notify")) {
-		$output = pkg_notify($atype, $ids);
+		list($ret, $output) = pkg_notify($atype, $ids);
 	} elseif (current_action("do_UnNotify")) {
-		$output = pkg_notify($atype, $ids, False);
+		list($ret, $output) = pkg_notify($atype, $ids, False);
 	} elseif (current_action("do_DeleteComment")) {
-		$output = pkg_delete_comment($atype);
+		list($ret, $output) = pkg_delete_comment($atype);
 	} elseif (current_action("do_ChangeCategory")) {
-		$output = pkg_change_category($pkgid, $atype);
+		list($ret, $output) = pkg_change_category($pkgid, $atype);
 	}
 }
 
-- 
cgit v1.2.3-54-g00ecf