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/posting.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/posting.php')
| -rw-r--r-- | phpBB/posting.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index bb47f1bc3a..9db20d6a01 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1387,8 +1387,8 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; $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://"; for($i = 0; $i < count($email_set); $i++) { @@ -1405,8 +1405,8 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) "SITENAME" => $board_config['sitename'], "TOPIC_TITLE" => $email_set[$i]['topic_title'], - "U_TOPIC" => "http://" . $server_name . $path . "/viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id#$new_post_id", - "U_STOP_WATCHING_TOPIC" => "http://" . $server_name . $path . "/viewtopic.$phpEx?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic") + "U_TOPIC" => $protocol . $server_name . $path . "/viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id#$new_post_id", + "U_STOP_WATCHING_TOPIC" => $protocol . $server_name . $path . "/viewtopic.$phpEx?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic") ); $emailer->send(); |