From 94c6cd12dacf9de46051c57e6f6bf216e86c8df8 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Wed, 9 Aug 2017 13:10:10 +0100
Subject: new langs, new answer, fix for automatic

---
 src/fcontest.php | 20 +++++++++++++++-----
 src/frun.php     | 11 +++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/fcontest.php b/src/fcontest.php
index b34658f..5c11549 100644
--- a/src/fcontest.php
+++ b/src/fcontest.php
@@ -1039,10 +1039,18 @@ function insertlanguages($n,$c=null) {
 	$param['name']='Java';
 	$param['extension']='java';
 	DBNewLanguage($n, $param, $c);
-//	$param['number']=4;
-//	$param['name']='C++11';
-//	$param['extension']='cc';
-//	DBNewLanguage($n, $param, $c);
+	$param['number']=4;
+	$param['name']='Python2';
+	$param['extension']='py2';
+	DBNewLanguage($n, $param, $c);
+	$param['number']=5;
+	$param['name']='Python3';
+	$param['extension']='py3';
+	DBNewLanguage($n, $param, $c);
+	$param['number']=6;
+	$param['name']='C++11';
+	$param['extension']='cc';
+	DBNewLanguage($n, $param, $c);
 }
 function insertanswers($n,$c) {
 	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
@@ -1060,7 +1068,9 @@ function insertanswers($n,$c) {
 	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 - If possible, contact staff', 'f', 'f')", "DBNewContest(insert CS answer)");
+			"($n, 7, 'NO - Contact staff', 'f', 'f')", "DBNewContest(insert CS answer)");
+	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
+			"($n, 8, 'NO - Name mismatch', 'f', 'f')", "DBNewContest(insert MI answer)");
 }
 function DBNewSite ($contest, $c=null, $param=array()) {
 	$cw = false;
diff --git a/src/frun.php b/src/frun.php
index 5576bcd..eb5d33f 100644
--- a/src/frun.php
+++ b/src/frun.php
@@ -512,6 +512,17 @@ function DBGiveUpRunAutojudging($contest, $site, $number, $ip="", $ans="") {
 	}
 	$a = DBRow($r,0);
 	$t = time();
+	
+	$b = DBSiteInfo($contest, $site, $c);
+	if($b["siteautojudge"]=="t") {
+	  if(DBUpdateRunO($contest, $site, $a["usernumber"], $site, $number, 7, $c)==false) {  // 7 means contact staff
+	    DBExec($c, "rollback work", "DBGiveUpRunAutojudging(rollback auto)");
+	    LOGError("Unable to automatically update a run answer (run=$number, site=$site, ".
+		     "contest=$contest, answer='$ans', retval=7)");
+	    return false;
+	  }
+	  LOGLevel("Autojudging automatically answered a run (run=$number, site=$site, contest=$contest, retval=7, answer='$ans')", 3);
+	}
 
 	if($ip=="") {
 		DBExec($c, "update runtable set autoenddate=null, autoanswer=null, autostdout=null, autostderr=null, " .
-- 
cgit v1.2.3