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

replaced ManiaControl log method by direct Logger usage

Browse Source
This commit is contained in:
Steffen Schröder
2014-08-05 01:49:13 +02:00
parent b62d6af929
commit a6b0d749bc
22 changed files with 111 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ use FML\Controls\Quad;
use FML\Controls\Quads\Quad_Icons64x64_1;
use FML\ManiaLink;
use ManiaControl\Admin\AuthenticationManager;
use ManiaControl\Logger;
use ManiaControl\ManiaControl;
use ManiaControl\Manialinks\ManialinkManager;
use ManiaControl\Utils\Formatter;
@ -101,8 +102,7 @@ class PlayerActions {
try {
$this->maniaControl->getClient()->forcePlayerTeam($target->login, $teamId);
} catch (FaultException $exception) {
// TODO: replace by more specific exception "there are too many ..."
} catch (ServerOptionsException $exception) {
$this->forcePlayerToPlay($adminLogin, $targetLogin);
return;
}
@ -118,7 +118,7 @@ class PlayerActions {
return;
}
$this->maniaControl->getChat()->sendInformation($chatMessage);
$this->maniaControl->log($chatMessage, true);
Logger::logInfo($chatMessage, true, true, true);
}
/**
@ -197,7 +197,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' forced ' . $target->getEscapedNickname(). ' to Spectator!';
$this->maniaControl->getChat()->sendInformation($chatMessage);
$this->maniaControl->log($chatMessage, true);
Logger::logInfo($chatMessage, true, true, true);
if ($releaseSlot) {
// Free player slot
@ -238,7 +238,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname() . ' un-muted ' . $target->getEscapedNickname(). '!';
$this->maniaControl->getChat()->sendInformation($chatMessage);
$this->maniaControl->log($chatMessage, true);
Logger::logInfo($chatMessage, true, true, true);
}
/**
@ -270,7 +270,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' muted ' . $target->getEscapedNickname(). '!';
$this->maniaControl->getChat()->sendInformation($chatMessage);
$this->maniaControl->log($chatMessage, true);
Logger::logInfo($chatMessage, true, true, true);
}
/**
@ -352,7 +352,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' warned ' . $target->getEscapedNickname(). '!';
$this->maniaControl->getChat()->sendInformation($chatMessage);
$this->maniaControl->log($chatMessage, true);
Logger::log($chatMessage, true, true);
}
/**
@ -388,7 +388,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname() . ' kicked ' . $target->getEscapedNickname() . '!';
$this->maniaControl->getChat()->sendInformation($chatMessage);
$this->maniaControl->log(Formatter::stripCodes($chatMessage));
Logger::logInfo($chatMessage, true, true, true);
}
/**
@ -420,7 +420,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' banned ' . $target->getEscapedNickname(). '!';
$this->maniaControl->getChat()->sendInformation($chatMessage);
$this->maniaControl->log($chatMessage, true);
Logger::logInfo($chatMessage, true, true, true);
}
/**
@ -458,7 +458,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' added ' . $target->getEscapedNickname(). ' as $< ' . $authLevelName . '$>!';
$this->maniaControl->getChat()->sendInformation($chatMessage);
$this->maniaControl->log($chatMessage, true);
Logger::logInfo($chatMessage, true, true, true);
}
/**
@ -495,7 +495,7 @@ class PlayerActions {
$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' ' . $admin->getEscapedNickname(). ' revoked the Rights of ' . $target->getEscapedNickname(). '!';
$this->maniaControl->getChat()->sendInformation($chatMessage);
$this->maniaControl->log($chatMessage, true);
Logger::logInfo($chatMessage, true, true, true);
}
/**

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

@ -7,6 +7,7 @@ use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\Callbacks\Callbacks;
use ManiaControl\Callbacks\TimerListener;
use ManiaControl\Logger;
use ManiaControl\ManiaControl;
use ManiaControl\Statistics\StatisticManager;
use ManiaControl\Utils\Formatter;
@ -318,7 +319,7 @@ class PlayerManager implements CallbackListener, TimerListener {
$played = Formatter::formatTimeH(time() - $player->joinTime);
$logMessage = "Player left: {$player->login} / {$player->nickname} Playtime: {$played}";
$this->maniaControl->log(Formatter::stripCodes($logMessage));
Logger::logInfo($logMessage, true, true, true);
if ($this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_JOIN_LEAVE_MESSAGES)) {
$this->maniaControl->getChat()->sendChat('$0f0$<$fff' . $player->nickname . '$> has left the game');
@ -415,8 +416,8 @@ class PlayerManager implements CallbackListener, TimerListener {
$this->maniaControl->getChat()->sendInformation('This server uses ManiaControl v' . ManiaControl::VERSION . '!', $player->login);
}
$logMessage = "Player joined: {$player->login} / " . Formatter::stripCodes($player->nickname) . " Nation: " . $player->getCountry() . " IP: {$player->ipAddress}";
$this->maniaControl->log($logMessage);
$logMessage = "Player joined: {$player->login} / {$player->nickname} Nation: " . $player->getCountry() . " IP: {$player->ipAddress}";
Logger::logInfo($logMessage, true, true, true);
// Increment the Player Join Count
$this->maniaControl->getStatisticManager()->incrementStat(self::STAT_JOIN_COUNT, $player, $this->maniaControl->getServer()->index);