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

refactoring and improvements

Browse Source
This commit is contained in:
Steffen Schröder
2014-04-27 15:21:57 +02:00
parent acf9053117
commit 332f8d76fb
7 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/core/Files/AsynchronousFileReader.php
View File

@ -2,6 +2,7 @@
namespace ManiaControl\Files;
use cURL\Event;
use cURL\Exception;
use cURL\Request;
use cURL\Response;
@ -86,7 +87,7 @@ class AsynchronousFileReader {
->set(CURLOPT_USERAGENT, 'ManiaControl v' . ManiaControl::VERSION) //
->set(CURLOPT_RETURNTRANSFER, true);
$request->addListener('complete', function (\cURL\Event $event) use (&$function) {
$request->addListener('complete', function (Event $event) use (&$function) {
/** @var Response $response */
$response = $event->response;
@ -156,7 +157,7 @@ class AsynchronousFileReader {
->set(CURLOPT_USERAGENT, 'ManiaControl v' . ManiaControl::VERSION) //
->set(CURLOPT_RETURNTRANSFER, true);
$request->addListener('complete', function (\cURL\Event $event) use (&$function) {
$request->addListener('complete', function (Event $event) use (&$function) {
/** @var Response $response */
$response = $event->response;
$error = "";

5
application/core/ManiaControl.php
View File

@ -25,6 +25,7 @@ use ManiaControl\Update\UpdateManager;
use Maniaplanet\DedicatedServer\Connection;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
use Maniaplanet\DedicatedServer\Xmlrpc\NotInScriptModeException;
use Maniaplanet\DedicatedServer\Xmlrpc\TransportException;
require_once __DIR__ . '/Libs/Maniaplanet/DedicatedServer/Connection.php';
require_once __DIR__ . '/Libs/GbxDataFetcher/gbxdatafetcher.inc.php';
@ -61,7 +62,7 @@ class ManiaControl implements CommandListener, TimerListener {
public $authenticationManager = null;
public $callbackManager = null;
public $chat = null;
public $config = null;
public $config = null;
public $configurator = null;
/** @var Connection $client */
public $client = null;
@ -435,7 +436,7 @@ class ManiaControl implements CommandListener, TimerListener {
$this->client->setModeScriptSettings($scriptSettings);
} catch(Exception $e) {
//TODO temp added 19.04.2014
$this->maniaControl->errorHandler->triggerDebugNotice("Exception line 437 ManiaControl.php " . $e->getMessage());
$this->errorHandler->triggerDebugNotice("Exception line 437 ManiaControl.php " . $e->getMessage());
trigger_error("Couldn't set mode script settings to enable script callbacks. " . $e->getMessage());
return;

1
application/core/Server/Server.php
View File

@ -24,6 +24,7 @@ class Server implements CallbackListener {
/*
* Public Properties
*/
/** @var Config $config */
public $config = null;
public $index = -1;
public $ip = null;

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

@ -7,7 +7,6 @@ use ManiaControl\Formatter;
use ManiaControl\ManiaControl;
use ManiaControl\Plugins\Plugin;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
use Maniaplanet\DedicatedServer\Xmlrpc\FatalException;
/**
* Class reporting ManiaControl Usage for the Server

3
application/core/Update/PluginInstallMenu.php
View File

@ -16,6 +16,7 @@ use ManiaControl\Files\FileUtil;
use ManiaControl\ManiaControl;
use ManiaControl\Manialinks\ManialinkPageAnswerListener;
use ManiaControl\Players\Player;
use ManiaControl\Plugins\Plugin;
/**
* Configurator for enabling and disabling Plugins
@ -100,7 +101,7 @@ class PluginInstallMenu implements CallbackListener, ConfiguratorMenu, Manialink
if ($pluginList && isset($pluginList[0])) {
$pluginClasses = $this->maniaControl->pluginManager->getPluginClasses();
$pluginIds = array();
/** @var Plugin $class */
/** @var Plugin $class */
foreach($pluginClasses as $class) {
$pluginIds[] = $class::getId();
}