mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +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:
@@ -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();
|
||||
|
Reference in New Issue
Block a user