5 files changed, 47 insertions, 163 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index 2f4af2a4e8..357d85bdf4 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -153,6 +153,41 @@ else
 $user_ip = encode_ip($client_ip);
 
 //
+// Set some server variables related to the current URL, mostly used for Email
+//
+if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
+{
+	$script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
+}
+else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
+{
+	$script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
+}
+else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
+{
+	$script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
+}
+
+$server_name = $board_config['server_name'];
+$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
+
+if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
+{
+	$server_protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
+}
+else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
+{
+	$server_protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
+}
+else
+{
+	$server_protocol = "http://";
+}
+
+$script_url = $server_protocol . $server_name . $server_port . $script_name;
+
+
+//
 // Setup forum wide options, if this fails
 // then we output a CRITICAL_ERROR since
 // basic forum information is not available
@@ -176,4 +211,4 @@ if( $board_config['board_disable'] && !defined("IN_ADMIN") && !defined("IN_LOGIN
 	message_die(GENERAL_MESSAGE, 'Board_disable', 'Information');
 }
 
-?>
-\ No newline at end of file
+?>
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
index 4474202640..d435f750e9 100644
--- a/phpBB/groupcp.php
+++ b/phpBB/groupcp.php
@@ -58,16 +58,6 @@ $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0;
 $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
 
 //
-// Set default email variables
-//
-$script_name = preg_replace("/^(\/)(.*?)(\/)$/", "\\2", $board_config['script_path']) . '/groupcp.'.$phpEx;
-$server_name = $board_config['server_name'];
-$server_protocol = ( $board_config['cookie_secure'] ) ? "https://" : "http://";
-$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
-
-$server_url = $server_protocol . $server_name . $server_port . $script_name;
-
-//
 // Default var values
 //
 $is_moderator = FALSE;
@@ -207,7 +197,7 @@ else if( isset($HTTP_POST_VARS['joingroup']) && $group_id )
 		"GROUP_MODERATOR" => $moderator['username'],
 		"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
 
-		"U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id&validate=true")
+		"U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id&validate=true")
 	);
 	$emailer->send();
 	$emailer->reset();
@@ -413,7 +403,7 @@ else if( $group_id )
 					"GROUP_NAME" => $group_name,
 					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
 
-					"U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id")
+					"U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id")
 				);
 				$emailer->send();
 				$emailer->reset();
@@ -519,7 +509,7 @@ else if( $group_id )
 						"GROUP_NAME" => $group_name,
 						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
 
-						"U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id")
+						"U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id")
 					);
 					$emailer->send();
 					$emailer->reset();
diff --git a/phpBB/posting.php b/phpBB/posting.php
index d6a2776f68..96c88cc379 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -974,50 +974,6 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 									include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 									$emailer = new emailer($board_config['smtp_delivery']);
 
