From 8c5560f779376adc17d99165fb923c46006c7fd1 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Mon, 30 Oct 2017 19:53:11 +0000
Subject: fix tasks

---
 src/fextdata.php | 3 +--
 src/ftask.php    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/fextdata.php b/src/fextdata.php
index 319ed8d..ade78e8 100644
--- a/src/fextdata.php
+++ b/src/fextdata.php
@@ -353,9 +353,8 @@ function getMainXML($contest,$timeo=20,$upd=false) {
     $logstr .=  "Generating local data for site [$localsite] at time [$updatetime]\n";
     $data = generateSiteXML($contest, $localsite, $updatetime-30, $localsite);
     $logstr .= $data[1];
-    $data = $data[0];
     // $logstr .= $s;
-    $data = encryptData($data, myhash(trim($sitedata[2])));
+    $data = encryptData($data[0], myhash(trim($sitedata[2])));
     //    $logstr .= "AB: " . now() . "\n"
     
     $data_url = http_build_query(array('xml' => $data, 'updatetime' => ($updatetime-30)
diff --git a/src/ftask.php b/src/ftask.php
index c54503a..01a4772 100644
--- a/src/ftask.php
+++ b/src/ftask.php
@@ -226,7 +226,7 @@ function DBOpenTasksSNS($contest,$site,$st,$order='task',$adm=false) {
 		"usertable as u " .
 		"where t.contestnumber=$contest and u.contestnumber=t.contestnumber and ".
 		"u.usernumber=t.usernumber and u.usersitenumber=t.sitenumber";
-	if ($site != "x") {
+	if (strpos($site,"x")===false) {
 	        $str = explode(",", $site);
         	$sql .= " and (t.sitenumber=-1";
 	        for ($i=0;$i<count($str);$i++) {
-- 
cgit v1.2.3