1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00

Hopefully cope with boards running from SSL, ie. https://

git-svn-id: file:///svn/phpbb/trunk@1363 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2001-11-18 18:11:42 +00:00
parent 612c3ee1fb
commit c7bc2e37bd
4 changed files with 20 additions and 13 deletions

View File

@@ -989,6 +989,7 @@ else if( $submit || $refresh || $mode != "" )
{
$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'];
$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? "https://" : "http://";
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
@@ -1009,7 +1010,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://" . $server_name . $path . "/privmsg.$phpEx?folder=inbox")
"U_INBOX" => $protocol . $server_name . $path . "/privmsg.$phpEx?folder=inbox")
);
$emailer->send();