diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-18 21:03:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-18 21:03:56 +0000 |
| commit | 3c02d5f2df00cecd6a0bc4a945ee3355bd423a81 (patch) | |
| tree | 0c2d02685fee117d7643e13e0aa4f9da1956000d /phpBB/includes/mcp/mcp_main.php | |
| parent | 7e25c8d9cc255fbe460c2a970ad7da241c0880bb (diff) | |
| download | forums-3c02d5f2df00cecd6a0bc4a945ee3355bd423a81.tar forums-3c02d5f2df00cecd6a0bc4a945ee3355bd423a81.tar.gz forums-3c02d5f2df00cecd6a0bc4a945ee3355bd423a81.tar.bz2 forums-3c02d5f2df00cecd6a0bc4a945ee3355bd423a81.tar.xz forums-3c02d5f2df00cecd6a0bc4a945ee3355bd423a81.zip | |
- fixing a few tiny bugs
- added new function to (re)apply sids where needed (login and mcp quickmod) - #1829
git-svn-id: file:///svn/phpbb/trunk@5931 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 5b7433a6a3..dc4df52f50 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -243,12 +243,8 @@ function lock_unlock($action, $ids) confirm_box(false, strtoupper($action) . '_' . $l_prefix . ((sizeof($ids) == 1) ? '' : 'S'), $s_hidden_fields); } - $redirect = request_var('redirect', "index.$phpEx$SID"); - - if (strpos($redirect, '?') === false) - { - $redirect = substr_replace($redirect, ".$phpEx$SID&", strpos($redirect, '&'), 1); - } + $redirect = request_var('redirect', "index.$phpEx"); + $redirect = reapply_sid($redirect); if (!$success_msg) { @@ -352,12 +348,8 @@ function change_topic_type($action, $topic_ids) confirm_box(false, $l_new_type, $s_hidden_fields); } - $redirect = request_var('redirect', "index.$phpEx$SID"); - - if (strpos($redirect, '?') === false) - { - $redirect = substr_replace($redirect, ".$phpEx$SID&", strpos($redirect, '&'), 1); - } + $redirect = request_var('redirect', "index.$phpEx"); + $redirect = reapply_sid($redirect); if (!$success_msg) { @@ -501,12 +493,8 @@ function mcp_move_topic($topic_ids) confirm_box(false, 'MOVE_TOPIC' . ((sizeof($topic_ids) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_move.html'); } - $redirect = request_var('redirect', "index.$phpEx$SID"); - - if (strpos($redirect, '?') === false) - { - $redirect = substr_replace($redirect, ".$phpEx$SID&", strpos($redirect, '&'), 1); - } + $redirect = request_var('redirect', "index.$phpEx"); + $redirect = reapply_sid($redirect); if (!$success_msg) { @@ -567,12 +555,8 @@ function mcp_delete_topic($topic_ids) confirm_box(false, (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS', $s_hidden_fields); } - $redirect = request_var('redirect', "index.$phpEx$SID"); - - if (strpos($redirect, '?') === false) - { - $redirect = substr_replace($redirect, ".$phpEx$SID&", strpos($redirect, '&'), 1); - } + $redirect = request_var('redirect', "index.$phpEx"); + $redirect = reapply_sid($redirect); if (!$success_msg) { @@ -690,12 +674,8 @@ function mcp_delete_post($post_ids) confirm_box(false, (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS', $s_hidden_fields); } - $redirect = request_var('redirect', "index.$phpEx$SID"); - - if (strpos($redirect, '?') === false) - { - $redirect = substr_replace($redirect, ".$phpEx$SID&", strpos($redirect, '&'), 1); - } + $redirect = request_var('redirect', "index.$phpEx"); + $redirect = reapply_sid($redirect); if (!$success_msg) { @@ -936,12 +916,8 @@ function mcp_fork_topic($topic_ids) confirm_box(false, 'FORK_TOPIC' . ((sizeof($topic_ids) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_move.html'); } - $redirect = request_var('redirect', "index.$phpEx$SID"); - - if (strpos($redirect, '?') === false) - { - $redirect = substr_replace($redirect, ".$phpEx$SID&", strpos($redirect, '&'), 1); - } + $redirect = request_var('redirect', "index.$phpEx"); + $redirect = reapply_sid($redirect); if (!$success_msg) { |