external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add boolean return values to several pkg_*() functions

Browse source 
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>
This commit is contained in:
Lukas Fleischer 2013-08-27 11:18:20 +02:00
parent 86d2efaaa0
commit 23867a211c
2 changed files with 55 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

25
web/html/packages.php
View file

@ -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);
}
}