diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-03 00:24:55 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-03 00:24:55 +0100 |
| commit | da4617b14b11ade6f664b8c1ab94e3aeb5b7428d (patch) | |
| tree | e22342e6ff9ff74b6a1d3286b31985ca25fbc1e3 /phpBB/install | |
| parent | 979158f0a2e1ab88685f608e8756ff40248b86cf (diff) | |
| parent | 3c713b5e7d883d7414538de0557c68195cd73018 (diff) | |
| download | forums-da4617b14b11ade6f664b8c1ab94e3aeb5b7428d.tar forums-da4617b14b11ade6f664b8c1ab94e3aeb5b7428d.tar.gz forums-da4617b14b11ade6f664b8c1ab94e3aeb5b7428d.tar.bz2 forums-da4617b14b11ade6f664b8c1ab94e3aeb5b7428d.tar.xz forums-da4617b14b11ade6f664b8c1ab94e3aeb5b7428d.zip | |
Merge branch 'ticket/bantu/9746' into develop
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 7 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 3 |
2 files changed, 6 insertions, 4 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 . " diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index eaad2ed7e0..8143ea7737 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1235,8 +1235,7 @@ class install_install extends module $current_time = time(); - $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 = (!empty($_SERVER['REMOTE_ADDR'])) ? phpbb_ip_normalise($_SERVER['REMOTE_ADDR']) : ''; if ($data['script_path'] !== '/') { |