From 62d0de45d8ed1d275a4d1991b6dab929fc3f41af Mon Sep 17 00:00:00 2001 From: Hayden Smith Date: Tue, 12 Aug 2008 23:14:00 +0000 Subject: [PATCH] Merged [47094]: Fixes Session IP addresses in reverse order. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60546 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Session.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/Session.php b/core/Session.php index 5e1fd22f0..9bb827c19 100644 --- a/core/Session.php +++ b/core/Session.php @@ -207,10 +207,12 @@ class Session { public static function load_config() { foreach(self::$session_ips as $sessionIP => $timeout) { if(preg_match('/^([0-9.]+)\s?-\s?([0-9.]+)$/', $sessionIP, $ips)) { - $minIP = ip2long($ips[1]); - $maxIP = ip2long($ips[2]); + $startIP = ip2long($ips[1]); + $endIP = ip2long($ips[2]); $clientIP = ip2long($_SERVER['REMOTE_ADDR']); - + $minIP = min($startIP, $endIP); + $maxIP = max($startIP, $endIP); + if($minIP <= $clientIP && $clientIP <= $maxIP) { return self::set_timeout($timeout); }