From 0b8c11a37ae9dbaa5ca4cf64204515db31ea2b3a Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 22 May 2015 16:53:27 +0200 Subject: Move package disowning to a separate page The disown link in the package actions box leads to a new page (pkgdisown.php) that can be used to confirm package disowning. Signed-off-by: Lukas Fleischer --- web/html/index.php | 4 ++-- web/html/pkgbase.php | 9 +++++++-- web/html/pkgdisown.php | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 web/html/pkgdisown.php diff --git a/web/html/index.php b/web/html/index.php index fad1d2f..0275d0a 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -45,8 +45,8 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { $_POST['do_Adopt'] = __('Adopt'); break; case "disown": - $_POST['do_Disown'] = __('Disown'); - break; + include('pkgdisown.php'); + return; case "vote": $_POST['do_Vote'] = __('Vote'); break; diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index ef9b2c4..7c24b79 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -54,8 +54,13 @@ if (check_token()) { } elseif (current_action("do_Adopt")) { list($ret, $output) = pkgbase_adopt($ids, true, NULL); } elseif (current_action("do_Disown")) { - $via = isset($_POST['via']) ? $_POST['via'] : NULL; - list($ret, $output) = pkgbase_adopt($ids, false, $via); + if (isset($_POST['confirm_Disown'])) { + $via = isset($_POST['via']) ? $_POST['via'] : NULL; + list($ret, $output) = pkgbase_adopt($ids, false, $via); + } else { + $output = __("The selected packages have not been disowned, check the confirmation checkbox."); + $ret = false; + } } elseif (current_action("do_Vote")) { list($ret, $output) = pkgbase_vote($ids, true); } elseif (current_action("do_UnVote")) { diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php new file mode 100644 index 0000000..cf7bb41 --- /dev/null +++ b/web/html/pkgdisown.php @@ -0,0 +1,55 @@ + +
+

+

+ ', htmlspecialchars($pkgbase_name), ''); ?> +

+
    + +
  • + +
+

+ 0 && !has_credential(CRED_PKGBASE_DISOWN)): ?> + ', $comaintainer_uids[0], ''); ?> + + + +

+
+
+ + + + + + +

+

+

" />

+
+
+
+ +