Move package merging to a separate page

Package actions now have a separate box on the package details page. Add
a package merge link in that box.

Link leads to a new page (pkgmerge.php) that can be used to confirm package
merging. A separate page with confirmation is used to avoid CSRFs.

Signed-off-by: canyonknight <canyonknight@gmail.com>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
canyonknight 2012-09-27 17:03:50 -04:00 committed by Lukas Fleischer
parent 00cffd7ddb
commit 752c5a6e34
3 changed files with 51 additions and 0 deletions

View file

@ -46,6 +46,9 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
case "delete":
include('pkgdel.php');
return;
case "merge":
include('pkgmerge.php');
return;
}
if (isset($_COOKIE['AURSID'])) {