From 90e96e3728b727f2318fb119a2ca165e81b11608 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Sat, 3 Oct 2015 11:28:04 +0200
Subject: Redirect to details pages after performing actions

After performing a package base action on a separate page, return to the
corresponding package base details page.

Partly fixes FS#46545.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/html/pkgdel.php    | 2 +-
 web/html/pkgdisown.php | 2 +-
 web/html/pkgflag.php   | 2 +-
 web/html/pkgmerge.php  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/html/pkgdel.php b/web/html/pkgdel.php
index eb20967..c522e25 100644
--- a/web/html/pkgdel.php
+++ b/web/html/pkgdel.php
@@ -26,7 +26,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?>
 		<?= __('Deletion of a package is permanent. '); ?>
 		<?= __('Select the checkbox to confirm action.') ?>
 	</p>
-	<form action="<?= get_uri('/pkgbase/'); ?>" method="post">
+	<form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post">
 		<fieldset>
 			<input type="hidden" name="IDs[<?= $base_id ?>]" value="1" />
 			<input type="hidden" name="ID" value="<?= $base_id ?>" />
diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php
index 4842939..7ca6e6a 100644
--- a/web/html/pkgdisown.php
+++ b/web/html/pkgdisown.php
@@ -33,7 +33,7 @@ if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?>
 		<?= __('By selecting the checkbox, you confirm that you want to disown the package.') ?>
 		<?php endif; ?>
 	</p>
-	<form action="<?= get_uri('/pkgbase/'); ?>" method="post">
+	<form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post">
 		<fieldset>
 			<input type="hidden" name="IDs[<?= $base_id ?>]" value="1" />
 			<input type="hidden" name="ID" value="<?= $base_id ?>" />
diff --git a/web/html/pkgflag.php b/web/html/pkgflag.php
index bfe89e0..b1ca03b 100644
--- a/web/html/pkgflag.php
+++ b/web/html/pkgflag.php
@@ -27,7 +27,7 @@ if (has_credential(CRED_PKGBASE_FLAG)): ?>
 			'<strong>', '</strong>'); ?>
 		<?= __('Enter details on why the package is out-of-date below, preferably including links to the release announcement or the new release tarball.'); ?>
 	</p>
-	<form action="<?= get_uri('/pkgbase/'); ?>" method="post">
+	<form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post">
 		<fieldset>
 			<input type="hidden" name="IDs[<?= $base_id ?>]" value="1" />
 			<input type="hidden" name="ID" value="<?= $base_id ?>" />
diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php
index f6e951b..3511390 100644
--- a/web/html/pkgmerge.php
+++ b/web/html/pkgmerge.php
@@ -28,7 +28,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?>
 		<?= __('Enter the package name you wish to merge the package into. '); ?>
 		<?= __('Select the checkbox to confirm action.') ?>
 	</p>
-	<form action="<?= get_uri('/pkgbase/'); ?>" method="post">
+	<form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post">
 		<fieldset>
 			<input type="hidden" name="IDs[<?= $base_id ?>]" value="1" />
 			<input type="hidden" name="ID" value="<?= $base_id ?>" />
-- 
cgit v1.2.3-70-g09d2