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

adjusted logging calls to new parameter order and count

Browse Source
This commit is contained in:
Steffen Schröder 2014-08-05 02:08:41 +02:00
parent 68c9c4e555
commit 98b5f132dc
10 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/core/Configurator/ScriptSettings.php
View File

@ -390,7 +390,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
$chatMessage .= '!'; $chatMessage .= '!';
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::logInfo($chatMessage, true, true, true); Logger::logInfo($chatMessage, true);
return true; return true;
} }

2
application/core/ManiaControl.php
View File

@ -181,7 +181,7 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener {
* @see Logger::log() * @see Logger::log()
*/ */
public function log($message, $stripCodes = false) { public function log($message, $stripCodes = false) {
Logger::log($message, true, true, $stripCodes); Logger::log($message, $stripCodes);
} }
/** /**

2
application/core/Maps/DirectoryBrowser.php
View File

@ -400,7 +400,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
// Message // Message
$message = $player->getEscapedNickname() . ' added ' . $map->getEscapedName() . '!'; $message = $player->getEscapedNickname() . ' added ' . $map->getEscapedName() . '!';
$this->maniaControl->getChat()->sendSuccess($message); $this->maniaControl->getChat()->sendSuccess($message);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
// Queue requested Map // Queue requested Map
$this->maniaControl->getMapManager()->getMapQueue()->addMapToMapQueue($player, $map); $this->maniaControl->getMapManager()->getMapQueue()->addMapToMapQueue($player, $map);

10
application/core/Maps/MapCommands.php
View File

@ -222,7 +222,7 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
$message = $player->getEscapedNickname() . ' skipped the current Map!'; $message = $player->getEscapedNickname() . ' skipped the current Map!';
$this->maniaControl->getChat()->sendSuccess($message); $this->maniaControl->getChat()->sendSuccess($message);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
} }
/** /**
@ -238,7 +238,7 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
} }
$message = $player->getEscapedNickname() . ' restarted the current Map!'; $message = $player->getEscapedNickname() . ' restarted the current Map!';
$this->maniaControl->getChat()->sendSuccess($message); $this->maniaControl->getChat()->sendSuccess($message);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
try { try {
$this->maniaControl->getClient()->restartMap(); $this->maniaControl->getClient()->restartMap();
@ -260,7 +260,7 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
} }
$message = $player->getEscapedNickname() . ' replays the current Map!'; $message = $player->getEscapedNickname() . ' replays the current Map!';
$this->maniaControl->getChat()->sendSuccess($message); $this->maniaControl->getChat()->sendSuccess($message);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
$this->maniaControl->getMapManager()->getMapQueue()->addFirstMapToMapQueue($player, $this->maniaControl->getMapManager()->getCurrentMap()); $this->maniaControl->getMapManager()->getMapQueue()->addFirstMapToMapQueue($player, $this->maniaControl->getMapManager()->getCurrentMap());
} }
@ -294,7 +294,7 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
$message = 'Maplist $<$fff' . $maplist . '$> written.'; $message = 'Maplist $<$fff' . $maplist . '$> written.';
$this->maniaControl->getChat()->sendSuccess($message, $player); $this->maniaControl->getChat()->sendSuccess($message, $player);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
} catch (FaultException $e) { } catch (FaultException $e) {
$this->maniaControl->getChat()->sendError('Cannot write maplist $<$fff' . $maplist . '$>!', $player); $this->maniaControl->getChat()->sendError('Cannot write maplist $<$fff' . $maplist . '$>!', $player);
} }
@ -330,7 +330,7 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
$message = 'Maplist $<$fff' . $maplist . '$> loaded.'; $message = 'Maplist $<$fff' . $maplist . '$> loaded.';
$this->maniaControl->getMapManager()->restructureMapList(); $this->maniaControl->getMapManager()->restructureMapList();
$this->maniaControl->getChat()->sendSuccess($message, $player); $this->maniaControl->getChat()->sendSuccess($message, $player);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
} catch (FaultException $e) { } catch (FaultException $e) {
$this->maniaControl->getChat()->sendError('Cannot load maplist $<$fff' . $maplist . '$>!', $player); $this->maniaControl->getChat()->sendError('Cannot load maplist $<$fff' . $maplist . '$>!', $player);
} }

2
application/core/Maps/MapList.php
View File

@ -655,7 +655,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$message = $player->getEscapedNickname() . ' skipped to Map $z' . $map->getEscapedName() . '!'; $message = $player->getEscapedNickname() . ' skipped to Map $z' . $map->getEscapedName() . '!';
$this->maniaControl->getChat()->sendSuccess($message); $this->maniaControl->getChat()->sendSuccess($message);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
$this->playerCloseWidget($player); $this->playerCloseWidget($player);
break; break;

8
application/core/Maps/MapManager.php
View File

@ -316,7 +316,7 @@ class MapManager implements CallbackListener {
$action = ($eraseFile ? 'erased' : 'removed'); $action = ($eraseFile ? 'erased' : 'removed');
$message = $admin->getEscapedNickname() . ' ' . $action . ' ' . $map->getEscapedName() . '!'; $message = $admin->getEscapedNickname() . ' ' . $action . ' ' . $map->getEscapedName() . '!';
$this->maniaControl->getChat()->sendSuccess($message); $this->maniaControl->getChat()->sendSuccess($message);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
} }
} }
@ -446,13 +446,13 @@ class MapManager implements CallbackListener {
// Message // Message
$message = $player->getEscapedNickname() . ' added $<' . $mapInfo->name . '$>!'; $message = $player->getEscapedNickname() . ' added $<' . $mapInfo->name . '$>!';
$this->maniaControl->getChat()->sendSuccess($message); $this->maniaControl->getChat()->sendSuccess($message);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
// Queue requested Map // Queue requested Map
$this->maniaControl->getMapManager()->getMapQueue()->addMapToMapQueue($login, $mapInfo->uid); $this->maniaControl->getMapManager()->getMapQueue()->addMapToMapQueue($login, $mapInfo->uid);
} else { } else {
$message = $player->getEscapedNickname() . ' updated $<' . $mapInfo->name . '$>!'; $message = $player->getEscapedNickname() . ' updated $<' . $mapInfo->name . '$>!';
$this->maniaControl->getChat()->sendSuccess($message); $this->maniaControl->getChat()->sendSuccess($message);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
} }
} }
@ -603,7 +603,7 @@ class MapManager implements CallbackListener {
if ($admin) { if ($admin) {
$message = $admin->getEscapedNickname() . ' shuffled the Maplist!'; $message = $admin->getEscapedNickname() . ' shuffled the Maplist!';
$this->maniaControl->getChat()->sendSuccess($message); $this->maniaControl->getChat()->sendSuccess($message);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
} }
// Restructure if needed // Restructure if needed

2
application/core/Maps/MapQueue.php
View File

@ -125,7 +125,7 @@ class MapQueue implements CallbackListener, CommandListener {
$message = '$fa0' . $title . ' $<$fff' . $admin->nickname . '$> cleared the Map-Queue!'; $message = '$fa0' . $title . ' $<$fff' . $admin->nickname . '$> cleared the Map-Queue!';
$this->maniaControl->getChat()->sendInformation($message); $this->maniaControl->getChat()->sendInformation($message);
Logger::logInfo($message, true, true, true); Logger::logInfo($message, true);
// Trigger callback // Trigger callback
$this->maniaControl->getCallbackManager()->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('clear')); $this->maniaControl->getCallbackManager()->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('clear'));

18
application/core/Players/PlayerActions.php
View File

@ -118,7 +118,7 @@ class PlayerActions {
return; return;
} }
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::logInfo($chatMessage, true, true, true); Logger::logInfo($chatMessage, true);
} }
/** /**
@ -197,7 +197,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel); $title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' forced ' . $target->getEscapedNickname(). ' to Spectator!'; $chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' forced ' . $target->getEscapedNickname(). ' to Spectator!';
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::logInfo($chatMessage, true, true, true); Logger::logInfo($chatMessage, true);
if ($releaseSlot) { if ($releaseSlot) {
// Free player slot // Free player slot
@ -238,7 +238,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel); $title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname() . ' un-muted ' . $target->getEscapedNickname(). '!'; $chatMessage = $title . ' ' . $admin->getEscapedNickname() . ' un-muted ' . $target->getEscapedNickname(). '!';
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::logInfo($chatMessage, true, true, true); Logger::logInfo($chatMessage, true);
} }
/** /**
@ -270,7 +270,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel); $title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' muted ' . $target->getEscapedNickname(). '!'; $chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' muted ' . $target->getEscapedNickname(). '!';
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::logInfo($chatMessage, true, true, true); Logger::logInfo($chatMessage, true);
} }
/** /**
@ -352,7 +352,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel); $title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' warned ' . $target->getEscapedNickname(). '!'; $chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' warned ' . $target->getEscapedNickname(). '!';
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::log($chatMessage, true, true); Logger::log($chatMessage, true);
} }
/** /**
@ -388,7 +388,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel); $title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname() . ' kicked ' . $target->getEscapedNickname() . '!'; $chatMessage = $title . ' ' . $admin->getEscapedNickname() . ' kicked ' . $target->getEscapedNickname() . '!';
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::logInfo($chatMessage, true, true, true); Logger::logInfo($chatMessage, true);
} }
/** /**
@ -420,7 +420,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel); $title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' banned ' . $target->getEscapedNickname(). '!'; $chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' banned ' . $target->getEscapedNickname(). '!';
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::logInfo($chatMessage, true, true, true); Logger::logInfo($chatMessage, true);
} }
/** /**
@ -458,7 +458,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel); $title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' added ' . $target->getEscapedNickname(). ' as $< ' . $authLevelName . '$>!'; $chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' added ' . $target->getEscapedNickname(). ' as $< ' . $authLevelName . '$>!';
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::logInfo($chatMessage, true, true, true); Logger::logInfo($chatMessage, true);
} }
/** /**
@ -495,7 +495,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel); $title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' revoked the Rights of ' . $target->getEscapedNickname(). '!'; $chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' revoked the Rights of ' . $target->getEscapedNickname(). '!';
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::logInfo($chatMessage, true, true, true); Logger::logInfo($chatMessage, true);
} }
/** /**

4
application/core/Players/PlayerManager.php
View File

@ -319,7 +319,7 @@ class PlayerManager implements CallbackListener, TimerListener {
$played = Formatter::formatTimeH(time() - $player->joinTime); $played = Formatter::formatTimeH(time() - $player->joinTime);
$logMessage = "Player left: {$player->login} / {$player->nickname} Playtime: {$played}"; $logMessage = "Player left: {$player->login} / {$player->nickname} Playtime: {$played}";
Logger::logInfo($logMessage, true, true, true); Logger::logInfo($logMessage, true);
if ($this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_JOIN_LEAVE_MESSAGES)) { if ($this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_JOIN_LEAVE_MESSAGES)) {
$this->maniaControl->getChat()->sendChat('$0f0$<$fff' . $player->nickname . '$> has left the game'); $this->maniaControl->getChat()->sendChat('$0f0$<$fff' . $player->nickname . '$> has left the game');
@ -417,7 +417,7 @@ class PlayerManager implements CallbackListener, TimerListener {
} }
$logMessage = "Player joined: {$player->login} / {$player->nickname} Nation: " . $player->getCountry() . " IP: {$player->ipAddress}"; $logMessage = "Player joined: {$player->login} / {$player->nickname} Nation: " . $player->getCountry() . " IP: {$player->ipAddress}";
Logger::logInfo($logMessage, true, true, true); Logger::logInfo($logMessage, true);
// Increment the Player Join Count // Increment the Player Join Count
$this->maniaControl->getStatisticManager()->incrementStat(self::STAT_JOIN_COUNT, $player, $this->maniaControl->getServer()->index); $this->maniaControl->getStatisticManager()->incrementStat(self::STAT_JOIN_COUNT, $player, $this->maniaControl->getServer()->index);

4
application/core/Plugins/PluginMenu.php
View File

@ -367,7 +367,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
$activated = $this->maniaControl->getPluginManager()->activatePlugin($pluginClass, $player->login); $activated = $this->maniaControl->getPluginManager()->activatePlugin($pluginClass, $player->login);
if ($activated) { if ($activated) {
$this->maniaControl->getChat()->sendSuccess($pluginClass::getName() . ' activated!', $player); $this->maniaControl->getChat()->sendSuccess($pluginClass::getName() . ' activated!', $player);
Logger::logInfo("{$player->login} activated '{$pluginClass}'!", true, true, true); Logger::logInfo("{$player->login} activated '{$pluginClass}'!", true);
} else { } else {
$this->maniaControl->getChat()->sendError('Error activating ' . $pluginClass::getName() . '!', $player); $this->maniaControl->getChat()->sendError('Error activating ' . $pluginClass::getName() . '!', $player);
} }
@ -377,7 +377,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
$deactivated = $this->maniaControl->getPluginManager()->deactivatePlugin($pluginClass); $deactivated = $this->maniaControl->getPluginManager()->deactivatePlugin($pluginClass);
if ($deactivated) { if ($deactivated) {
$this->maniaControl->getChat()->sendSuccess($pluginClass::getName() . ' deactivated!', $player); $this->maniaControl->getChat()->sendSuccess($pluginClass::getName() . ' deactivated!', $player);
Logger::logInfo("{$player->login} deactivated '{$pluginClass}'!", true, true, true); Logger::logInfo("{$player->login} deactivated '{$pluginClass}'!", true);
} else { } else {
$this->maniaControl->getChat()->sendError('Error deactivating ' . $pluginClass::getName() . '!', $player); $this->maniaControl->getChat()->sendError('Error deactivating ' . $pluginClass::getName() . '!', $player);
} }