diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-14 22:32:38 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-14 22:32:38 +0000 |
| commit | a290b47ea5be2692c4cc1fa2be5cab486f70ea18 (patch) | |
| tree | 83f7c9a6c88db735b4fb8c240dabb790c52be135 /phpBB/privmsg.php | |
| parent | 9947ccb7f991fee74dc94d642bf672f55790371c (diff) | |
| download | forums-a290b47ea5be2692c4cc1fa2be5cab486f70ea18.tar forums-a290b47ea5be2692c4cc1fa2be5cab486f70ea18.tar.gz forums-a290b47ea5be2692c4cc1fa2be5cab486f70ea18.tar.bz2 forums-a290b47ea5be2692c4cc1fa2be5cab486f70ea18.tar.xz forums-a290b47ea5be2692c4cc1fa2be5cab486f70ea18.zip | |
Altered uri's in emails to utilise HTTP_HOST if available + altered some METAs to append_sid
git-svn-id: file:///svn/phpbb/trunk@1199 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/privmsg.php')
| -rw-r--r-- | phpBB/privmsg.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 9cd4fb2cf6..10f5fbca78 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -978,6 +978,8 @@ 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']); + $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"; include($phpbb_root_path . 'includes/emailer.'.$phpEx); @@ -994,7 +996,7 @@ else if( $submit || $refresh || $mode != "" ) "SITENAME" => $board_config['sitename'], "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), - "U_INBOX" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/privmsg.$phpEx?folder=inbox") + "U_INBOX" => "http://" . $server_name . $path . "/privmsg.$phpEx?folder=inbox") ); $emailer->send(); |