summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Pittman <thecrypticace+github@gmail.com>2012-07-23 14:05:49 +0200
committerJordan Pittman <thecrypticace+github@gmail.com>2012-07-23 14:05:49 +0200
commit8960acf4fae56fd7b62a451ce8ea571c0e631ed1 (patch)
tree439e61130276995e698b1347eeddf5a132a24e57
parenta5a71359a5b320b0dc35fabfeb3e74e97a466a10 (diff)
Update system/core/Input.php
-rw-r--r--system/core/Input.php28
1 files changed, 17 insertions, 11 deletions
diff --git a/system/core/Input.php b/system/core/Input.php
index c0c85a5e8..968a42a9a 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -330,24 +330,30 @@ class CI_Input {
if (config_item('proxy_ips') != '' && $this->server('HTTP_X_FORWARDED_FOR') && $this->server('REMOTE_ADDR'))
{
- $hasRanges = strpos($proxies, '/') !== false;
+ $has_ranges = strpos($proxies, '/') !== false;
$proxies = preg_split('/[\s,]/', config_item('proxy_ips'), -1, PREG_SPLIT_NO_EMPTY);
$proxies = is_array($proxies) ? $proxies : array($proxies);
- if ($hasRanges) {
- $longIP = ip2long($_SERVER['REMOTE_ADDR']);
- $bit32 = 1 << 32;
-
- foreach($proxies as $ip) {
- list($address, $maskLength) = explode('/', $ip);
-
- $bitmask = $bit32 - (1 << (32 - (int)$maskLength));
-
- if (($longIP & $bitmask) == $address) {
+ if ($has_ranges)
+ {
+ $long_ip = ip2long($_SERVER['REMOTE_ADDR']);
+ $bit_32 = 1 << 32;
+
+ // Go through each of the IP Addresses to check for and
+ // test against range notation
+ foreach($proxies as $ip)
+ {
+ list($address, $mask_length) = explode('/', $ip);
+
+ // Generate the bitmask for a 32 bit IP Address
+ $bitmask = $bit_32 - (1 << (32 - (int)$mask_length));
+ if (($long_ip & $bitmask) == $address)
+ {
$this->ip_address = $_SERVER['HTTP_X_FORWARDED_FOR'];
break;
}
}
+
} else {
$this->ip_address = in_array($_SERVER['REMOTE_ADDR'], $proxies) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];
}