diff options
| author | Cassio de Campos <cassiopc@gmail.com> | 2017-10-30 17:44:16 +0000 |
|---|---|---|
| committer | Cassio de Campos <cassiopc@gmail.com> | 2017-10-30 17:44:16 +0000 |
| commit | 496f25fc597fc66125fc2bc964905c071f2ead11 (patch) | |
| tree | 182e2a7571b770e4a2fbd8757fc3b0c7609182a2 /src | |
| parent | 29b85dd9d449e0eeee5ec3371297b425037dc9ca (diff) | |
| download | boca-496f25fc597fc66125fc2bc964905c071f2ead11.tar.gz boca-496f25fc597fc66125fc2bc964905c071f2ead11.zip | |
bf
Diffstat (limited to 'src')
| -rw-r--r-- | src/fextdata.php | 3 | ||||
| -rw-r--r-- | src/site/getsite.php | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/fextdata.php b/src/fextdata.php index bb12ccd..4dd1004 100644 --- a/src/fextdata.php +++ b/src/fextdata.php @@ -382,7 +382,8 @@ function getMainXML($contest,$timeo=5,$upd=false) { $s = substr($s, strpos($s, $chstr) + strlen($chstr)); $s = substr($s, 0, strpos($s, " -->")); // LOGError("string: " . substr($s,0,50)); - $s = decryptData($s,myhash(trim($sitedata[2])),'xml from main not ok'); + if(!isset($gc['doenc']) || $gc['doenc']) + $s = decryptData($s,myhash(trim($sitedata[2])),'xml from main not ok'); if(strtoupper(substr($s,0,5)) != "<XML>") { $logstr .= "Data corrupted\n"; return $logstr; diff --git a/src/site/getsite.php b/src/site/getsite.php index 1c3b3bd..2ff555e 100644 --- a/src/site/getsite.php +++ b/src/site/getsite.php @@ -26,6 +26,7 @@ if(($ct = DBContestInfo($_SESSION["usertable"]["contestnumber"])) == null) { exit; } if($ct["contestlocalsite"]==$ct["contestmainsite"]) { + $gc = globalconf(); $fromsite = $_SESSION["usertable"]["usericpcid"]; LOGLevel("Connection received from site=$fromsite",2); // PHPID=".$_COOKIE['PHPSESSID'].",extra=".$_SESSION['usertable']['usersessionextra'].",session=".session_id(),2); if($fromsite != '' && is_numeric($fromsite) && $fromsite > 0) { @@ -33,7 +34,9 @@ if($ct["contestlocalsite"]==$ct["contestmainsite"]) { $u = DBUserInfo($_SESSION["usertable"]["contestnumber"], $_SESSION["usertable"]["usersitenumber"], $_SESSION["usertable"]["usernumber"],null,false); if(isset($_POST['xml'])) { // $fp=fopen('/tmp/aaa',"w"); fwrite($fp,$_POST['xml']); fclose($fp); - $s = decryptData(rawurldecode($_POST['xml']),$u["userpassword"],'xml from local not ok'); + if(!isset($gc['doenc']) || $gc['doenc']) + $s = decryptData($_POST['xml'],$u["userpassword"],'xml from local not ok'); + else $s = $_POST['xml']; // $fp=fopen('/tmp/aaa1',"w"); fwrite($fp,$s); fclose($fp); if(strtoupper(substr($s,0,5)) != "<XML>") { echo "<!-- <ERROR8> ".session_id() . " -->\n"; @@ -48,7 +51,6 @@ if($ct["contestlocalsite"]==$ct["contestmainsite"]) { } if(isset($_POST['updatetime']) && is_numeric($_POST['updatetime'])) { $xml = generateSiteXML($_SESSION["usertable"]["contestnumber"],$fromsite,$_POST['updatetime']); - $gc = globalconf(); if(!isset($gc['doenc']) || $gc['doenc']) echo "<!-- " . encryptData($xml,$u["userpassword"]) . " -->"; else |