aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart van Bragt <bartvb@users.sourceforge.net>2002-02-18 07:35:18 +0000
committerBart van Bragt <bartvb@users.sourceforge.net>2002-02-18 07:35:18 +0000
commitdc729b71204093c26bf49807b21775fba6e48004 (patch)
tree83fa1b2360eb51d331aa94013f5119ddda499e5b
parent7db39a1960a477ca5ef67e3c933b10b55a71bea9 (diff)
downloadforums-dc729b71204093c26bf49807b21775fba6e48004.tar
forums-dc729b71204093c26bf49807b21775fba6e48004.tar.gz
forums-dc729b71204093c26bf49807b21775fba6e48004.tar.bz2
forums-dc729b71204093c26bf49807b21775fba6e48004.tar.xz
forums-dc729b71204093c26bf49807b21775fba6e48004.zip
Fixed some problems with last checkin ( for Email links etc)
git-svn-id: file:///svn/phpbb/trunk@2181 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/common.php46
1 files changed, 33 insertions, 13 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index 357d85bdf4..f9d8fc769f 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -155,33 +155,53 @@ $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']) )
+if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
{
- $script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
+ $server_protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
}
-else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
+else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
{
- $script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
+ $server_protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ? ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
}
-else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
+else
{
- $script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
+ $server_protocol = "http://";
+}
+
+if ( !empty($board_config['server_name']) )
+{
+ $server_name = $board_config['server_name'];
+}
+else 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 = "";
}
-$server_name = $board_config['server_name'];
$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
-if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
+if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
{
- $server_protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
+ $script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
}
-else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
+else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
{
- $server_protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ? ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
+ $script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
}
-else
+else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
{
- $server_protocol = "http://";
+ $script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
}
$script_url = $server_protocol . $server_name . $server_port . $script_name;