From af925fb218e7a333759eb49c667bfb22eb71196d Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Fri, 4 Aug 2017 14:20:51 +0100
Subject: bug fixes

---
 src/globals.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/globals.php')

diff --git a/src/globals.php b/src/globals.php
index 1936ad1..ed04bd7 100755
--- a/src/globals.php
+++ b/src/globals.php
@@ -222,14 +222,19 @@ function IntrusionNotify($where) {
 function ValidSession() {
 	if (!isset($_SESSION["usertable"])) return(FALSE);
 	$gip = getIP();
-	if ($_SESSION["usertable"]["userip"] != $gip ||
-		$_SESSION["usertable"]["usersession"] != session_id()) return(FALSE);
+	// cassiopc: sites that use multiple IP addresses to go out create a serious problem to check IPs...
+//	if(substr($_SESSION["usertable"]["userip"],0,6) != '157.92') {
+//	if ($_SESSION["usertable"]["userip"] != $gip ||
+//		$_SESSION["usertable"]["usersession"] != session_id()) return(FALSE);
+  //      } else {
+	if($_SESSION["usertable"]["usersession"] != session_id()) return(FALSE);
+    //    }
 	if($_SESSION["usertable"]["usermultilogin"] == 't') return(TRUE);
 	
 	$tmp = DBUserInfo($_SESSION["usertable"]["contestnumber"], 
 					  $_SESSION["usertable"]["usersitenumber"], 
 					  $_SESSION["usertable"]["usernumber"]);
-	if ($tmp["userip"] != $gip) return(FALSE);
+	if ($tmp["userip"] != $gip) return(FALSE); //cassiopc: they may create a problem here too...
 	return(TRUE);
 }
 // grava erro no arquivo de log
@@ -350,7 +355,7 @@ function match_network ($nets, $ip) {
 
         $ip_arr   = explode('/', $net);
         $net_long = ip2long(trim($ip_arr[0]));
-		if(trim($ip_arr[1]) != '') {
+		if(count($ip_arr) > 1 && trim($ip_arr[1]) != '') {
 			$x        = ip2long(trim($ip_arr[1]));
 			$mask     = long2ip($x) == ((int) trim($ip_arr[1])) ? $x : 0xffffffff << (32 - ((int) trim($ip_arr[1])));
         } else { 
-- 
cgit v1.2.3