From 216772fc2054589b95de37f903705a03799bd477 Mon Sep 17 00:00:00 2001 From: Bart van Bragt Date: Tue, 27 Nov 2001 20:03:08 +0000 Subject: [PATCH] Check, check, double check :( Missed this one ;( git-svn-id: file:///svn/phpbb/trunk@1464 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/profile.php | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/phpBB/profile.php b/phpBB/profile.php index 00d729ad19..261da75ea1 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -1120,7 +1120,18 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; - $path = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? ( dirname($HTTP_SERVER_VARS['PATH_INFO']) == "/") ? "" : dirname($HTTP_SERVER_VARS['PATH_INFO']) ) : ( (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) ); + if( isset($HTTP_SERVER_VARS['PATH_INFO']) && dirname($HTTP_SERVER_VARS['PATH_INFO']) != '/') + { + $path = dirname($HTTP_SERVER_VARS['PATH_INFO']); + } + else if( dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) != '/') + { + $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); + } + else + { + $path = ''; + } $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://"; @@ -1689,7 +1700,18 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; - $path = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? ( dirname($HTTP_SERVER_VARS['PATH_INFO']) == "/") ? "" : dirname($HTTP_SERVER_VARS['PATH_INFO']) ) : ( (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) ); + if( isset($HTTP_SERVER_VARS['PATH_INFO']) && dirname($HTTP_SERVER_VARS['PATH_INFO']) != '/') + { + $path = dirname($HTTP_SERVER_VARS['PATH_INFO']); + } + else if( dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) != '/') + { + $path = dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); + } + else + { + $path = ''; + } $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";