diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/fextdata.php | 10 | ||||
| -rw-r--r-- | src/site/getsite.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/fextdata.php b/src/fextdata.php index b5f577e..da6e559 100644 --- a/src/fextdata.php +++ b/src/fextdata.php @@ -336,7 +336,7 @@ function getMainXML($contest,$timeo=20,$upd=false) { // LOGError("ok=" . $ok); if(substr($ok,strlen($ok)-strlen('TRANSFER OK'),strlen('TRANSFER OK')) == 'TRANSFER OK') { $logstr .= "Generating local data for site [$localsite] at time [$updatetime]\n"; - $data = generateSiteXML($contest, $localsite, $updatetime-30); + $data = generateSiteXML($contest, $localsite, $updatetime-30, $localsite); $logstr .= $data[1]; $data = $data[0]; // $logstr .= $s; @@ -646,7 +646,7 @@ function importFromXML($ar,$contest,$site,$tomain=false,$uptime=0) { return array(true, $logstr); } -function genSQLs($contest, $site, $updatetime) { +function genSQLs($contest, $site, $updatetime, $mainsite=1) { $sql = array(); $sql['contesttable']="select contestnumber, contestname, conteststartdate, contestduration, contestlastmileanswer," . "contestlastmilescore, contestpenalty, contestmaxfilesize, contestmainsite, contestkeys " . @@ -669,15 +669,15 @@ function genSQLs($contest, $site, $updatetime) { "updatetime" . " from problemtable where contestnumber=$contest and fake='f' and updatetime >= $updatetime"; $sql['sitetimetable']="select * from sitetimetable where contestnumber=$contest and sitenumber=$site and updatetime >= $updatetime"; - $sql['usertable']="select * from usertable where contestnumber=$contest and usersitenumber=$site and updatetime >= $updatetime"; + $sql['usertable']="select * from usertable where contestnumber=$contest and (usersitenumber=$site or usersitenumber=$mainsite) and updatetime >= $updatetime"; $sql['clartable']="select * from clartable where contestnumber=$contest and clarsitenumber=$site and updatetime >= $updatetime"; $sql['runtable']="select * from runtable where contestnumber=$contest and runsitenumber=$site and updatetime >= $updatetime"; $sql['tasktable']="select * from tasktable where contestnumber=$contest and sitenumber=$site and updatetime >= $updatetime"; return $sql; } -function generateSiteXML($contest,$site,$updatetime) { - $sql = genSQLs($contest, $site, $updatetime); +function generateSiteXML($contest,$site,$updatetime, $mainsite=1) { + $sql = genSQLs($contest, $site, $updatetime, $mainsite); $c = DBConnect(); $str = "<XML>\n"; $logstr = ''; diff --git a/src/site/getsite.php b/src/site/getsite.php index 7eacecd..ca20eb5 100644 --- a/src/site/getsite.php +++ b/src/site/getsite.php @@ -51,7 +51,7 @@ if($ct["contestlocalsite"]==$ct["contestmainsite"]) { } } if(isset($_POST['updatetime']) && is_numeric($_POST['updatetime'])) { - $xml = generateSiteXML($_SESSION["usertable"]["contestnumber"],$fromsite,$_POST['updatetime']); + $xml = generateSiteXML($_SESSION["usertable"]["contestnumber"],$fromsite,$_POST['updatetime'],$ct["contestmainsite"]); if(!isset($gc['doenc']) || $gc['doenc']) echo "<!-- " . encryptData($xml[0],$u["userpassword"]) . " -->"; else |