aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-10-14 22:32:38 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-10-14 22:32:38 +0000
commita290b47ea5be2692c4cc1fa2be5cab486f70ea18 (patch)
tree83f7c9a6c88db735b4fb8c240dabb790c52be135 /phpBB/posting.php
parent9947ccb7f991fee74dc94d642bf672f55790371c (diff)
downloadforums-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/posting.php')
-rw-r--r--phpBB/posting.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 359d3b11eb..44005afa7f 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -756,6 +756,7 @@ 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['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'];
for($i = 0; $i < count($email_set); $i++)
{
@@ -772,8 +773,8 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error )
"SITENAME" => $board_config['sitename'],
"TOPIC_TITLE" => $email_set[$i]['topic_title'],
- "U_TOPIC" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id#$new_post_id",
- "U_STOP_WATCHING_TOPIC" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/viewtopic.$phpEx?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
+ "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")
);
$emailer->send();