From ed3268aac571a73410da657c7b1318533e9c1f0f Mon Sep 17 00:00:00 2001 From: cassiopc Date: Fri, 9 Nov 2012 12:50:20 +0100 Subject: fixed issue to limit access by IP for teams --- boca-1.5.2/src/frun.php | 3 +-- boca-1.5.2/src/globals.php | 5 ++++- boca-1.5.2/tools/icpc.etc.tgz | Bin 9525 -> 9525 bytes 3 files changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 boca-1.5.2/src/globals.php diff --git a/boca-1.5.2/src/frun.php b/boca-1.5.2/src/frun.php index 97abd1d..14395e3 100644 --- a/boca-1.5.2/src/frun.php +++ b/boca-1.5.2/src/frun.php @@ -1015,8 +1015,7 @@ function exitmsg($retval) { $retval = 3; // runtime error } else if($retval==9) { - $answer="Runtime error"; - $retval = 3; // runtime error + $answer="Runtime error (or possible java class name mismatch)"; } else { $answer="Unknown autojudge status"; $retval = 7; diff --git a/boca-1.5.2/src/globals.php b/boca-1.5.2/src/globals.php old mode 100644 new mode 100755 index fc83e11..66047ef --- a/boca-1.5.2/src/globals.php +++ b/boca-1.5.2/src/globals.php @@ -311,9 +311,12 @@ function match_network ($nets, $ip) { $ip_arr = explode('/', $net); $net_long = ip2long(trim($ip_arr[0])); + if(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]))); - $ip_long = ip2long($ip); + } else { $mask=0xffffffff; + } + $ip_long = ip2long($ip); if ($rev) { if (($ip_long & $mask) != ($net_long & $mask)) return true; diff --git a/boca-1.5.2/tools/icpc.etc.tgz b/boca-1.5.2/tools/icpc.etc.tgz index 31b46cb..0f7a4e6 100644 Binary files a/boca-1.5.2/tools/icpc.etc.tgz and b/boca-1.5.2/tools/icpc.etc.tgz differ -- cgit v1.2.3