diff options
| author | Davi Antônio da Silva Santos <antoniossdavi@gmail.com> | 2023-08-28 23:02:34 +0000 |
|---|---|---|
| committer | Davi Antônio da Silva Santos <antoniossdavi@gmail.com> | 2023-08-28 23:02:34 +0000 |
| commit | 683ce197baf740c7568e237734ddb584892172df (patch) | |
| tree | 90e8bff5f794e5c08fc2e404092d97562c1fb868 | |
| parent | 971ddcd239a999054a320774aee0a57a7dd6e8ee (diff) | |
| parent | 48cd64a927eda583347b70c223c4b5cfa28c9582 (diff) | |
| download | boca-683ce197baf740c7568e237734ddb584892172df.tar.gz boca-683ce197baf740c7568e237734ddb584892172df.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | src/fscore.php | 9 | ||||
| -rwxr-xr-x | src/private/autojudging.php | 2 | ||||
| -rw-r--r-- | src/scorelower.php | 3 | ||||
| -rw-r--r-- | tools/postgresql/14/main/conf.d/000-boca.conf (renamed from tools/postgresql/10/main/conf.d/000-boca.conf) | 0 | ||||
| -rw-r--r-- | tools/postgresql/14/main/pg_hba.conf (renamed from tools/postgresql/10/main/pg_hba.conf) | 0 |
5 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; diff --git a/tools/postgresql/10/main/conf.d/000-boca.conf b/tools/postgresql/14/main/conf.d/000-boca.conf index 128ef1a..128ef1a 100644 --- a/tools/postgresql/10/main/conf.d/000-boca.conf +++ b/tools/postgresql/14/main/conf.d/000-boca.conf diff --git a/tools/postgresql/10/main/pg_hba.conf b/tools/postgresql/14/main/pg_hba.conf index 4eeaa6e..4eeaa6e 100644 --- a/tools/postgresql/10/main/pg_hba.conf +++ b/tools/postgresql/14/main/pg_hba.conf |