From 394858d0bce7a433d1b12d584b3d37c62629836f Mon Sep 17 00:00:00 2001 From: Cassio de Campos Date: Mon, 31 Jul 2017 12:26:53 +0100 Subject: bf --- src/fextdata.php | 5 +++-- src/site/getsite.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/fextdata.php b/src/fextdata.php index 6acffaa..cdb087c 100644 --- a/src/fextdata.php +++ b/src/fextdata.php @@ -287,6 +287,7 @@ function getMainXML() { } function importFromXML($ar,$contest,$site,$tomain=false) { + LOGError("importFromXML: contest $contest site $site tomain $tomain"); $data = implode("",explode("\n",$ar)); $parser = xml_parser_create(); xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 1); @@ -463,7 +464,7 @@ function genSQLs($contest, $site, $updatetime) { function generateSiteXML($contest,$site,$updatetime) { $sql = genSQLs($contest, $site, $updatetime); $c = DBConnect(); - $str = ""; + $str = "\n"; if ($c==null) return null; DBExec($c, "begin work"); foreach($sql as $kk => $vv) { @@ -485,8 +486,8 @@ function generateSiteXML($contest,$site,$updatetime) { } else { $str .= " <" . $key . ">" . $val . "\n"; } - $str .= "\n"; } + $str .= "\n"; } } $str .= "\n"; diff --git a/src/site/getsite.php b/src/site/getsite.php index 3948d74..27d581e 100644 --- a/src/site/getsite.php +++ b/src/site/getsite.php @@ -32,7 +32,7 @@ if($ct["contestlocalsite"]==$ct["contestmainsite"]) { if($fromsite != '' && is_numeric($fromsite) && $fromsite > 0) { if(isset($_POST)) { if(isset($_POST['xml'])) { - $u = DBUserInfo($_SESSION["usertable"]["contestnumber"], $_SESSION["usertable"]["sitenumber"], $_SESSION["usertable"]["usernumber"],null,false); + $u = DBUserInfo($_SESSION["usertable"]["contestnumber"], $_SESSION["usertable"]["usersitenumber"], $_SESSION["usertable"]["usernumber"],null,false); // $fp=fopen('/tmp/aaa',"w"); fwrite($fp,$_POST['xml']); fclose($fp); $s = decryptData(rawurldecode($_POST['xml']),$u["userpassword"],'xml from local not ok'); // $fp=fopen('/tmp/aaa1',"w"); fwrite($fp,$s); fclose($fp); -- cgit v1.2.3