aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCassio de Campos <cassiopc@gmail.com>2017-10-30 17:51:25 +0000
committerCassio de Campos <cassiopc@gmail.com>2017-10-30 17:51:25 +0000
commit6afcfee58309ec7932e94deda56324f76bebff5f (patch)
tree8cac39cc1b3e5e4b3092e4ef75e22a9c1d138b31 /src
parent496f25fc597fc66125fc2bc964905c071f2ead11 (diff)
downloadboca-6afcfee58309ec7932e94deda56324f76bebff5f.tar.gz
boca-6afcfee58309ec7932e94deda56324f76bebff5f.zip
encode data properly
Diffstat (limited to 'src')
-rw-r--r--src/fextdata.php2
-rw-r--r--src/site/getsite.php5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/fextdata.php b/src/fextdata.php
index 4dd1004..4fbc405 100644
--- a/src/fextdata.php
+++ b/src/fextdata.php
@@ -339,6 +339,7 @@ function getMainXML($contest,$timeo=5,$upd=false) {
$gc = globalconf();
if(!isset($gc['doenc']) || $gc['doenc'])
$data = encryptData($data, myhash(trim($sitedata[2])));
+ else $data = base64_encode($data);
$data_url = http_build_query(array('xml' => $data, 'updatetime' => ($updatetime-30)
));
@@ -384,6 +385,7 @@ function getMainXML($contest,$timeo=5,$upd=false) {
// LOGError("string: " . substr($s,0,50));
if(!isset($gc['doenc']) || $gc['doenc'])
$s = decryptData($s,myhash(trim($sitedata[2])),'xml from main not ok');
+ else $s = base64_decode($s);
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 2ff555e..bf4a609 100644
--- a/src/site/getsite.php
+++ b/src/site/getsite.php
@@ -36,10 +36,11 @@ if($ct["contestlocalsite"]==$ct["contestmainsite"]) {
// $fp=fopen('/tmp/aaa',"w"); fwrite($fp,$_POST['xml']); fclose($fp);
if(!isset($gc['doenc']) || $gc['doenc'])
$s = decryptData($_POST['xml'],$u["userpassword"],'xml from local not ok');
- else $s = $_POST['xml'];
+ else $s = base64_decode($_POST['xml']);
// $fp=fopen('/tmp/aaa1',"w"); fwrite($fp,$s); fclose($fp);
if(strtoupper(substr($s,0,5)) != "<XML>") {
echo "<!-- <ERROR8> ".session_id() . " -->\n";
+ echo "<!-- <NOTOK> -->";
} else {
$resp = importFromXML($s,$_SESSION["usertable"]["contestnumber"],$fromsite,true);
echo $resp[1];
@@ -54,7 +55,7 @@ if($ct["contestlocalsite"]==$ct["contestmainsite"]) {
if(!isset($gc['doenc']) || $gc['doenc'])
echo "<!-- " . encryptData($xml,$u["userpassword"]) . " -->";
else
- echo "<!-- " . $xml . " -->";
+ echo "<!-- " . base64_encode($xml) . " -->";
}
} else {
echo "<!-- <ERROR3> ".session_id() . " -->\n";