diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-18 18:11:42 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-18 18:11:42 +0000 |
| commit | c7bc2e37bd911db403d20da02797161e58643f99 (patch) | |
| tree | cc54171cc6f49062adf723fcd356c290658f2729 /phpBB/privmsg.php | |
| parent | 612c3ee1fb5021dea4651ea213c03d542af634a8 (diff) | |
| download | forums-c7bc2e37bd911db403d20da02797161e58643f99.tar forums-c7bc2e37bd911db403d20da02797161e58643f99.tar.gz forums-c7bc2e37bd911db403d20da02797161e58643f99.tar.bz2 forums-c7bc2e37bd911db403d20da02797161e58643f99.tar.xz forums-c7bc2e37bd911db403d20da02797161e58643f99.zip | |
Hopefully cope with boards running from SSL, ie. https://
git-svn-id: file:///svn/phpbb/trunk@1363 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/privmsg.php')
| -rw-r--r-- | phpBB/privmsg.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index aad23921fe..e468e62702 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -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(); |