diff options
| author | Cassio de Campos <cassiopc@gmail.com> | 2017-10-30 19:08:34 +0000 |
|---|---|---|
| committer | Cassio de Campos <cassiopc@gmail.com> | 2017-10-30 19:08:34 +0000 |
| commit | 6b5fc8ccd45770aea39727ad4b0e333540ce7a7b (patch) | |
| tree | ae3431947343c1f71bfafc5dfdc895de30ba71c3 | |
| parent | 3ccdafc2ac0609d02f0e04f242b60a686a41c03a (diff) | |
| download | boca-6b5fc8ccd45770aea39727ad4b0e333540ce7a7b.tar.gz boca-6b5fc8ccd45770aea39727ad4b0e333540ce7a7b.zip | |
accept users from main
| -rw-r--r-- | src/fextdata.php | 6 | ||||
| -rw-r--r-- | src/site/getsite.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/fextdata.php b/src/fextdata.php index f1e568a..e688347 100644 --- a/src/fextdata.php +++ b/src/fextdata.php @@ -402,7 +402,7 @@ function getMainXML($contest,$timeo=20,$upd=false) { return $logstr; } $logstr .= "Importing data to local server\n"; - $resp = importFromXML($s, $contest, $localsite, false, 1+$ct['updatetime']); + $resp = importFromXML($s, $contest, $localsite, false, 1+$ct['updatetime'], $mainsite); // $logstr .= "AC: " . now() . "\n" $logstr .= $resp[1]; if($resp[0]) { @@ -422,7 +422,7 @@ function getMainXML($contest,$timeo=20,$upd=false) { return $logstr; } -function importFromXML($ar,$contest,$site,$tomain=false,$uptime=0) { +function importFromXML($ar,$contest,$site,$tomain=false,$uptime=0,$mainsite=1) { LOGInfo("importFromXML: contest $contest site $site tomain $tomain"); $logstr = ''; if($tomain) $serv='Main'; else $serv='Local'; @@ -550,7 +550,7 @@ function importFromXML($ar,$contest,$site,$tomain=false,$uptime=0) { if(isset($param['usersitenumber']) && !isset($param['sitenumber'])) $param['sitenumber']=$param['usersitenumber']; if(isset($param['clarsitenumber']) && !isset($param['sitenumber'])) $param['sitenumber']=$param['clarsitenumber']; if(isset($param['runsitenumber']) && !isset($param['sitenumber'])) $param['sitenumber']=$param['runsitenumber']; - if(!isset($param['sitenumber']) || $param['sitenumber'] != $site) { + if(!isset($param['sitenumber']) || ($param['sitenumber'] != $site && $param['sitenumber'] != $mainsite)) { $logstr .= "$serv - site mismatch should be [$site] and is [" . $param['sitenumber'] . "]\n"; LOGError("importFromXML: site mismatch should be [$site] and is [" . $param['sitenumber'] . "]"); continue; diff --git a/src/site/getsite.php b/src/site/getsite.php index ca20eb5..d2b616d 100644 --- a/src/site/getsite.php +++ b/src/site/getsite.php @@ -42,7 +42,7 @@ if($ct["contestlocalsite"]==$ct["contestmainsite"]) { echo "<!-- <ERROR8> ".session_id() . " -->\n"; echo "<!-- <NOTOK> -->"; } else { - $resp = importFromXML($s,$_SESSION["usertable"]["contestnumber"],$fromsite,true); + $resp = importFromXML($s,$_SESSION["usertable"]["contestnumber"],$fromsite,true,-1); echo $resp[1]; if($resp[0]) echo "<!-- <OK> -->"; |