-									if( isset($HTTP_SERVER_VARS['PHP_SELF']) || isset($HTTP_ENV_VARS['PHP_SELF']) )
-									{
-										$script_name = ( isset($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
-									}
-									else if( isset($HTTP_SERVER_VARS['SCRIPT_NAME']) || isset($HTTP_ENV_VARS['SCRIPT_NAME']) )
-									{
-										$script_name = ( isset($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
-									}
-									else if( isset($HTTP_SERVER_VARS['PATH_INFO']) || isset($HTTP_ENV_VARS['PATH_INFO']) )
-									{
-										$script_name = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
-									}
-									else
-									{
-										$script_name = "viewtopic.$phpEx";
-									}
-									$script_name = str_replace("posting.$phpEx", "viewtopic.$phpEx", $script_name);
-
-									if( isset($HTTP_SERVER_VARS['SERVER_NAME']) || isset($HTTP_ENV_VARS['SERVER_NAME']) )
-									{
-										$server_name = ( isset($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
-									}
-									else if( isset($HTTP_SERVER_VARS['HTTP_HOST']) || isset($HTTP_ENV_VARS['HTTP_HOST']) )
-									{
-										$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
-									}
-									else
-									{
-										$server_name = "";
-									}
-
-									if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
-									{
-										$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
-									}
-									else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
-									{
-										$protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
-									}
-									else
-									{
-										$protocol = "http://";
-									}
-
 									$orig_word = array();
 									$replacement_word = array();
 									obtain_word_list($orig_word, $replacement_word);
@@ -1045,8 +1001,8 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 												"SITENAME" => $board_config['sitename'],
 												"TOPIC_TITLE" => $topic_title,
 
-												"U_TOPIC" => $protocol . $server_name . $script_name . "?" . POST_POST_URL . "=$new_post_id#$new_post_id",
-												"U_STOP_WATCHING_TOPIC" => $protocol . $server_name . $script_name . "?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
+												"U_TOPIC" => $script_url . "?" . POST_POST_URL . "=$new_post_id#$new_post_id",
+												"U_STOP_WATCHING_TOPIC" => $script_url . "?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
 											);
 
 											$emailer->send();
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index 2855b73b0b..4db1cdd78a 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -1082,53 +1082,6 @@ else if( $submit || $refresh || $mode != "" )
 
 				if( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) )
 				{
-					if( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
-					{
-						$script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
-					}
-					else if( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
-					{
-						$script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
-					}
-					else if( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
-					{
-						$script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
-					}
-					else
-					{
-						$script_name = "privmsg.$phpEx";
-					}
-
-					if ( !empty($board_config['cookie_domain']) )
-					{
-						$server_name = $board_config['cookie_domain'];
-					}
-					else if( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
-					{
-						$server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
-					}
-					else if( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) )
-					{
-						$server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
-					}
-					else
-					{
-						$server_name = "";
-					}
-
-					if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
-					{
-						$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
-					}
-					else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
-					{
-						$protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
-					}
-					else
-					{
-						$protocol = "http://";
-					}
-
 					$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
 
 					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
@@ -1147,7 +1100,7 @@ else if( $submit || $refresh || $mode != "" )
 						"SITENAME" => $board_config['sitename'],
 						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
 
-						"U_INBOX" => $protocol . $server_name . $script_name . "?folder=inbox")
+						"U_INBOX" => $script_url . "?folder=inbox")
 					);
 
 					$emailer->send();
diff --git a/phpBB/profile.php b/phpBB/profile.php
index 36be5a490a..61e3be9610 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -35,56 +35,6 @@ init_userprefs($userdata);
 // End session management
 //
 
-//
-// Set default email variables
-//
-if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
-{
-	$script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
-}
-else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
-{
-	$script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
-}
-else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
-{
-	$script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
-}
-else
-{
-	$script_name = "profile.$phpEx";
-}
-
-if ( !empty($board_config['cookie_domain']) )
-{
-	$server_name = $board_config['cookie_domain'];
-}
-else if ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
-{
-	$server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
-}
-else if ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) )
-{
-	$server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
-}
-else
-{
-	$server_name = "";
-}
-
-if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
-{
-	$protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ?  ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
-}
-else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
-{
-	$protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ?  ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" )  : "http://";
-}
-else
-{
-	$protocol = "http://";
-}
-
 // -----------------------
 // Page specific functions
 //
@@ -1115,7 +1065,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 								"USERNAME" => $username,
 								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
 
-								"U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
+								"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
 							);
 							$emailer->send();
 							$emailer->reset();
@@ -1213,7 +1163,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 										"PASSWORD" => $password_confirm,
 										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
 
-										"U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey",
+										"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey",
 										"FAX_INFO" => $board_config['coppa_fax'],
 										"MAIL_INFO" => $board_config['coppa_mail'],
 										"EMAIL_ADDRESS" => $email,
@@ -1235,7 +1185,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 										"PASSWORD" => $password_confirm,
 										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
 	
-										"U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
+										"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
 									);
 								}
 
@@ -1254,7 +1204,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 										"USERNAME" => $username,
 										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
 
-										"U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
+										"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
 									);
 									$emailer->send();
 									$emailer->reset();
@@ -1768,7 +1718,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 					"PASSWORD" => $user_password,
 					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
 					
-					"U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
+					"U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
 				);
 				$emailer->send();
 				$emailer->reset();