summaryrefslogtreecommitdiffstats
path: root/web/html/index.php
diff options
context:
space:
mode:
authorcanyonknight <canyonknight@gmail.com>2012-09-27 23:03:50 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2012-09-28 08:57:25 +0200
commit752c5a6e3483b2309e4b48943adce2625a9bc716 (patch)
tree418351bf207e460d2951fb719deb7f22a12afbf2 /web/html/index.php
parent00cffd7ddba6bd7b65fcd4c1ce625515cf5489d0 (diff)
downloadaur-752c5a6e3483b2309e4b48943adce2625a9bc716.tar.gz
aur-752c5a6e3483b2309e4b48943adce2625a9bc716.tar.xz
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>
Diffstat (limited to 'web/html/index.php')
-rw-r--r--web/html/index.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/web/html/index.php b/web/html/index.php
index 0b5dfc87..6ee23bc5 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -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'])) {