From ba013ea84c6639c14ef7ed1fd62886f541a553eb Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 6 May 2003 16:41:21 +0000 Subject: [PATCH] fixed admin redirection error (/phpBB2/phpBB2). git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3987 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/pagestart.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/admin/pagestart.php b/phpBB/admin/pagestart.php index e562beb55d..acc1b85494 100644 --- a/phpBB/admin/pagestart.php +++ b/phpBB/admin/pagestart.php @@ -49,10 +49,12 @@ else if ($userdata['user_level'] != ADMIN) if ($HTTP_GET_VARS['sid'] != $userdata['session_id']) { - $url = preg_replace('/sid=([^&]*)(&?)/i', '', $HTTP_SERVER_VARS['REQUEST_URI']); + $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $HTTP_SERVER_VARS['REQUEST_URI']); + $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])), '', $url); + $url = str_replace('//', '/', $url); + $url = preg_replace('/sid=([^&]*)(&?)/i', '', $url); $url = preg_replace('/\?$/', '', $url); $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id']; - redirect($url); }