aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fscore.php9
-rwxr-xr-xsrc/private/autojudging.php2
-rw-r--r--src/scorelower.php3
3 files changed, 10 insertions, 4 deletions
diff --git a/src/fscore.php b/src/fscore.php
index 6faeb63..df3fce3 100644
--- a/src/fscore.php
+++ b/src/fscore.php
@@ -365,10 +365,13 @@ function DBScoreSite($contest, $site, $verifylastmile, $hor=-1, $data=null) {
$resp[$user . '-' . $site]["problem"][$problem]["count"] = 0;
while ($i<$n && $a[$i]["anstime"] <= $ta && $a[$i]["user"]==$user && $a[$i]["problem"]==$problem && $a[$i]["yes"]!='t') {
- $time += (int) (($ct["contestpenalty"])/60);
- $k++;
- $i++;
+ // now CE, Name Mismatch and Contact Staff do not generate penalties
+ if($a[$i]["answer"] != '2' && $a[$i]["answer"] != '7' && $a[$i]["answer"] != '8')
+ $time += (int) (($ct["contestpenalty"])/60);
+ $k++;
+ $i++;
}
+
$resp[$user . '-' . $site]["problem"][$problem]["count"] = $k;
if ($i>=$n) break;
diff --git a/src/private/autojudging.php b/src/private/autojudging.php
index e44aaeb..83e2bdd 100755
--- a/src/private/autojudging.php
+++ b/src/private/autojudging.php
@@ -79,10 +79,10 @@ $key=md5(mt_rand() . rand() . mt_rand());
$cf = globalconf();
$ip = $cf["ip"];
-$activecontest=DBGetActiveContest();
$prevsleep=0;
//$dodebug=1;
while(42) {
+ $activecontest=DBGetActiveContest();
if(($run = DBGetRunToAutojudging($activecontest["contestnumber"], $ip)) === false) {
if($prevsleep==0)
diff --git a/src/scorelower.php b/src/scorelower.php
index 62165f1..f4b88b1 100644
--- a/src/scorelower.php
+++ b/src/scorelower.php
@@ -36,6 +36,9 @@ if($_SESSION["usertable"]["usertype"]=='staff') $ver=false;
if($_SESSION["usertable"]["usertype"]=="score") $des=false;
else $des=true;
+if($_SESSION["usertable"]["usertype"]=="score" && substr($_SESSION["usertable"]["username"],0,9) == "scoreboss" ) $ver=false;
+
+
// temp do carlinhos (placar de judge == placar de time)
//if ($_SESSION["usertable"]["usertype"]=="judge") $ver = true;