aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-08-03 11:41:01 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-01-03 00:09:52 +0100
commit3c713b5e7d883d7414538de0557c68195cd73018 (patch)
treee22342e6ff9ff74b6a1d3286b31985ca25fbc1e3 /phpBB/install/database_update.php
parent5d01c58b7747b0a86431021757cf6aca298e88e7 (diff)
downloadforums-3c713b5e7d883d7414538de0557c68195cd73018.tar
forums-3c713b5e7d883d7414538de0557c68195cd73018.tar.gz
forums-3c713b5e7d883d7414538de0557c68195cd73018.tar.bz2
forums-3c713b5e7d883d7414538de0557c68195cd73018.tar.xz
forums-3c713b5e7d883d7414538de0557c68195cd73018.zip
[ticket/9746] Adding some more calls to phpbb_ip_normalise().
PHPBB3-9746
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9aa7a34f6b..b33c0f4a11 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -127,8 +127,11 @@ $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false);
// We do not need this any longer, unset for safety purposes
unset($dbpasswd);
-$user->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : '';
-$user->ip = (stripos($user->ip, '::ffff:') === 0) ? substr($user->ip, 7) : $user->ip;
+$user->ip = '';
+if (!empty($_SERVER['REMOTE_ADDR']))
+{
+ $user->ip = (function_exists('phpbb_ip_normalise')) ? phpbb_ip_normalise($_SERVER['REMOTE_ADDR']) : htmlspecialchars($_SERVER['REMOTE_ADDR']);
+}
$sql = "SELECT config_value
FROM " . CONFIG_TABLE . "