From 752c5a6e3483b2309e4b48943adce2625a9bc716 Mon Sep 17 00:00:00 2001 From: canyonknight Date: Thu, 27 Sep 2012 17:03:50 -0400 Subject: 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 Signed-off-by: Lukas Fleischer --- web/html/index.php | 3 +++ web/html/pkgmerge.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 web/html/pkgmerge.php (limited to 'web/html') 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'])) { diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php new file mode 100644 index 00000000..834d0c91 --- /dev/null +++ b/web/html/pkgmerge.php @@ -0,0 +1,47 @@ + +
+

+

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

+
+
+ + + +

+

+

+

+

" />

+
+
+
+ +