diff options
| author | Nils Adermann <naderman@naderman.de> | 2008-11-24 00:20:33 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2008-11-24 00:20:33 +0000 |
| commit | 07e9b83a3de0264916a058b9cf180b91b297604f (patch) | |
| tree | 386aed44943159d6634f74ee756c4073d5dbab19 /phpBB/includes/mcp/mcp_main.php | |
| parent | 8427ae3fd4bd0055931579d18cb9d43d69f72a90 (diff) | |
| download | forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar.gz forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar.bz2 forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar.xz forums-07e9b83a3de0264916a058b9cf180b91b297604f.zip | |
- updated all code to use the request class instead of any direct access to
super globals
- disabled super globals in common.php. See commit r9101 for
more information
- cleaned up/simplified a few lines along the way.
git-svn-id: file:///svn/phpbb/trunk@9102 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 4370228fb5..217ff7c896 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -576,21 +576,15 @@ function mcp_move_topic($topic_ids) } } } - else if (isset($_POST['confirm'])) + else if (request::is_set_post('confirm')) { $additional_msg = $user->lang['FORUM_NOT_EXIST']; } - if (!$to_forum_id || $additional_msg) - { - unset($_POST['confirm']); - unset($_REQUEST['confirm_key']); - } - - if (confirm_box(true)) + if ($to_forum_id && !$additional_msg && confirm_box(true)) { $topic_data = get_topic_data($topic_ids); - $leave_shadow = (isset($_POST['move_leave_shadow'])) ? true : false; + $leave_shadow = request::is_set_post('move_leave_shadow'); $topics_moved = sizeof($topic_ids); $topics_authed_moved = 0; @@ -789,7 +783,7 @@ function mcp_delete_topic($topic_ids) confirm_box(false, (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS', $s_hidden_fields); } - if (!isset($_REQUEST['quickmod'])) + if (!request::is_set('quickmod')) { $redirect = request_var('redirect', 'index.' . PHP_EXT); $redirect = reapply_sid($redirect); @@ -982,18 +976,12 @@ function mcp_fork_topic($topic_ids) } } } - else if (isset($_POST['confirm'])) + else if (request::is_set_post('confirm')) { $additional_msg = $user->lang['FORUM_NOT_EXIST']; } - if ($additional_msg) - { - unset($_POST['confirm']); - unset($_REQUEST['confirm_key']); - } - - if (confirm_box(true)) + if (!$additional_msg && confirm_box(true)) { $topic_data = get_topic_data($topic_ids, 'f_post'); |