beu/TrackManiaControl
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

urlencode

Browse Source
This commit is contained in:
kremsy 2014-02-09 14:01:04 +01:00 committed by Steffen Schröder
parent d0bd5b40c3
commit 7d46cfbcab
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/core/ErrorHandler.php
View File

@ -39,12 +39,12 @@ class ErrorHandler {
$error['ManiaControlVersion'] = ManiaControl::VERSION; $error['ManiaControlVersion'] = ManiaControl::VERSION;
$error['OperatingSystem'] = php_uname(); $error['OperatingSystem'] = php_uname();
$error['PHPVersion'] = phpversion(); $error['PHPVersion'] = phpversion();
$error['ServerLogin'] = null; $error['ServerLogin'] = null;
$json = json_encode($error); $json = json_encode($error);
$info = base64_encode($json); $info = base64_encode($json);
$url = UpdateManager::URL_WEBSERVICE . "errorreport?error=" . $info; $url = UpdateManager::URL_WEBSERVICE . "errorreport?error=" . urlencode($info);
$success = FileUtil::loadFile($url); $success = FileUtil::loadFile($url);
if (!json_decode($success)) { if (!json_decode($success)) {
@ -80,12 +80,12 @@ class ErrorHandler {
$error['ManiaControlVersion'] = ManiaControl::VERSION; $error['ManiaControlVersion'] = ManiaControl::VERSION;
$error['OperatingSystem'] = php_uname(); $error['OperatingSystem'] = php_uname();
$error['PHPVersion'] = phpversion(); $error['PHPVersion'] = phpversion();
$error['ServerLogin'] = $this->maniaControl->server->login; $error['ServerLogin'] = $this->maniaControl->server->login;
$json = json_encode($error); $json = json_encode($error);
$info = base64_encode($json); $info = base64_encode($json);
$url = UpdateManager::URL_WEBSERVICE . "errorreport?error=" . $info; $url = UpdateManager::URL_WEBSERVICE . "errorreport?error=" . urlencode($info);
$success = FileUtil::loadFile($url); $success = FileUtil::loadFile($url);
if (!json_decode($success)) { if (!json_decode($success)) {

2
application/core/ManiaExchange/MXMapInfo.php
View File

@ -39,7 +39,7 @@ class MXMapInfo {
$this->id = $mx->MapID; $this->id = $mx->MapID;
} }
if (!isset($mx->GbxMapName) || $mx->GbxMapName == '') { if (!isset($mx->GbxMapName) || $mx->GbxMapName == '?') {
$this->name = $mx->Name; $this->name = $mx->Name;
} else { } else {
$this->name = Formatter::stripDirtyCodes($mx->GbxMapName); $this->name = Formatter::stripDirtyCodes($mx->GbxMapName);

5
application/core/Server/UsageReporter.php
View File

@ -3,6 +3,7 @@
namespace ManiaControl\Server; namespace ManiaControl\Server;
use ManiaControl\Callbacks\TimerListener; use ManiaControl\Callbacks\TimerListener;
use ManiaControl\Formatter;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
use ManiaControl\UpdateManager; use ManiaControl\UpdateManager;
@ -52,7 +53,7 @@ class UsageReporter implements TimerListener {
$properties['PHPVersion'] = phpversion(); $properties['PHPVersion'] = phpversion();
$properties['ServerLogin'] = $this->maniaControl->server->login; $properties['ServerLogin'] = $this->maniaControl->server->login;
$properties['TitleId'] = $this->maniaControl->server->titleId; $properties['TitleId'] = $this->maniaControl->server->titleId;
$properties['ServerName'] = $this->maniaControl->server->getName(); $properties['ServerName'] = Formatter::stripDirtyCodes($this->maniaControl->server->getName());
$properties['PlayerCount'] = $this->maniaControl->playerManager->getPlayerCount(); $properties['PlayerCount'] = $this->maniaControl->playerManager->getPlayerCount();
try { try {
@ -72,7 +73,7 @@ class UsageReporter implements TimerListener {
$json = json_encode($properties); $json = json_encode($properties);
$info = base64_encode($json); $info = base64_encode($json);
$this->maniaControl->fileReader->loadFile(UpdateManager::URL_WEBSERVICE . "/usagereport?info=" . $info, function ($response, $error) { $this->maniaControl->fileReader->loadFile(UpdateManager::URL_WEBSERVICE . "/usagereport?info=" . urlencode($info), function ($response, $error) {
$response = json_decode($response); $response = json_decode($response);
if ($error || !$response) { if ($error || !$response) {
$this->maniaControl->log("Error while Sending data: " . $error); $this->maniaControl->log("Error while Sending data: " . $error);