mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 04:50:51 +02:00
Code Issues Releases Wiki Activity

More fixes

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@594 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2001-07-07 00:17:51 +00:00
parent 99fcfdbb32
commit 0955639395
2 changed files with 83 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
phpBB/common.php
View File

@@ -70,14 +70,14 @@ include('includes/db.'.$phpEx);
//
if(!empty($HTTP_CLIENT_IP))
{
if(eregi("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER))
if(ereg("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_CLIENT_IP))
{
$client_ip = $HTTP_CLIENT_IP;
}
}
else if(!empty($HTTP_X_FORWARDED_FOR))
{
if(strstr(",", $HTTP_X_FORWARDED_FOR))
if(ereg(",", $HTTP_X_FORWARDED_FOR))
{
list($client_ip) = explode(",", $HTTP_X_FORWARDED_FOR);
}
@@ -88,14 +88,14 @@ else if(!empty($HTTP_X_FORWARDED_FOR))
}
else if(!empty($HTTP_VIA))
{
if(eregi("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER))
if(ereg("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_VIA))
{
$client_ip = $HTTP_VIA;
}
}
else if(!empty($HTTP_PROXY_USER))
{
if(eregi("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER))
if(ereg("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER))
{
$client_ip = $HTTP_PROXY_USER;
}
@@ -106,27 +106,15 @@ else
}
$user_ip = encode_ip($client_ip);
//
// Setup forum wide options.
// This is also the first DB query/connect
// Setup forum wide options, if this fails
// then we output a CRITICAL_ERROR since
// basic forum information is not available
//
$sql = "SELECT *
FROM " . CONFIG_TABLE;
if(!$result = $db->sql_query($sql))
{
//
// Define some basic configuration
// vars, necessary since we haven't
// been able to get them from the DB
//
$board_config['default_template'] = "Default";
$board_config['default_timezone'] = 0;
$board_config['default_dateformat'] = "d M Y H:i";
$board_config['default_theme'] = 1;
$board_config['default_lang'] = "english";
$board_config['gzip_compress'] = 0;
message_die(CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql);
}
else
@@ -170,7 +158,6 @@ else
$board_config['gzip_compress'] = $config['gzip_compress'];
$board_config['smtp_delivery'] = $config['smtp_delivery'];
$board_config['smtp_host'] = $config['smtp_host'];
}
include('language/lang_' . $board_config['default_lang'] . '.'.$phpEx);