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

small fix

Browse Source
This commit is contained in:
kremsy
2014-01-18 22:06:07 +01:00
committed by Steffen Schröder
parent 0f8a2d91ec
commit 8b5563fbd2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/core/ManiaControl.php
View File

@@ -59,6 +59,7 @@ class ManiaControl implements CommandListener {
const API_VERSION = '2013-04-16';
const OS_UNIX = 'Unix';
const OS_WIN = 'Windows';
const CONNECT_TIMEOUT = 20;
/**
* Public properties
@@ -357,9 +358,8 @@ class ManiaControl implements CommandListener {
}
$pass = (string)$pass[0];
//TODO timeout as constant
try {
$this->client = Connection::factory($host, $port, 20, $login, $pass);
$this->client = Connection::factory($host, $port, self::CONNECT_TIMEOUT, $login, $pass);
} catch(Exception $e) {
trigger_error("Couldn't authenticate on server with user '{$login}'! " . $e->getMessage(), E_USER_ERROR);
}
@@ -407,7 +407,7 @@ class ManiaControl implements CommandListener {
try {
$this->client->setModeScriptSettings($scriptSettings);
} catch(Exception $e) {
trigger_error("Couldn't set mode script settings to enable script callbacks. " . $this->getClientErrorText());
trigger_error("Couldn't set mode script settings to enable script callbacks. " . $e->getMessage());
return;
}
$this->log('Script Callbacks successfully enabled!');

2
application/core/Plugins/PluginManager.php
View File

@@ -126,7 +126,7 @@ class PluginManager {
* @param string $adminLogin
* @return bool
*/
public function activatePlugin($pluginClass, $adminLogin = false) {
public function activatePlugin($pluginClass, $adminLogin = null) {
if(!is_string($pluginClass)) {
return false;
}