diff --git a/core/Files/AsyncHttpRequest.php b/core/Files/AsyncHttpRequest.php index 4fe45ca2..0d960ce3 100644 --- a/core/Files/AsyncHttpRequest.php +++ b/core/Files/AsyncHttpRequest.php @@ -89,9 +89,10 @@ class AsyncHttpRequest implements UsageInformationAble { array_push($this->headers, 'Keep-Alive: timeout=600, max=2000'); array_push($this->headers, 'Connection: Keep-Alive'); - $content = str_replace(array("\r", "\n"), '', $this->content); + //$content = str_replace(array("\r", "\n"), '', $this->content); + $content = $this->content; if ($this->compression) { - $content = zlib_encode($content, 31); + $content = zlib_encode($this->content, ZLIB_ENCODING_GZIP); array_push($this->headers, 'Content-Encoding: gzip'); } diff --git a/plugins/MCTeam/Dedimania/DedimaniaPlugin.php b/plugins/MCTeam/Dedimania/DedimaniaPlugin.php index 7c748b22..c8cad684 100644 --- a/plugins/MCTeam/Dedimania/DedimaniaPlugin.php +++ b/plugins/MCTeam/Dedimania/DedimaniaPlugin.php @@ -36,7 +36,7 @@ class DedimaniaPlugin implements CallbackListener, CommandListener, TimerListene * Constants */ const ID = 8; - const VERSION = 0.3; + const VERSION = 0.4; const AUTHOR = 'MCTeam'; const NAME = 'Dedimania Plugin'; const MLID_DEDIMANIA = 'Dedimania.ManialinkId'; diff --git a/plugins/MCTeam/Dedimania/DedimaniaWebHandler.php b/plugins/MCTeam/Dedimania/DedimaniaWebHandler.php index cc0fe65d..24dcd5aa 100644 --- a/plugins/MCTeam/Dedimania/DedimaniaWebHandler.php +++ b/plugins/MCTeam/Dedimania/DedimaniaWebHandler.php @@ -262,18 +262,23 @@ class DedimaniaWebHandler implements TimerListener { $this->addRequest(self::DEDIMANIA_WARNINGSANDTTR2, array()); - $content = xmlrpc_encode_request(self::XMLRPC_MULTICALL, array($this->requests), array('encoding' => 'UTF-8', 'escaping' => 'markup')); - + $content = xmlrpc_encode_request(self::XMLRPC_MULTICALL, array($this->requests), array('encoding' => 'UTF-8', 'escaping' => 'markup', 'verbosity' => 'no_white_space')); $asyncHttpRequest = new AsyncHttpRequest($this->maniaControl, self::DEDIMANIA_URL); - $asyncHttpRequest->setCallable(function ($data, $error) { + $asyncHttpRequest->setCallable(function ($answerData, $error) { if ($error) { - Logger::logError("Dedimania Error while update playerlist: " . $error); + Logger::logError("Dedimania Error while Request: " . $error); $this->checkDedimaniaSession(); return; } - $data = $this->decode($data); + $data = $this->decode($answerData); + if(!$data){ + //TODO just Temporary + var_dump("Dedimania Debug:"); + var_dump($answerData); + } + if (!is_array($data) || empty($data) || !isset($data[0]) || !isset($data[0][0]) || $data[0][0] == false) { return; } @@ -357,7 +362,8 @@ class DedimaniaWebHandler implements TimerListener { }); $asyncHttpRequest->setContent($content); - $asyncHttpRequest->setCompression(true); + //$asyncHttpRequest->setCompression(true); + //FIXME setChallengeTime Compressed gives Dedimania Error 400 $asyncHttpRequest->setTimeout(500); $asyncHttpRequest->postData();