many small bug fixes

13 files changed, 319 insertions, 283 deletions

diff --git a/boca-1.5.0/src/admin/contest.php b/boca-1.5.0/src/admin/contest.php
index 361b55b..ddffed4 100644
--- a/boca-1.5.0/src/admin/contest.php
+++ b/boca-1.5.0/src/admin/contest.php
@@ -95,12 +95,16 @@ if (isset($_POST["Submit3"]) && isset($_POST["penalty"]) && is_numeric($_POST["p
 				if($dd > 0) {
 					$param['keys']=implode(',',$ar);
 					MSGError(count($ar) . ' keys are being imported from the file');
+					DBClearProblemTmp($_SESSION["usertable"]["contestnumber"]);
 				}
 			}
 			$param['atualizasites']=$at;
 		}
 		DBUpdateContest ($param);
-		if(strlen($param['unlockkey'])>1) DBGetFullProblemData($_SESSION["usertable"]["contestnumber"],true);
+		if(strlen($param['unlockkey'])>1) {
+			DBClearProblemTmp($_SESSION["usertable"]["contestnumber"]);
+			DBGetFullProblemData($_SESSION["usertable"]["contestnumber"],true);
+		}
 	}
 	ForceLoad("contest.php");
 }
diff --git a/boca-1.5.0/src/admin/problem.php b/boca-1.5.0/src/admin/problem.php
index d52c429..0b055b6 100644
--- a/boca-1.5.0/src/admin/problem.php
+++ b/boca-1.5.0/src/admin/problem.php
@@ -53,7 +53,6 @@ if (isset($_POST["Submit3"]) && isset($_POST["problemnumber"]) && is_numeric($_P
 		$param['fake'] = 'f';
 		$param['colorname'] = $_POST["colorname"];
 		$param['color'] = $_POST["color"];
-		if($param['color']=='') $param['color']=-1;
 		DBNewProblem ($_SESSION["usertable"]["contestnumber"], $param);
 	}
 	ForceLoad("problem.php");
diff --git a/boca-1.5.0/src/admin/runedit.php b/boca-1.5.0/src/admin/runedit.php
index 5b995ce..fa691e8 100644
--- a/boca-1.5.0/src/admin/runedit.php
+++ b/boca-1.5.0/src/admin/runedit.php
@@ -290,9 +290,9 @@ else
         <td width="83%"> 
 <?php 
 if($a["autostdout"]!="") {
-	echo "<a href=\"../filedownload.php?".filedownload($a["autostdout"]."stdout") ."\">stdout</a>\n";
+	echo "<a href=\"../filedownload.php?".filedownload($a["autostdout"],"stdout") ."\">stdout</a>\n";
       echo "<a href=\"#\" class=menu style=\"font-weight:bold\" onClick=\"window.open('../filewindow.php?".
-          filedownload($a["autostdout"]."stdout") ."', 'View - STDOUT','width=680,height=600,scrollbars=yes,".
+	filedownload($a["autostdout"],"stdout") ."', 'View - STDOUT','width=680,height=600,scrollbars=yes,".
 	   "resizable=yes')\">view</a>\n";
 } else
       echo "unavailable";
diff --git a/boca-1.5.0/src/admin/site.php b/boca-1.5.0/src/admin/site.php
index 67a9ebe..84241f3 100644
--- a/boca-1.5.0/src/admin/site.php
+++ b/boca-1.5.0/src/admin/site.php
@@ -131,7 +131,7 @@ if (isset($_POST["Submit1"]) && $_POST["Submit1"] == "Send" && isset($_POST["nam
 		$param['contestnumber']=$_SESSION["usertable"]["contestnumber"];
 		$param['sitenumber']=$_POST["site"];
 		$param['sitename']=$_POST["name"];
-		$param['siteip']=$_POST["ip"];
+//		$param['siteip']=$_POST["ip"];
 		$param['siteduration']=$_POST["duration"]*60;
 		$param['sitelastmileanswer']=	$_POST["lastmileanswer"]*60;
 		$param['sitelastmilescore']= $_POST["lastmilescore"]*60;
diff --git a/boca-1.5.0/src/fclar.php b/boca-1.5.0/src/fclar.php
index 6eb9b77..0a7b439 100644
--- a/boca-1.5.0/src/fclar.php
+++ b/boca-1.5.0/src/fclar.php
@@ -80,7 +80,7 @@ function DBUserClars($contest,$site,$user) {
 	$c = DBConnect();
 	$r = DBExec($c, "select distinct c.clarsitenumber as site, c.clarnumber as number, c.clardatediff as timestamp, " .
                                         "p.problemname as problem, c.clarstatus as status, c.clardata as question, " .
-                                        "c.claranswer as answer, c.updatetime as updatetime " .
+                                        "c.claranswer as answer, c.updatetime as updatetime, c.clardatediffans as anstime " .
                              "from clartable as c, problemtable as p " .
                              "where c.contestnumber=$contest and p.contestnumber=c.contestnumber and " .
                                     "c.clarproblem=p.problemnumber and not clarstatus ~ 'deleted' and " .
diff --git a/boca-1.5.0/src/fcontest.php b/boca-1.5.0/src/fcontest.php
index ea426f3..9390a31 100644
--- a/boca-1.5.0/src/fcontest.php
+++ b/boca-1.5.0/src/fcontest.php
@@ -237,7 +237,7 @@ function DBAllSiteTime($contest, $site) {
 
 	return $a;
 }
-function DBUserInfo($contest, $site, $user, $c=null) {
+function DBUserInfo($contest, $site, $user, $c=null,$hashpass=true) {
 	$sql = "select * from usertable where usernumber=$user and usersitenumber=$site and " .
                "contestnumber=$contest";
 	$a = DBGetRow ($sql, 0, $c);
@@ -245,7 +245,8 @@ function DBUserInfo($contest, $site, $user, $c=null) {
 		LOGError("Unable to find the user in the database. SQL=(" . $sql . ")");
 		MSGError("Unable to find the user in the database. Contact an admin now!");
 	}
-	$a['userpassword'] = myhash($a['userpassword'] . $a['usersessionextra']);
+	if($hashpass)
+		$a['userpassword'] = myhash($a['userpassword'] . $a['usersessionextra']);
 	return $a;
 }
 function DBDeleteUser($contest, $site, $user) {
@@ -973,11 +974,12 @@ function DBNewSite ($contest, $c=null, $param=array()) {
 	}
 	$ct = DBContestInfo ($contest, $c);
 	if($ct==null) return false;
-	$f=$ct["contestduration"];
 
 	if(isset($param['sitenumber']) && !isset($param['number'])) $param['number']=$param['sitenumber'];
-	$ac=array('number','siteip','sitename','sitescorelevel','updatetime');
+	$ac=array('number','siteip','sitename','sitescorelevel','updatetime','startdate','duration');
 	$type=array();
+	$type['startdate']=1;
+	$type['duration']=1;
 	$type['number']=1;
 	$type['sitescorelevel']=1;
 	$type['updatetime']=1;
@@ -997,6 +999,8 @@ function DBNewSite ($contest, $c=null, $param=array()) {
 		$a = DBGetRow ("select * from sitetable where contestnumber=$contest and sitenumber=$number", 0, $c);
 		if($a != null) return 1;
 	}
+	if($duration=='') $duration = $ct["contestduration"];
+	if($startdate=='') $startdate=$ct["conteststartdate"];
 	if($siteip=="") $siteip="127.0.0.1/boca";
 	if($sitename=="") $sitename="Site";
 	if($sitescorelevel=="") $sitescorelevel=3;
@@ -1008,7 +1012,7 @@ function DBNewSite ($contest, $c=null, $param=array()) {
 			"sitenextuser, sitenextclar, sitenextrun, sitenexttask, sitemaxtask, updatetime) values ".
 			"($contest, $number, '$siteip', '$sitename', 't', 't', ".
                         $ct["contestlastmileanswer"].",".$ct["contestlastmilescore"].
-			", $f, 't', '$number', '$number', '$number', $sitescorelevel, 0, 0, 0, 0, 10, $updatetime)");
+			", $duration, 't', '$number', '$number', '$number', $sitescorelevel, 0, 0, 0, 0, 10, $updatetime)");
 
 	$cf=globalconf();
 	$admpass = myhash($cf["basepass"]);
@@ -1022,7 +1026,7 @@ function DBNewSite ($contest, $c=null, $param=array()) {
 	$param=array();
 	$param['contest']=$contest;
 	$param['site']=$number;
-	$param['start']=$ct["conteststartdate"];
+	$param['start']=$startdate;
 	DBRenewSiteTime($param, $c);
 	if($cw)	DBExec($c, "commit work");
 	LOGLevel("User " . $_SESSION["usertable"]["username"]."/". $_SESSION["usertable"]["usersitenumber"] . 
@@ -1031,18 +1035,18 @@ function DBNewSite ($contest, $c=null, $param=array()) {
 }
 
 function DBUserUpdate($contest, $site, $user, $username, $userfull, $userdesc, $passo, $passn) {
-	$a = DBUserInfo ($contest, $site, $user);
+	$a = DBUserInfo($contest, $site, $user, null, false);
 	$p = myhash($a["userpassword"] . session_id());
-        if ($a["userpassword"] != "" && $p != $passo) {
+	if ($a["userpassword"] != "" && $p != $passo) {
 		LOGLevel("User " . $_SESSION["usertable"]["username"]."/". $_SESSION["usertable"]["usersitenumber"] . " (contest=$contest, site=$site) " .
-			"tried to change settings, but password was incorrect.",2);
+				 "tried to change settings, but password was incorrect.",2);
 		MSGError ("Incorrect password.");
 	}
 	else {
 		if ($a["userpassword"] == "") $temp = myhash("");
 		else $temp = $a["userpassword"];
 		$temp = bighexsub($passn, $temp);
-		$newpass = substr($temp, strlen($temp)-32, 32);
+		$newpass = substr($temp, strlen($temp)-strlen($myhash), strlen($myhash));
 
 		$c = DBConnect();
 		DBExec($c, "begin work");
@@ -1207,6 +1211,10 @@ function siteclock() {
 		return array("contest not running",-1000000000);
 	if ($s["currenttime"]<0) {
 		$t = - $s["currenttime"];
+		if($t>3600) {
+			$t = ((int) ($t/360))/10;
+			return array("&gt; ". $t . " hour(s) to start",$s["currenttime"]);
+		}
 		if ($t>60) {
 			$t = (int) ($t/60);
 			return array("&gt; ". $t . " min(s) to start",$s["currenttime"]);
@@ -1216,17 +1224,22 @@ function siteclock() {
 	}
 	if ($s["currenttime"]>=0) {
 		$t = $s["siteduration"] - $s["currenttime"];
+		$str = '';
+		if($t >= 3600) {
+			$str .= ((int)($t/3600)) . 'h ';
+			$t = $t % 3600;
+		}
 		if ($t>60) {
 			$t = (int) ($t/60);
-			return array("&gt; " . $t . " minute(s) left",$s["currenttime"]);
-		} else {
+			return array($str . $t . " min(s) left",$s["currenttime"]);
+		} else if($str=='') {
 			if ($t>0) {
 				return array($t . " second(s) left",$s["currenttime"]);
 			} else {
 				$t = (int) (- $t/60);
 				return array($t . "min. of extra time",$s["currenttime"]);
 			}
-		}
+		} else return array($str . " left",$s["currenttime"]);
 	}
 	else return array("not started",-1000000000);
 }
diff --git a/boca-1.5.0/src/fproblem.php b/boca-1.5.0/src/fproblem.php
index 669c2ef..42346cb 100644
--- a/boca-1.5.0/src/fproblem.php
+++ b/boca-1.5.0/src/fproblem.php
@@ -85,7 +85,8 @@ function DBGetProblemData($contestnumber, $problemnumber, $c=null) {
 
 		$ds = DIRECTORY_SEPARATOR;
 		if($ds=="") $ds = "/";
-		$ptmp = $_SESSION["locr"] . $ds . "private" . $ds . "problemtmp" . $ds . "problem" . $a[$i]['number'] . "-contest" . $contestnumber;
+		$nn = $a[$i]['number'];
+		$ptmp = $_SESSION["locr"] . $ds . "private" . $ds . "problemtmp" . $ds . "contest" . $contestnumber ."-problem" . $nn;
 		if(is_readable($ptmp . ".name")) {
 			$a[$i]['descfilename']=trim(file_get_contents($ptmp . ".name"));
 			if($a[$i]['descfilename'] != '')
@@ -94,6 +95,14 @@ function DBGetProblemData($contestnumber, $problemnumber, $c=null) {
 	}
 	return $a;
 }
+function DBClearProblemTmp($contestnumber) {
+	$ds = DIRECTORY_SEPARATOR;
+	if($ds=="") $ds = "/";
+	$ptmp = $_SESSION["locr"] . $ds . "private" . $ds . "problemtmp" . $ds . "contest" . $contestnumber . "-*.name";
+	foreach(glob($ptmp) as $file) @unlink($file);
+	$ptmp = $_SESSION["locr"] . $ds . "private" . $ds . "problemtmp" . $ds . "contest" . $contestnumber . "-*.hash";
+	foreach(glob($ptmp) as $file) @unlink($file);
+}
 function DBGetFullProblemData($contestnumber,$freeproblems=false) {
 	$c = DBConnect();
 	DBExec($c, "begin work", "GetFullProblemData");
@@ -110,18 +119,31 @@ function DBGetFullProblemData($contestnumber,$freeproblems=false) {
 	}
 	$cf = globalconf();
 	$a = array();
+	$ds = DIRECTORY_SEPARATOR;
+	if($ds=="") $ds = "/";
 	for ($i=0;$i<$n;$i++) {
 		$a[$i] = array_merge(array(),DBRow($r,$i));
 		$nn=$a[$i]['number'];
+		$ptmp = $_SESSION["locr"] . $ds . "private" . $ds . "problemtmp" . $ds . "contest" . $contestnumber ."-problem" . $nn;
+		$ck = myshorthash('');
+		if(is_readable($ptmp . ".hash")) {
+			$ck = trim(file_get_contents($ptmp . ".hash"));
+		}
+		if($ck != $a[$i]['inputhash']) {
+			@unlink($ptmp . ".name");
+			@unlink($ptmp . ".hash");
+			$a[$i]['basefilename']='';
+			$a[$i]['descfilename']='';
+			$a[$i]['fullname']='';
+		}
 		if($freeproblems && $a[$i]['fake'] != 't') {
-			$ds = DIRECTORY_SEPARATOR;
-			if($ds=="") $ds = "/";
-			$ptmp = $_SESSION["locr"] . $ds . "private" . $ds . "problemtmp" . $ds . "problem" . $nn . "-contest" . $contestnumber;
 			if(is_readable($ptmp . ".name")) {
 				$a[$i]['descfilename']=trim(file_get_contents($ptmp . ".name"));
 				if($a[$i]['descfilename'] != '')
 					$a[$i]['descoid']=-1;
 			} else {
+				@unlink($ptmp . ".name");
+				@unlink($ptmp . ".hash");
 				$randnum = session_id() . "_" . rand();
 				$dir = $ptmp . '-' . $randnum;
 				@mkdir($dir,0770,true);
@@ -153,6 +175,7 @@ function DBGetFullProblemData($contestnumber,$freeproblems=false) {
 								$failed=5;
 						if(!$failed) {
 							file_put_contents($ptmp . ".name",$ptmp . $ds . $descfile);
+							file_put_contents($ptmp . ".hash",$a[$i]['inputhash']);
 							if(is_readable($ptmp . ".name")) {
 								$a[$i]['descfilename']=trim(file_get_contents($ptmp . ".name"));
 								if($a[$i]['descfilename'] != '')
@@ -166,6 +189,13 @@ function DBGetFullProblemData($contestnumber,$freeproblems=false) {
 					}
 				}
 				if($failed) {
+					$a[$i]['basefilename']='';
+					$a[$i]['descfilename']='';
+					@unlink($ptmp . ".name");
+					@unlink($ptmp . ".hash");
+					DBExec($c,"update problemtable set problemfullname='', problembasefilename='' where problemnumber=$nn and contestnumber=$contestnumber",
+						   "DBGetFullProblemData(unfree problem)");
+
 					if($failed!=4) {
 						LogError("Failed to unzip problem package (failcode=$failed, problem=$nn, contest=$contestnumber)");
 						if($failed==1) $a[$i]['fullname']='(ERROR READING FROM DATABASE, OR DIRECTORY PERMISSION PROBLEM)';
@@ -177,7 +207,7 @@ function DBGetFullProblemData($contestnumber,$freeproblems=false) {
 				}
 				cleardir($dir,false,true);
 			}	
-		}	
+		}
 	}
 	DBExec($c, "commit", "GetFullProblemData");
 	return $a;
@@ -282,8 +312,8 @@ function DBNewProblem($contestnumber, $param, $c=null) {
 	$oldfullname='';
 	$deservesupdatetime=false;
 	if ($n == 0) {
-		DBExec ($c, "insert into problemtable (contestnumber, problemnumber, problemname) values " .
-				"($contestnumber, $number, '$name')", "DBNewProblem(insert problem)");
+		DBExec ($c, "insert into problemtable (contestnumber, problemnumber, problemname, problemcolor) values " .
+				"($contestnumber, $number, '$name','-1')", "DBNewProblem(insert problem)");
 		$deservesupdatetime=true;
 		$s = "created";
 	}
@@ -369,7 +399,7 @@ function DBNewProblem($contestnumber, $param, $c=null) {
 		if($deservesupdatetime) {
 			$ds = DIRECTORY_SEPARATOR;
 			if($ds=="") $ds = "/";
-			@unlink($_SESSION["locr"] . $ds . "private" . $ds . "problemtmp" . $ds . "problem" . $number . "-contest" . $contestnumber . '.name');
+			@unlink($_SESSION["locr"] . $ds . "private" . $ds . "problemtmp" . $ds . "contest" . $contestnumber ."-problem" . $number . '.name');
 			DBExec ($c, "update problemtable set updatetime=" . $updatetime .
 					" where contestnumber=$contestnumber and problemnumber=$number", "DBNewProblem(time)");
 		}
@@ -407,7 +437,8 @@ function DBGetProblems($contest,$showanyway=false) {
 
 		$ds = DIRECTORY_SEPARATOR;
 		if($ds=="") $ds = "/";
-		$ptmp = $_SESSION["locr"] . $ds . "private" . $ds . "problemtmp" . $ds . "problem" . $a[$i]['number'] . "-contest" . $contest;
+		$nn = $a[$i]['number'];
+		$ptmp = $_SESSION["locr"] . $ds . "private" . $ds . "problemtmp" . $ds . "contest" . $contestnumber ."-problem" . $nn;
 		if(is_readable($ptmp . ".name")) {
 			$a[$i]['descfilename']=trim(file_get_contents($ptmp . ".name"));
 			if($a[$i]['descfilename'] != '')
diff --git a/boca-1.5.0/src/frun.php b/boca-1.5.0/src/frun.php
index cd6cd50..3ea398a 100644
--- a/boca-1.5.0/src/frun.php
+++ b/boca-1.5.0/src/frun.php
@@ -412,9 +412,8 @@ function DBGetRunToAutojudging($contest, $ip) {
 		"r.runnumber as number, r.rundatediff as timestamp, r.runstatus as status, " .
 		"r.rundata as sourceoid, r.runfilename as sourcename, l.langnumber as langnumber, " .
 		"p.problemname as problemname, p.problemnumber as problemnumber, l.langextension as extension, l.langname as language, " .
-		"p.problembasefilename as basename, p.problemtimelimit as timelimit, ".
+		"p.problembasefilename as basename, ".
 		"p.probleminputfilename as inputname, p.probleminputfile as inputoid, " .
-		"p.problemsolfilename as solname, p.problemsolfile as soloid, " .
 		"r.autoip as autoip, r.autobegindate as autobegin, r.autoenddate as autoend, r.autoanswer as autoanswer, ".
 		"r.autostdout as autostdout, r.autostderr as autostderr ".
 		"from runtable as r, problemtable as p, langtable as l " .
@@ -947,5 +946,83 @@ function DBJudgedRuns($contest,$site,$user) {
 	}
 	return $a;
 }
+
+function exitmsg($retval) {
+/* FROM SAFEEXEC
+# 0 ok
+# 1 compile error
+# 2 runtime error
+# 3 timelimit exceeded
+# 4 internal error
+# 5 parameter error
+# 6 internal error
+# 7 memory limit exceeded
+# 8 security threat
+# 9 runtime error
+*/
+/*
+	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
+			"($n, 0, 'Not answered yet', 'f', 't')", "DBNewContest(insert fake answer)");
+	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
+			"($n, 1, 'YES', 't', 'f')", "DBNewContest(insert YES answer)");
+	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
+			"($n, 2, 'NO - Compilation error', 'f', 'f')", "DBNewContest(insert CE answer)");
+	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
+			"($n, 3, 'NO - Runtime error', 'f', 'f')", "DBNewContest(insert RE answer)");
+	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
+			"($n, 4, 'NO - Time limit exceeded', 'f', 'f')", "DBNewContest(insert TLE answer)");
+	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
+			"($n, 5, 'NO - Presentation error', 'f', 'f')", "DBNewContest(insert PE answer)");
+	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
+			"($n, 6, 'NO - Wrong answer', 'f', 'f')", "DBNewContest(insert WA answer)");
+	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
+			"($n, 7, 'NO - Contact staff', 'f', 'f')", "DBNewContest(insert CS answer)");
+*/
+	if($retval==-1) {
+		$answer="Internal error while executing run command";
+		$retval = 7; // contact staff
+	}
+	else if($retval==1) {
+		$answer="Compilation error";
+		$retval = 2; // compilation error
+	}
+	else if($retval==2) {
+		$answer="Runtime error";
+		$retval = 3; // runtime error
+	}
+	else if($retval==3) {
+		$answer="Time limit exceeded";
+		$retval = 4; // timelimit exceeded
+	}
+	else if($retval==4) {
+		$answer="safeexec internal error (4)";
+		$retval = 7; // contact staff
+	}
+	else if($retval==5) {
+		$answer="safeexec error: parameter problem";
+		$retval = 7; // contact staff
+	}
+	else if($retval==6) {
+		$answer="safeexec internal error (6)";
+		$retval = 7; // contact staff
+	}
+	else if($retval==7) {
+		$answer="Runtime error (memory-limit)";
+		$retval = 3; // runtime error
+	}
+	else if($retval==8) {
+		$answer="Code generates security threat";
+		$retval = 3; // runtime error
+	}
+	else if($retval==9) {
+		$answer="Runtime error";
+		$retval = 3; // runtime error
+	} else {
+		$answer="Unknown autojudge status";
+		$retval = 7;
+	}
+	return array($retval,$answer);
+}
+
 // eof
 ?>
diff --git a/boca-1.5.0/src/judge/runedit.php b/boca-1.5.0/src/judge/runedit.php
index e446ad7..e53b3a3 100644
--- a/boca-1.5.0/src/judge/runedit.php
+++ b/boca-1.5.0/src/judge/runedit.php
@@ -102,19 +102,9 @@ $b = DBGetProblemData($_SESSION["usertable"]["contestnumber"], $a["problemnumber
 <?php
 for ($i=0;$i<count($b);$i++) {
         $if = rawurlencode($b[$i]["inputfilename"]);
-        $sf = rawurlencode($b[$i]["solfilename"]);
 
         echo "<a href=\"../filedownload.php?". filedownload($b[$i]["inputoid"],$b[$i]["inputfilename"]) . "\">";
-        echo $b[$i]["inputfilename"] . "</a>";
-//        echo " <a href=\"#\" class=menu style=\"font-weight:bold\" onClick=\"window.open('../filewindow.php?".
-//            filedownload($b[$i]["inputoid"],$b[$i]["inputfilename"]) ."', 'View$i - INPUT','width=680,height=600,scrollbars=yes,".
-//	     "resizable=yes')\">view</a> &nbsp;";
-
-//        echo "<b>Sol:</b><a href=\"../filedownload.php?". filedownload($b[$i]["soloid"],$b[$i]["solfilename"]) . "\">";
-//        echo $b[$i]["solfilename"] . "</a>";
-//        echo " <a href=\"#\" class=menu style=\"font-weight:bold\" onClick=\"window.open('../filewindow.php?".
-//             filedownload($b[$i]["soloid"],$b[$i]["solfilename"]) . "', 'View$i - CORRECT OUTPUT','width=680,height=600,scrollbars=yes,".
-//	     "resizable=yes')\">view</a>";
+        echo basename($b[$i]["inputfilename"]) . "</a>";
 }
 ?>
 	&nbsp;</td>
diff --git a/boca-1.5.0/src/judge/runeditchief.php b/boca-1.5.0/src/judge/runeditchief.php
index 6395650..c538dca 100644
--- a/boca-1.5.0/src/judge/runeditchief.php
+++ b/boca-1.5.0/src/judge/runeditchief.php
@@ -96,7 +96,6 @@ if (($a = DBChiefGetRunToAnswer($runnumber, $runsitenumber,
 }
 
 $b = DBGetProblemData($_SESSION["usertable"]["contestnumber"], $a["problemnumber"]);
-$c = DBGetLanguageData($_SESSION["usertable"]["contestnumber"], $a["langnumber"], $a["problemnumber"]);
 ?>
 <br><br><center><b>Use the following fields to judge the run:
 </b></center>
@@ -143,18 +142,8 @@ for ($i=0;$i<count($b);$i++) {
 	&nbsp;</td>
       </tr>
       <tr> 
-        <td width="27%" align=right><b>Language</b><i> <?php echo $a["language"]; ?></i>:</td>
-        <td width="83%">
-<?php
-		if (isset($c["compilation"]) && $c["compilation"]!="") echo "<b>Compilation Line:</b> ".$c["compilation"]. "<br>"; 
-        if (isset($c["execution"]) && $c["execution"]!="") echo "<b>Execution Line:</b> ".$c["execution"]. "<br>";
-        if (isset($c["showoutput"]) && $c["showoutput"]!="") echo "<b>Showing Output Line:</b> ". $c["showoutput"]. "<br>";
-
-        if (isset($c["scriptname"]) && $c["scriptname"]!="") {
-			echo "<b>Script for judging:</b> <a href=\"../filedownload.php?". filedownload($c["scriptoid"], $c["scriptname"]) ."\">";
-			echo $c["scriptname"] . "</a>";
-		}
-?>
+        <td width="27%" align=right><b>Language</b>:</td>
+        <td width="83%"><i> <?php echo $a["language"]; ?></i>
         &nbsp;</td>
       </tr>
       <tr> 
diff --git a/boca-1.5.0/src/optionlower.php b/boca-1.5.0/src/optionlower.php
index b2eb5d4..9c997e3 100644
--- a/boca-1.5.0/src/optionlower.php
+++ b/boca-1.5.0/src/optionlower.php
@@ -56,17 +56,18 @@ $a = DBUserInfo($_SESSION["usertable"]["contestnumber"],
 <script language="JavaScript">
 function computeHASH()
 {
-        var username, userdesc, userfull, passHASHo, passHASHn1, passHASHn2;
+	var username, userdesc, userfull, passHASHo, passHASHn1, passHASHn2;
 	if (document.form1.passwordn1.value != document.form1.passwordn2.value) return;
-        username = document.form1.username.value;
-        userdesc = document.form1.userdesc.value;
-        userfull = document.form1.userfull.value;
-        passMDo = js_myhash(js_myhash(document.form1.passwordo.value)+'<?php echo session_id(); ?>');
-        passMDn = bighexsoma(js_myhash(document.form1.passwordn2.value),js_myhash(document.form1.passwordo.value));
-        document.form1.passwordo.value = '';
-        document.form1.passwordn1.value = '';
-        document.form1.passwordn2.value = '';
-        document.location='option.php?username='+username+'&userdesc='+userdesc+'&userfullname='+userfull+'&passwordo='+passMDo+'&passwordn='+passMDn;
+	username = document.form1.username.value;
+	userdesc = document.form1.userdesc.value;
+	userfull = document.form1.userfull.value;
+
+	passMDo = js_myhash(js_myhash(document.form1.passwordo.value)+'<?php echo session_id(); ?>');
+	passMDn = bighexsoma(js_myhash(document.form1.passwordn2.value),js_myhash(document.form1.passwordo.value));
+	document.form1.passwordo.value = '';
+	document.form1.passwordn1.value = '';
+	document.form1.passwordn2.value = '';
+	document.location='option.php?username='+username+'&userdesc='+userdesc+'&userfullname='+userfull+'&passwordo='+passMDo+'&passwordn='+passMDn;
 }
 </script>
 
diff --git a/boca-1.5.0/src/private/autojudging.php b/boca-1.5.0/src/private/autojudging.php
index cdd1e2e..d5c49df 100755
--- a/boca-1.5.0/src/private/autojudging.php
+++ b/boca-1.5.0/src/private/autojudging.php
@@ -82,7 +82,13 @@ $cf = globalconf();
 $ip = $cf["ip"];
 $activecontest=DBGetActiveContest();
 $prevsleep=0;
+$dodebug=1;
 while(42) {
+if(!isset($dodebug)) {
+	if(isset($dir)) cleardir($dir);
+	if(isset($name)) unlink($name);
+}
+
 if(($run = DBGetRunToAutojudging($activecontest["contestnumber"], $ip)) === false) {
   if($prevsleep==0)
     echo "Nothing to do. Sleeping...";
@@ -129,86 +135,39 @@ chdir($dir);
 
 echo "Using directory $dir (contest=$contest, site=$site, run=$number)\n";
 
-/*
-if($run["scriptoid"]=="" || $run["scriptname"]=="") {
-	LogLevel("Autojuging: Script file not defined (run=$number, site=$site, contest=$contest)",1);
-        echo "Compiling/running script file not defined (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: compiling/running script not defined");
-	continue;
-}
-if($run["compscriptoid"]=="" || $run["compscriptname"]=="") {
-	LogLevel("Autojuging: Comparing script file not defined (run=$number, site=$site, contest=$contest)",1);
-        echo "Comparing script file not defined (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: comparing script not defined");
-	continue;
-}
-*/
 if($run["sourceoid"]=="" || $run["sourcename"]=="") {
 	LogLevel("Autojuging: Source file not defined (run=$number, site=$site, contest=$contest)",1);
-        echo "Source file not defined (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: source file not defined");
+	echo "Source file not defined (contest=$contest, site=$site, run=$number)\n";
+	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: source file not defined");
 	continue;
 }
 if($run["inputoid"]=="" || $run["inputname"]=="") {
 	LogLevel("Autojuging: problem package not defined (run=$number, site=$site, contest=$contest)",1);
-        echo "Package file not defined (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file not defined");
+	echo "Package file not defined (contest=$contest, site=$site, run=$number)\n";
+	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file not defined");
 	continue;
 }
-/*
-if($run["soloid"]=="" || $run["solname"]=="") {
-	LogLevel("Autojuging: sol file not defined (run=$number, site=$site, contest=$contest)",1);
-        echo "solfile not defined (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: correct output file not defined");
-	continue;
-}
-*/
 $c = DBConnect();
 DBExec($c, "begin work", "Autojudging(exporttransaction)");
-/*
-if(DB_lo_export($c, $run["scriptoid"], $dir . $ds . $run["scriptname"]) === false) {
-        DBExec($c, "rollback work", "Autojudging(rollback-script)");
-	LogLevel("Autojuging: Unable to export script file (run=$number, site=$site, contest=$contest)",1);
-        echo "Error exporting compiling/running script file ${run["scriptname"]} (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: unable to export compiling/running script");
-	continue;
-}
-*/
-if(DB_lo_export($c, $run["sourceoid"], $dir . $ds . $run["sourcename"]) === false) {
+if(DB_lo_export($contest,$c, $run["sourceoid"], $dir . $ds . $run["sourcename"]) === false) {
         DBExec($c, "rollback work", "Autojudging(rollback-source)");
 	LogLevel("Autojudging: Unable to export source file (run=$number, site=$site, contest=$contest)",1);
         echo "Error exporting source file ${run["sourcename"]} (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
 	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: unable to export source file");
 	DBExec($c, "commit", "Autojudging(exportcommit)");
 	continue;
 }
 if(is_readable($cache . $ds . $run["inputoid"] . "." . $run["inputname"])) {
 	DBExec($c, "commit", "Autojudging(exportcommit)");
-	echo "Getting problem package file from local cache\n";
+	echo "Getting problem package file from local cache: " . $cache . $ds . $run["inputoid"] . "." . $run["inputname"] . "\n";
 	$s = file_get_contents($cache .	$ds . $run["inputoid"]	. "." . $run["inputname"]);
 	file_put_contents($dir . $ds . $run["inputname"], decryptData($s,$key));
 } else {
-	echo "Downloading problem package file from db\n";
-	if(DB_lo_export($c, $run["inputoid"], $dir . $ds . $run["inputname"]) === false) {
+	echo "Downloading problem package file from db into: " . $dir . $ds . $run["inputname"] . "\n";
+	if(DB_lo_export($contest,$c, $run["inputoid"], $dir . $ds . $run["inputname"]) === false) {
         DBExec($c, "rollback work", "Autojudging(rollback-input)");
 		LogLevel("Autojudging: Unable to export problem package file (run=$number, site=$site, contest=$contest)",1);
         echo "Error exporting problem package file ${run["inputname"]} (contest=$contest, site=$site, run=$number)\n";
-		cleardir($dir);
-		unlink($name);
 		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: unable to export problem package file");
 		DBExec($c, "commit", "Autojudging(exportcommit)");
 		continue;
@@ -221,138 +180,77 @@ if(is_readable($cache . $ds . $run["inputoid"] . "." . $run["inputname"])) {
 		$zip->extractTo($dir . $ds . "problemdata");
 		$zip->close();
 	} else {
-		echo 'Failed to unzip the file -- please check the problem package\n';
+		echo "Failed to unzip the package file -- please check the problem package (maybe it is encrypted?)\n";
 		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+		cleardir($dir . $ds . "problemdata");
 		continue;
 	}
-	if(($info=file($dir . $ds . "problemdata" . $ds . "description" . $ds . 'problem.info'))===false) {
-		echo 'Problem content missing (description/problem.info) -- please check the problem package\n';
-		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+	if(($info=@parse_ini_file($dir . $ds . "problemdata" . $ds . "description" . $ds . 'problem.info'))===false) {
+		echo "Problem content missing (description/problem.info) -- please check the problem package\n";
+		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is incomplete");
+		cleardir($dir . $ds . "problemdata");
 		continue;
 	}
-	$basename='';
-	foreach($info as $line) {
-		$a=explode('=',$line);
-		if(trim($a[0])=='basename') {
-			$basename=trim($a[1]);
-			break;
-		}
-	}
+	$descfile=trim(sanitizeText($info['descfile']));
+	$basename=trim(sanitizeText($info['basename']));
+	$fullname=trim(sanitizeText($info['fullname']));
 	if($basename=='') {
-		echo 'Problem content missing (description/problem.info) -- please check the problem package\n';
+		echo "Problem content missing (description/problem.info) -- please check the problem package\n";
 		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+		cleardir($dir . $ds . "problemdata");
 		continue;
 	}
 	if(!is_dir($dir . $ds . "problemdata" . $ds . "limits")) {
-		echo 'Problem content missing (limits) -- please check the problem package\n';
+		echo "Problem content missing (limits) -- please check the problem package\n";
 		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+		cleardir($dir . $ds . "problemdata");
 		continue;
 	}
 	chdir($dir . $ds . "problemdata" . $ds . "limits");
+	$limits[$basename]=array();
 	foreach(glob($dir . $ds . "problemdata" . $ds . "limits" .$ds . '*') as $file) {
 		chmod($file,0700);
 		$ex = escapeshellcmd($file);
 		$ex .= " >stdout 2>stderr";
-		echo "Executing INIT SCRIPT " . $ex . "\n";
+		echo "Executing INIT SCRIPT " . $ex . " at " . getcwd() . "\n";
 		if(system($ex, $retval)===false) $retval=-1;
 		if($retval != 0) {
-			echo 'Error running script -- please check the problem package\n';
+			echo "Error running script -- please check the problem package\n";
 			DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+			cleardir($dir . $ds . "problemdata");
 			continue;
 		}
-		$limits[$basename] = file('stdout');
+		$limits[$basename][basename($file)] = file('stdout',FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 	}
-
+	$cont=false;
 	foreach(glob($dir . $ds . "problemdata" . $ds . "tests" .$ds . '*') as $file) {
 		chdir($dir . $ds . "problemdata" . $ds . "tests");
 		chmod($file,0700);
 		$ex = escapeshellcmd($file);
 		$ex .= " >stdout 2>stderr";
-		echo "Executing TEST SCRIPT " . $ex . "\n";
+		echo "Executing TEST SCRIPT " . $ex . " at " . getcwd() . "\n";
 		if(system($ex, $retval)===false) $retval=-1;
 		if($retval != 0) {
-			echo 'Error running test script -- please check the problem package\n';
+			echo "Error running test script -- please check the problem package\n";
 			DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: internal test script failed");
-			continue;
+			$cont=true;
+			break;
 		}
 	}
 	cleardir($dir . $ds . "problemdata");
+	if($cont)
+		continue;
+
 	$s = file_get_contents($dir . $ds . $run["inputname"]);
 	file_put_contents($cache . $ds . $run["inputoid"] . "." . $run["inputname"], encryptData($s,$key));
 }
 
-function exitmsg($retval) {
-/* FROM SAFEEXEC
-# 0 ok
-# 1 compile error
-# 2 runtime error
-# 3 timelimit exceeded
-# 4 internal error
-# 5 parameter error
-# 6 internal error
-# 7 memory limit exceeded
-# 8 security threat
-# 9 runtime error
-*/
-/*
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 0, 'Not answered yet', 'f', 't')", "DBNewContest(insert fake answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 1, 'YES', 't', 'f')", "DBNewContest(insert YES answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 2, 'NO - Compilation error', 'f', 'f')", "DBNewContest(insert CE answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 3, 'NO - Runtime error', 'f', 'f')", "DBNewContest(insert RE answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 4, 'NO - Time limit exceeded', 'f', 'f')", "DBNewContest(insert TLE answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 5, 'NO - Presentation error', 'f', 'f')", "DBNewContest(insert PE answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 6, 'NO - Wrong answer', 'f', 'f')", "DBNewContest(insert WA answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 7, 'NO - Contact staff', 'f', 'f')", "DBNewContest(insert CS answer)");
-*/
-	if($retval==-1) {
-		$answer="Internal error while executing run command";
-		$retval = 7; // contact staff
-	}
-	else if($retval==1) {
-		$answer="Compilation error";
-		$retval = 2; // compilation error
-	}
-	else if($retval==2) {
-		$answer="Runtime error";
-		$retval = 3; // runtime error
-	}
-	else if($retval==3) {
-		$answer="Time limit exceeded";
-		$retval = 4; // timelimit exceeded
-	}
-	else if($retval==4) {
-		$answer="safeexec internal error (4)";
-		$retval = 7; // contact staff
-	}
-	else if($retval==5) {
-		$answer="safeexec error: parameter problem";
-		$retval = 7; // contact staff
-	}
-	else if($retval==6) {
-		$answer="safeexec internal error (6)";
-		$retval = 7; // contact staff
-	}
-	else if($retval==7) {
-		$answer="Runtime error (memory-limit)";
-		$retval = 3; // runtime error
-	}
-	else if($retval==8) {
-		$answer="Code generates security threat";
-		$retval = 3; // runtime error
-	}
-	else if($retval==9) {
-		$answer="Runtime error";
-		$retval = 3; // runtime error
-	}
-	return array($retval,$answer);
+if(!isset($limits[$basename][$run["extension"]][0]) || !is_numeric($limits[$basename][$run["extension"]][0]) ||
+   !isset($limits[$basename][$run["extension"]][1]) || !is_numeric($limits[$basename][$run["extension"]][1]) ||
+   !isset($limits[$basename][$run["extension"]][2]) || !is_numeric($limits[$basename][$run["extension"]][2]) ) {
+	echo "Failed to find proper limits information for the problem -- please check the problem package\n";
+	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+	continue;
 }
 
 // COMPILATION
@@ -364,31 +262,46 @@ function exitmsg($retval) {
 
 $zip = new ZipArchive;
 if ($zip->open($dir . $ds . $run["inputname"]) === true) {
-	$zip->extractTo($dir, "compile" . $ds . $run["extension"]);
+	$zip->extractTo($dir, array("compile" . $ds . $run["extension"]));
 	$zip->close();
 } else {
-	echo 'Failed to unzip the file -- please check the problem package\n';
+	echo "Failed to unzip the package file -- please check the problem package\n";
 	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
 	continue;
 }
 
 $script = $dir . $ds . 'compile' . $ds . $run["extension"];
 if(!is_file($script)) {
-	echo 'Error (not found) compile script for '.$run["extension"].' -- please check the problem package\n';
+	echo "Error (not found) compile script for ".$run["extension"]." -- please check the problem package\n";
 	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: compile script failed (".$run["extension"].")");
 	continue;
 }
 
+chdir($dir);
+@unlink('allout');
+system('touch allout');
+@unlink('allerr');
+system('touch allerr');
+
 chmod($script, 0700);
 $ex = escapeshellcmd($script) ." ".
 	escapeshellarg($run["sourcename"])." ".
-	"run.exe ".
-	escapeshellarg(trim($limits[$run["extension"]][0]))." ".
-	escapeshellarg(trim($limits[$run["extension"]][2]));
+	escapeshellarg($basename) . " ".
+	escapeshellarg(trim($limits[$basename][$run["extension"]][0]))." ".
+	escapeshellarg(trim($limits[$basename][$run["extension"]][2]));
 $ex .= " >stdout 2>stderr";
-echo "Executing " . $ex . "\n";
+echo "Executing " . $ex . " at " . getcwd() . "\n";
 if(system($ex, $retval)===false) $retval=-1;
 
+if(is_readable('stdout')) {
+    system('echo ##### COMPILATION STDOUT: >> allerr');
+	system('cat stdout >> allerr');
+}
+if(is_readable('stderr')) {
+    system('echo ##### COMPILATION STDERR: >> allerr');
+	system('cat stderr >> allerr');
+}
+
 if($retval != 0) {
 	list($retval,$answer) = exitmsg($retval);
 	$answer = "(WHILE COMPILING) " . $answer;
@@ -401,48 +314,70 @@ if($retval != 0) {
 //# $5 maximum allowed memory (in KBytes)
 
 	$zip = new ZipArchive;
+	$inputlist = array();
+	$ninputlist = 0;
+	$outputlist = array();
+	$noutputlist = 0;
 	if ($zip->open($dir . $ds . $run["inputname"]) === true) {
-		$zip->extractTo($dir, array("run" . $ds . $run["extension"],"input" . $ds . '*'));
-		$zip->close();
+		for($i = 0; $i < $zip->numFiles; $i++) {
+			$filename = $zip->getNameIndex($i);
+			$pos = strrpos(dirname($filename),"input");
+			if($pos !== false && $pos==strlen(dirname($filename))-5) {
+				$inputlist[$ninputlist++] = 'input' . $ds . basename($filename);
+				$outputlist[$noutputlist++] = 'output' . $ds . basename($filename);
+			}
+		}
+		$zip->extractTo($dir, array_merge(array("run" . $ds . $run["extension"]),$inputlist));
+		$zip->close();    
 	} else {
-		echo 'Failed to unzip the file (inputs) -- please check the problem package\n';
+		echo "Failed to unzip the file (inputs) -- please check the problem package\n";
 		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
 		continue;
 	}
-	chdir($dir);
-	@unlink('allout');
-	@unlink('allerr');
 	$retval = 0;
 	$script = $dir . $ds . 'run' . $ds . $run["extension"];
+	if(!is_file($script)) {
+		echo "Failed to unzip the run script -- please check the problem package\n";
+		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+		continue;
+	}
 	chmod($script, 0700);
 	mkdir('team', 0755);
-	$d = opendir($dir . $ds . "input");
-	while (($file = readdir($d)) !== false) {
-		if(is_file($dir . $ds . "input" . $ds . $file)) {
-			$ex = escapeshellcmd($script) ." ".
-				"run.exe ".
-				escapeshellarg($dir . $ds . "input" . $ds . $file)." ".
-				escapeshellarg(trim($limit[0]))." ".
-				escapeshellarg(trim($limit[1]))." ".
-				escapeshellarg(trim($limit[2]));
-			$ex .= " >stdout 2>stderr";
-			echo "Executing " . $ex . " for input " . $file . "\n";
-			if(system($ex, $retval)===false) $retval=-1;
-			foreach (glob($dir . $ds . '*') as $fne) {
-				@chown($fne,"nobody");
-				@chmod($fne,0755);
-			}
-			if(is_readable('stderr0'))
-				system('cat stderr0 >> stderr');
-			system('echo ##### STDERR FOR FILE ' . escapeshellarg($file) . ' >> allerr');
-			system('cat stderr >> allerr');
-			system('cat stdout > team' . $ds . escapeshellarg($file));
-			system('echo ##### STDOUT FOR FILE ' . escapeshellarg($file) . ' >> allout');
-			system('cat stdout >> allout');
-			if($retval != 0) {
-				list($retval,$answer) = exitmsg($retval);
-				$answer = "(WHILE RUNNING) " . $answer;
-				break;
+	if($ninputlist == 0) {
+		echo "Failed to read input files from ZIP -- please check the problem package\n";
+		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+		continue;
+	} else {
+		foreach($inputlist as $file) {
+			$file = basename($file);
+			if(is_file($dir . $ds . "input" . $ds . $file)) {
+				$ex = escapeshellcmd($script) ." ".
+					escapeshellarg($basename) . " ".
+					escapeshellarg($dir . $ds . "input" . $ds . $file)." ".
+					escapeshellarg(trim($limits[$basename][$run["extension"]][0]))." ".
+					escapeshellarg(trim($limits[$basename][$run["extension"]][1]))." ".
+					escapeshellarg(trim($limits[$basename][$run["extension"]][2]));
+				$ex .= " >stdout 2>stderr";
+				echo "Executing " . $ex . " at " . getcwd() . " for input " . $file . "\n";
+				if(system($ex, $retval)===false) $retval=-1;
+				foreach (glob($dir . $ds . '*') as $fne) {
+					@chown($fne,"nobody");
+					@chmod($fne,0755);
+				}
+				if(is_readable('stderr0'))
+					system('cat stderr0 >> stderr');
+				system('echo ##### STDERR FOR FILE ' . escapeshellarg($file) . ' >> allerr');
+				system('cat stderr >> allerr');
+				system('cat stdout > team' . $ds . escapeshellarg($file));
+				system('echo ##### STDOUT FOR FILE ' . escapeshellarg($file) . ' >> allout');
+				system('cat stdout >> allout');
+				if($retval != 0) {
+					list($retval,$answer) = exitmsg($retval);
+					$answer = "(WHILE RUNNING) " . $answer;
+					break;
+				}
+			} else {
+				echo "==> ERROR reading input file " . $dir . $ds . "input" . $ds . $file . " - skipping it!\n";
 			}
 		}
 	}
@@ -450,24 +385,24 @@ if($retval != 0) {
 		echo "Processing results\n";
 		$zip = new ZipArchive;
 		if ($zip->open($dir . $ds . $run["inputname"]) === true) {
-			$zip->extractTo($dir, array("compare" . $ds . $run["extension"],"output" . $ds . '*'));
+			$zip->extractTo($dir, array_merge(array("compare" . $ds . $run["extension"]),$outputlist));
 			$zip->close();
 		} else {
-			echo 'Failed to unzip the file (outputs) -- please check the problem package\n';
+			echo "Failed to unzip the file (outputs) -- please check the problem package\n";
 			DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
 			continue;
 		}
 		$script = $dir . $ds . 'compare' . $ds . $run["extension"];
 		$retval = 0;
 		chmod($script, 0700);
-		$d = opendir($dir . $ds . "output");
-		while (($file = readdir($d)) !== false) {
-			if(is_file($dir . $ds . "output" . $ds . $file)) {
+		foreach($outputlist as $file) {
+			$file = basename($file);
+			if(is_file($dir . $ds . 'output' . $ds . $file)) {
 				$ex = escapeshellcmd($script) ." ".
-					escapeshellarg("team" . $ds . $file)." ".
-					escapeshellarg("output" . $ds . $file)." ".
-					escapeshellarg("input" . $ds . $file) . " >compout";
-				echo "Executing " . $ex . "\n";
+					escapeshellarg($dir . $ds . "team" . $ds . $file)." ".
+					escapeshellarg($dir . $ds . "output" . $ds . $file)." ".
+					escapeshellarg($dir . $ds . "input" . $ds . $file) . " >compout";
+				echo "Executing " . $ex . " at " . getcwd() . " for output file $file\n";
 				$answer = system($ex, $localretval);
 
 				$fp = fopen($dir . $ds . "allerr", "a+");
@@ -503,6 +438,8 @@ if($retval != 0) {
 						$answer='Presentation error';
 					}
 				}
+			} else {
+				echo "==> ERROR reading output file " . $dir . $ds . 'output' . $ds . $file . " - skipping it!\n";
 			}
 		}
 	}
@@ -515,23 +452,16 @@ if($retval > 9) {
 			 "(run=$number, site=$site, contest=$contest)",1);
 	echo "Autojudging script returned unusual code $retval ($anstmp)".
 		"(contest=$contest, site=$site, run=$number)\n";
-//  cleardir($dir);
-//  unlink($name);
-//  DBGiveUpRunAutojudging($contest, $site, $number, $ip, "(unusual code: $retval) " . $anstmp);
-//  continue;
 	$answer = "(check output files - unusual code: $retval) " . $anstmp;
-	
 	// contact staff
 	$retval = 7;
 }
 
-echo "Sending results to server\n";
+echo "Sending results to server...\n";
+echo "out==> "; system("tail -n1 ". $dir.$ds.'allout');
+echo "err==> "; system("tail -n1 ". $dir.$ds.'allerr');
 DBUpdateRunAutojudging($contest, $site, $number, $ip, $answer, $dir.$ds.'allout', $dir.$ds.'allerr', $retval);
 LogLevel("Autojudging: answered '$answer' (run=$number, site=$site, contest=$contest)",3);
 echo "Autojudging answered '$answer' (contest=$contest, site=$site, run=$number)\n";
-if(!isset($dodebug)) {
-	cleardir($dir);
-	unlink($name);
-}
 }
 ?>
diff --git a/boca-1.5.0/src/team/header.php b/boca-1.5.0/src/team/header.php
index 23c6d98..2690766 100644
--- a/boca-1.5.0/src/team/header.php
+++ b/boca-1.5.0/src/team/header.php
@@ -93,10 +93,10 @@ if(!isset($_SESSION["popuptime"]) || $_SESSION["popuptime"] < time()-120) {
 							$_SESSION["usertable"]["usersitenumber"],
 							$_SESSION["usertable"]["usernumber"]);
 		for ($i=0; $i<count($clar); $i++) {
-			if ($clar[$i]["timestamp"]>$_SESSION["usertable"]["userlastlogin"]-$st["sitestartdate"] && 
-				$clar[$i]["timestamp"] < $st['siteduration'] &&
-				trim($clar[$i]["answer"])!='' && !isset($_SESSION["popups"]['clar' . $i . '-' . $clar[$i]["timestamp"]])) {
-				$_SESSION["popups"]['clar' . $i . '-' . $clar[$i]["timestamp"]] = "Clarification for problem ".$clar[$i]["problem"]." answered\n";
+			if ($clar[$i]["anstime"]>$_SESSION["usertable"]["userlastlogin"]-$st["sitestartdate"] && 
+				$clar[$i]["anstime"] < $st['siteduration'] &&
+				trim($clar[$i]["answer"])!='' && !isset($_SESSION["popups"]['clar' . $i . '-' . $clar[$i]["anstime"]])) {
+				$_SESSION["popups"]['clar' . $i . '-' . $clar[$i]["anstime"]] = "Clarification for problem ".$clar[$i]["problem"]." answered\n";
 			}
 		}
 		$run = DBUserRuns($_SESSION["usertable"]["contestnumber"],
@@ -112,14 +112,16 @@ if(!isset($_SESSION["popuptime"]) || $_SESSION["popuptime"] < time()-120) {
 	}
 
 	$str = '';
-	foreach($_SESSION["popups"] as $key => $value) {
-        if($value != '') {
-			$str .= $value;
-			$_SESSION["popups"][$key] = '';
-        }
-	}
-	if($str != '') {
-        MSGError('YOU GOT NEWS:\n' . $str . '\n');
+	if(isset($_SESSION["popups"])) {
+		foreach($_SESSION["popups"] as $key => $value) {
+			if($value != '') {
+				$str .= $value;
+				$_SESSION["popups"][$key] = '';
+			}
+		}
+		if($str != '') {
+			MSGError('YOU GOT NEWS:\n' . $str . '\n');
+		}
 	}
 }