From ada768ba2e27c78b79f8a6dbc1dd36bce91acde3 Mon Sep 17 00:00:00 2001
From: Graham Eames <grahamje@users.sourceforge.net>
Date: Thu, 13 Apr 2006 09:56:48 +0000
Subject: [PATCH] Cancel redirects you back to the beginning

git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@5782 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/admin/admin_ranks.php   | 9 +++++++++
 phpBB/admin/admin_smilies.php | 9 +++++++++
 phpBB/admin/admin_words.php   | 9 +++++++++
 3 files changed, 27 insertions(+)

diff --git a/phpBB/admin/admin_ranks.php b/phpBB/admin/admin_ranks.php
index 6d997a3b70..9000e18452 100644
--- a/phpBB/admin/admin_ranks.php
+++ b/phpBB/admin/admin_ranks.php
@@ -33,8 +33,17 @@ define('IN_PHPBB', 1);
 //
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
+
+$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+$no_page_header = $cancel;
+
 require('./pagestart.' . $phpEx);
 
+if ($cancel)
+{
+	redirect('admin/' . append_sid("admin_ranks.$phpEx", true));
+}
+
 if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 {
 	$mode = (isset($HTTP_GET_VARS['mode'])) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php
index a0af2e9b84..04bd501c84 100644
--- a/phpBB/admin/admin_smilies.php
+++ b/phpBB/admin/admin_smilies.php
@@ -49,8 +49,17 @@ if( isset($HTTP_GET_VARS['export_pack']) )
 
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
+
+$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+$no_page_header = $cancel;
+
 require('./pagestart.' . $phpEx);
 
+if ($cancel)
+{
+	redirect('admin/' . append_sid("admin_smilies.$phpEx", true));
+}
+
 //
 // Check to see what mode we should operate in.
 //
diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php
index 172c6ee14b..409f583dfc 100644
--- a/phpBB/admin/admin_words.php
+++ b/phpBB/admin/admin_words.php
@@ -34,8 +34,17 @@ define('IN_PHPBB', 1);
 //
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
+
+$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+$no_page_header = $cancel;
+
 require('./pagestart.' . $phpEx);
 
+if ($cancel)
+{
+	redirect('admin/' . append_sid("admin_words.$phpEx", true));
+}
+
 if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 {
 	$mode = (isset($HTTP_GET_VARS['mode'])) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];