diff options
| author | Cassio de Campos <cassiopc@gmail.com> | 2017-10-30 17:39:47 +0000 |
|---|---|---|
| committer | Cassio de Campos <cassiopc@gmail.com> | 2017-10-30 17:39:47 +0000 |
| commit | 29b85dd9d449e0eeee5ec3371297b425037dc9ca (patch) | |
| tree | 2b12c6e6a78bc0ff6a26955bf40913894e9858dd | |
| parent | 5977b90537aec964301a7f03e188eef2fb5cb2b4 (diff) | |
| download | boca-29b85dd9d449e0eeee5ec3371297b425037dc9ca.tar.gz boca-29b85dd9d449e0eeee5ec3371297b425037dc9ca.zip | |
remove encryption if not desired
| -rw-r--r-- | src/fextdata.php | 6 | ||||
| -rw-r--r-- | src/private/conf.php | 2 | ||||
| -rw-r--r-- | src/site/getsite.php | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/fextdata.php b/src/fextdata.php index b64bfeb..bb12ccd 100644 --- a/src/fextdata.php +++ b/src/fextdata.php @@ -334,9 +334,11 @@ function getMainXML($contest,$timeo=5,$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"; - $s = generateSiteXML($contest, $localsite, $updatetime-30); + $data = generateSiteXML($contest, $localsite, $updatetime-30); // $logstr .= $s; - $data = encryptData($s, myhash(trim($sitedata[2]))); + $gc = globalconf(); + if(!isset($gc['doenc']) || $gc['doenc']) + $data = encryptData($data, myhash(trim($sitedata[2]))); $data_url = http_build_query(array('xml' => $data, 'updatetime' => ($updatetime-30) )); diff --git a/src/private/conf.php b/src/private/conf.php index 71956c0..c35fb6a 100644 --- a/src/private/conf.php +++ b/src/private/conf.php @@ -20,7 +20,7 @@ function globalconf() { $conf["dbencoding"]="UTF8"; $conf["dbclientenc"]="UTF8"; - $conf['doenc']=FALSE; + $conf['doenc']=false; $conf["dblocal"]="false"; // use unix socket to connect? $conf["dbhost"]="localhost"; diff --git a/src/site/getsite.php b/src/site/getsite.php index 8e9cac1..1c3b3bd 100644 --- a/src/site/getsite.php +++ b/src/site/getsite.php @@ -48,7 +48,11 @@ if($ct["contestlocalsite"]==$ct["contestmainsite"]) { } if(isset($_POST['updatetime']) && is_numeric($_POST['updatetime'])) { $xml = generateSiteXML($_SESSION["usertable"]["contestnumber"],$fromsite,$_POST['updatetime']); - echo "<!-- " . encryptData($xml,$u["userpassword"]) . " -->"; + $gc = globalconf(); + if(!isset($gc['doenc']) || $gc['doenc']) + echo "<!-- " . encryptData($xml,$u["userpassword"]) . " -->"; + else + echo "<!-- " . $xml . " -->"; } } else { echo "<!-- <ERROR3> ".session_id() . " -->\n"; |