diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-17 17:51:59 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-17 17:51:59 +0000 |
| commit | f027b477f4a8f277f29544cd9c2555efafdac121 (patch) | |
| tree | 7c9a3f3c5ae9f52960dcdd35a4bf8245a440563e /phpBB | |
| parent | 0ed464fae67285bcc734cc8ebbbbfd14cb3562aa (diff) | |
| download | forums-f027b477f4a8f277f29544cd9c2555efafdac121.tar forums-f027b477f4a8f277f29544cd9c2555efafdac121.tar.gz forums-f027b477f4a8f277f29544cd9c2555efafdac121.tar.bz2 forums-f027b477f4a8f277f29544cd9c2555efafdac121.tar.xz forums-f027b477f4a8f277f29544cd9c2555efafdac121.zip | |
Hopefully addresses bug #481831 ... changed REQUEST_URI to SCRIPT_NAME which seems common
git-svn-id: file:///svn/phpbb/trunk@1351 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/groupcp.php | 6 | ||||
| -rw-r--r-- | phpBB/posting.php | 4 | ||||
| -rw-r--r-- | phpBB/privmsg.php | 2 | ||||
| -rw-r--r-- | phpBB/profile.php | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php index 91461b7aa6..323fa94dca 100644 --- a/phpBB/groupcp.php +++ b/phpBB/groupcp.php @@ -169,7 +169,7 @@ else if( isset($HTTP_POST_VARS['joingroup']) && $group_id ) $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; - $path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); + $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; $emailer->use_template("group_request"); @@ -361,7 +361,7 @@ else if( $group_id ) $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; - $path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); + $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; $emailer->use_template("group_added"); @@ -473,7 +473,7 @@ else if( $group_id ) $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; - $path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); + $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; $emailer->use_template("group_approved"); diff --git a/phpBB/posting.php b/phpBB/posting.php index a3459efa5a..bb47f1bc3a 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1385,7 +1385,9 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) $emailer = new emailer($board_config['smtp_delivery']); $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; - $path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); + + $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); + $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; for($i = 0; $i < count($email_set); $i++) diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index c8eca3a2b1..d3c54be750 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -987,7 +987,7 @@ else if( $submit || $refresh || $mode != "" ) { if( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) ) { - $path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); + $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; diff --git a/phpBB/profile.php b/phpBB/profile.php index c2cee7bb78..e18964143c 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -993,7 +993,7 @@ 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 = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); + $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; if( $board_config['require_activation'] == USER_ACTIVATION_SELF ) @@ -1099,7 +1099,7 @@ 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 = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); + $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; $emailer->use_template($email_template); @@ -1655,7 +1655,7 @@ 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 = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); + $path = (dirname($HTTP_SERVER_VARS['SCRIPT_NAME']) == "/") ? "" : dirname($HTTP_SERVER_VARS['SCRIPT_NAME']); $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME']; $emailer->use_template("user_activate_passwd"); |