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

playerlist advanced clone und bufix

Browse Source
This commit is contained in:
kremsy
2014-01-02 13:35:52 +01:00
parent 449719aa99
commit 18fd95dcd4
3 changed files with 212 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
application/core/Players/PlayerList.php
View File

@@ -11,7 +11,6 @@ use FML\Controls\Quad;
use FML\Controls\Quads\Quad_BgRaceScore2;
use FML\Controls\Quads\Quad_BgsPlayerCard;
use FML\Controls\Quads\Quad_Emblems;
use FML\Controls\Quads\Quad_Icons128x128_1;
use FML\Controls\Quads\Quad_Icons64x64_1;
use FML\Controls\Quads\Quad_UIConstruction_Buttons;
use FML\ManiaLink;
@@ -35,19 +34,19 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
/**
* Constants
*/
const ACTION_FORCE_RED = 'PlayerList.ForceRed';
const ACTION_FORCE_BLUE = 'PlayerList.ForceBlue';
const ACTION_FORCE_SPEC = 'PlayerList.ForceSpec';
const ACTION_PLAYER_ADV = 'PlayerList.PlayerAdvancedActions';
const ACTION_FORCE_RED = 'PlayerList.ForceRed';
const ACTION_FORCE_BLUE = 'PlayerList.ForceBlue';
const ACTION_FORCE_SPEC = 'PlayerList.ForceSpec';
const ACTION_PLAYER_ADV = 'PlayerList.PlayerAdvancedActions';
const ACTION_CLOSE_PLAYER_ADV = 'PlayerList.ClosePlayerAdvWidget';
const ACTION_WARN_PLAYER = 'PlayerList.WarnPlayer';
const ACTION_KICK_PLAYER = 'PlayerList.KickPlayer';
const ACTION_BAN_PLAYER = 'PlayerList.BanPlayer';
const ACTION_ADD_AS_MASTER = 'PlayerList.PlayerAddAsMaster';
const ACTION_ADD_AS_ADMIN = 'PlayerList.PlayerAddAsAdmin';
const ACTION_ADD_AS_MOD = 'PlayerList.PlayerAddAsModerator';
const ACTION_REVOKE_RIGHTS = 'PlayerList.RevokeRights';
const SHOWN_MAIN_WINDOW = -1;
const ACTION_WARN_PLAYER = 'PlayerList.WarnPlayer';
const ACTION_KICK_PLAYER = 'PlayerList.KickPlayer';
const ACTION_BAN_PLAYER = 'PlayerList.BanPlayer';
const ACTION_ADD_AS_MASTER = 'PlayerList.PlayerAddAsMaster';
const ACTION_ADD_AS_ADMIN = 'PlayerList.PlayerAddAsAdmin';
const ACTION_ADD_AS_MOD = 'PlayerList.PlayerAddAsModerator';
const ACTION_REVOKE_RIGHTS = 'PlayerList.RevokeRights';
const SHOWN_MAIN_WINDOW = -1;
/**
* Private properties
*/
@@ -57,6 +56,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
private $quadStyle;
private $quadSubstyle;
private $playersListShown = array();
/**
* Create a new server commands instance
*
@@ -65,23 +65,20 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl;
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_CLOSE_PLAYER_ADV, $this,
'closePlayerAdvancedWidget');
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_CLOSE_PLAYER_ADV, $this, 'closePlayerAdvancedWidget');
$this->maniaControl->callbackManager->registerCallbackListener(ManialinkManager::CB_MAIN_WINDOW_CLOSED, $this, 'closeWidget');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this,
'handleManialinkPageAnswer');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer');
// Update Widget Events
$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERINFOCHANGED, $this, 'updateWidget');
$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERDISCONNECTED, $this, 'updateWidget');
$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERJOINED, $this, 'updateWidget');
$this->maniaControl->callbackManager->registerCallbackListener(AuthenticationManager::CB_AUTH_LEVEL_CHANGED, $this,
'updateWidget');
$this->maniaControl->callbackManager->registerCallbackListener(AuthenticationManager::CB_AUTH_LEVEL_CHANGED, $this, 'updateWidget');
// settings
$this->width = $this->maniaControl->manialinkManager->styleManager->getListWidgetsWidth();
$this->height = $this->maniaControl->manialinkManager->styleManager->getListWidgetsHeight();
$this->quadStyle = $this->maniaControl->manialinkManager->styleManager->getDefaultMainWindowStyle();
$this->width = $this->maniaControl->manialinkManager->styleManager->getListWidgetsWidth();
$this->height = $this->maniaControl->manialinkManager->styleManager->getListWidgetsHeight();
$this->quadStyle = $this->maniaControl->manialinkManager->styleManager->getDefaultMainWindowStyle();
$this->quadSubstyle = $this->maniaControl->manialinkManager->styleManager->getDefaultMainWindowSubStyle();
}
@@ -136,10 +133,9 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$frame->add($headFrame);
$headFrame->setY($y - 5);
// $array = array("Id" => $x + 5, "Nickname" => $x + 10, "Login" => $x + 40, "Ladder" => $x + 60,"Zone" => $x + 85);
if ($this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) {
if($this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) {
$array = array("Id" => $x + 5, "Nickname" => $x + 18, "Login" => $x + 60, "Location" => $x + 91, "Actions" => $x + 135);
}
else {
} else {
$array = array("Id" => $x + 5, "Nickname" => $x + 18, "Login" => $x + 60, "Location" => $x + 91);
}
$this->maniaControl->manialinkManager->labelLine($headFrame, $array);
@@ -149,17 +145,17 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$i = 1;
$y -= 10;
foreach ($players as $listPlayer) {
foreach($players as $listPlayer) {
/**
*
* @var Player $listPlayer
*/
$path = $listPlayer->getProvince();
$path = $listPlayer->getProvince();
$playerFrame = new Frame();
$frame->add($playerFrame);
if ($i % 2 != 0) {
if($i % 2 != 0) {
$lineQuad = new Quad_BgsPlayerCard();
$playerFrame->add($lineQuad);
$lineQuad->setSize($this->width, 4);
@@ -175,7 +171,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$playerFrame->setY($y);
// Team Emblem
if ($listPlayer->teamId >= 0) {
if($listPlayer->teamId >= 0) {
// Player is in a Team
$teamQuad = new Quad_Emblems();
$playerFrame->add($teamQuad);
@@ -183,7 +179,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$teamQuad->setZ(0.1);
$teamQuad->setSize(3.8, 3.8);
switch ($listPlayer->teamId) {
switch($listPlayer->teamId) {
case 0:
$teamQuad->setSubStyle($teamQuad::SUBSTYLE_1);
break;
@@ -191,8 +187,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$teamQuad->setSubStyle($teamQuad::SUBSTYLE_2);
break;
}
}
else if ($listPlayer->isSpectator) {
} else if($listPlayer->isSpectator) {
// Player is in Spectator Mode
$specQuad = new Quad_BgRaceScore2();
$playerFrame->add($specQuad);
@@ -202,7 +197,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$specQuad->setSize(3.8, 3.8);
}
if (!$listPlayer->isFakePlayer()) {
if(!$listPlayer->isFakePlayer()) {
// Nation Quad
$countryQuad = new Quad();
$playerFrame->add($countryQuad);
@@ -252,7 +247,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$descriptionLabel->setText("View Player profile of " . $listPlayer->nickname);
$script->addTooltip($playerQuad, $descriptionLabel);
switch ($listPlayer->authLevel) {
switch($listPlayer->authLevel) {
case authenticationManager::AUTH_LEVEL_MASTERADMIN:
$rightLabel->setText("MA");
break;
@@ -268,7 +263,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$rightLabel->setTextColor("fff");
if ($this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) {
if($this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) {
// Further Player actions Quad
$playerQuad = new Quad_Icons64x64_1();
$playerFrame->add($playerQuad);
@@ -334,7 +329,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
}
// show advanced window
if ($this->playersListShown[$player->login] != false && $this->playersListShown[$player->login] != self::SHOWN_MAIN_WINDOW) {
if($this->playersListShown[$player->login] != false && $this->playersListShown[$player->login] != self::SHOWN_MAIN_WINDOW) {
$frame = $this->showAdvancedPlayerWidget($this->playersListShown[$player->login]);
$maniaLink->add($frame);
}
@@ -347,10 +342,12 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
* Displays the Advanced Player Window
*
* @param Player $caller
* @param $login
* @param $login
*/
public function advancedPlayerWidget(Player $caller, $login) {
if (!$caller) return;
if(!$caller) {
return;
}
$this->playersListShown[$caller->login] = $login; // Show a certain player
$this->showPlayerList($caller); // reopen playerlist
}
@@ -365,12 +362,12 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$player = $this->maniaControl->playerManager->getPlayer($login);
// todo all configurable or as constants
$x = $this->width / 2 + 2.5;
$width = 35;
$height = $this->height * 0.7;
$hAlign = Control::LEFT;
$style = Label_Text::STYLE_TextCardSmall;
$textSize = 1.5;
$x = $this->width / 2 + 2.5;
$width = 35;
$height = $this->height * 0.7;
$hAlign = Control::LEFT;
$style = Label_Text::STYLE_TextCardSmall;
$textSize = 1.5;
$textColor = 'FFF';
$quadWidth = $width - 7;
@@ -438,62 +435,42 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$label->setTextColor($textColor);
$y -= 5;
// Show Kick
$quad = new Quad_BgsPlayerCard();
$quad = clone $quad;
$frame->add($quad);
$quad->setX(0);
$quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_KICK_PLAYER . "." . $login);
$label = new Label_Button();
$label = clone $label;
$frame->add($label);
$label->setAlign(Control::CENTER, Control::CENTER);
$label->setX(0);
$label->setY($y);
$label->setStyle($style);
$label->setTextSize($textSize);
$label->setText("Kick");
$label->setTextColor("F90");
$y -= 5;
// Show Ban
$quad = new Quad_BgsPlayerCard();
$quad = clone $quad;
$frame->add($quad);
$quad->setX(0);
$quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_BAN_PLAYER . "." . $login);
$label = new Label_Button();
$label = clone $label;
$frame->add($label);
$label->setAlign(Control::CENTER, Control::CENTER);
$label->setX(0);
$label->setY($y);
$label->setStyle($style);
$label->setTextSize($textSize);
$label->setText("Ban");
$label->setTextColor("700");
$y -= 10;
// Show Add as Master-Admin
$quad = new Quad_BgsPlayerCard();
$quad = clone $quad;
$frame->add($quad);
$quad->setX(0);
$quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_ADD_AS_MASTER . "." . $login);
$label = new Label_Button();
$label = clone $label;
$frame->add($label);
$label->setAlign(Control::CENTER, Control::CENTER);
$label->setX(0);
$label->setY($y);
$label->setStyle($style);
$label->setTextSize($textSize);
$label->setText("Set SuperAdmin");
@@ -501,62 +478,41 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$y -= 5;
// Show Add as Admin
$quad = new Quad_BgsPlayerCard();
$quad = clone $quad;
$frame->add($quad);
$quad->setX(0);
$quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_ADD_AS_ADMIN . "." . $login);
$label = new Label_Button();
$label = clone $label;
$frame->add($label);
$label->setAlign(Control::CENTER, Control::CENTER);
$label->setX(0);
$label->setY($y);
$label->setStyle($style);
$label->setTextSize($textSize);
$label->setText("Set Admin");
$label->setTextColor($textColor);
$y -= 5;
// Show Add as Moderator
$quad = new Quad_BgsPlayerCard();
$quad = clone $quad;
$frame->add($quad);
$quad->setX(0);
$quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_ADD_AS_MOD . "." . $login);
$label = new Label_Button();
$label = clone $label;
$frame->add($label);
$label->setAlign(Control::CENTER, Control::CENTER);
$label->setX(0);
$label->setY($y);
$label->setStyle($style);
$label->setTextSize($textSize);
$label->setText("Set Moderator");
$label->setTextColor($textColor);
if ($this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) {
if($this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) {
$y -= 5;
// Revoke Rights
$quad = new Quad_BgsPlayerCard();
$quad = clone $quad;
$frame->add($quad);
$quad->setX(0);
$quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_REVOKE_RIGHTS . "." . $login);
$label = new Label_Button();
$label = clone $label;
$frame->add($label);
$label->setAlign(Control::CENTER, Control::CENTER);
$label->setX(0);
$label->setY($y);
$label->setStyle($style);
$label->setTextSize($textSize);
$label->setText("Revoke Rights");
$label->setTextColor("700");
}
@@ -577,7 +533,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
/**
* Closes the player advanced widget widget
*
* @param array $callback
* @param array $callback
* @param Player $player
*/
public function closePlayerAdvancedWidget(array $callback, Player $player) {
@@ -591,27 +547,24 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
* @param array $callback
*/
public function handleManialinkPageAnswer(array $callback) {
$actionId = $callback[1][2];
$actionId = $callback[1][2];
$actionArray = explode(".", $actionId);
if (count($actionArray) <= 2) {
if(count($actionArray) <= 2) {
return;
}
$action = $actionArray[0] . "." . $actionArray[1];
$adminLogin = $callback[1][1];
$action = $actionArray[0] . "." . $actionArray[1];
$adminLogin = $callback[1][1];
$targetLogin = $actionArray[2];
switch ($action) {
switch($action) {
case self::ACTION_FORCE_BLUE:
$this->maniaControl->playerManager->playerActions->forcePlayerToTeam($adminLogin, $targetLogin,
PlayerActions::BLUE_TEAM);
$this->maniaControl->playerManager->playerActions->forcePlayerToTeam($adminLogin, $targetLogin, PlayerActions::BLUE_TEAM);
break;
case self::ACTION_FORCE_RED:
$this->maniaControl->playerManager->playerActions->forcePlayerToTeam($adminLogin, $targetLogin,
PlayerActions::RED_TEAM);
$this->maniaControl->playerManager->playerActions->forcePlayerToTeam($adminLogin, $targetLogin, PlayerActions::RED_TEAM);
break;
case self::ACTION_FORCE_SPEC:
$this->maniaControl->playerManager->playerActions->forcePlayerToSpectator($adminLogin, $targetLogin,
PlayerActions::SPECTATOR_BUT_KEEP_SELECTABLE);
$this->maniaControl->playerManager->playerActions->forcePlayerToSpectator($adminLogin, $targetLogin, PlayerActions::SPECTATOR_BUT_KEEP_SELECTABLE);
break;
case self::ACTION_WARN_PLAYER:
$this->maniaControl->playerManager->playerActions->warnPlayer($adminLogin, $targetLogin);
@@ -627,16 +580,13 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$this->advancedPlayerWidget($admin, $targetLogin);
break;
case self::ACTION_ADD_AS_MASTER:
$this->maniaControl->playerManager->playerActions->grandAuthLevel($adminLogin, $targetLogin,
AuthenticationManager::AUTH_LEVEL_SUPERADMIN);
$this->maniaControl->playerManager->playerActions->grandAuthLevel($adminLogin, $targetLogin, AuthenticationManager::AUTH_LEVEL_SUPERADMIN);
break;
case self::ACTION_ADD_AS_ADMIN:
$this->maniaControl->playerManager->playerActions->grandAuthLevel($adminLogin, $targetLogin,
AuthenticationManager::AUTH_LEVEL_ADMIN);
$this->maniaControl->playerManager->playerActions->grandAuthLevel($adminLogin, $targetLogin, AuthenticationManager::AUTH_LEVEL_ADMIN);
break;
case self::ACTION_ADD_AS_MOD:
$this->maniaControl->playerManager->playerActions->grandAuthLevel($adminLogin, $targetLogin,
AuthenticationManager::AUTH_LEVEL_MODERATOR);
$this->maniaControl->playerManager->playerActions->grandAuthLevel($adminLogin, $targetLogin, AuthenticationManager::AUTH_LEVEL_MODERATOR);
break;
case self::ACTION_REVOKE_RIGHTS:
$this->maniaControl->playerManager->playerActions->revokeAuthLevel($adminLogin, $targetLogin);
@@ -650,17 +600,16 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
* @param array $callback
*/
public function updateWidget(array $callback) {
foreach ($this->playersListShown as $login => $shown) {
if ($shown) {
foreach($this->playersListShown as $login => $shown) {
if($shown) {
// Check if Shown player still exists
if ($shown != self::SHOWN_MAIN_WINDOW && $this->maniaControl->playerManager->getPlayer($shown) == null) {
if($shown != self::SHOWN_MAIN_WINDOW && $this->maniaControl->playerManager->getPlayer($shown) == null) {
$this->playersListShown[$login] = false;
}
$player = $this->maniaControl->playerManager->getPlayer($login);
if ($player != null) {
if($player != null) {
$this->showPlayerList($player);
}
else {
} else {
// if player with the open widget disconnected remove him from the shownlist
unset($this->playersListShown[$login]);
}

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

@@ -19,14 +19,14 @@ class PlayerManager implements CallbackListener {
/**
* Constants
*/
const CB_PLAYERJOINED = 'PlayerManagerCallback.PlayerJoined';
const CB_PLAYERDISCONNECTED = 'PlayerManagerCallback.PlayerDisconnected';
const CB_ONINIT = 'PlayerManagerCallback.OnInit';
const CB_PLAYERINFOCHANGED = 'PlayerManagerCallback.PlayerInfoChanged';
const TABLE_PLAYERS = 'mc_players';
const CB_PLAYERJOINED = 'PlayerManagerCallback.PlayerJoined';
const CB_PLAYERDISCONNECTED = 'PlayerManagerCallback.PlayerDisconnected';
const CB_ONINIT = 'PlayerManagerCallback.OnInit';
const CB_PLAYERINFOCHANGED = 'PlayerManagerCallback.PlayerInfoChanged';
const TABLE_PLAYERS = 'mc_players';
const SETTING_JOIN_LEAVE_MESSAGES = 'Enable Join & Leave Messages';
const STAT_JOIN_COUNT = 'joinCount';
const STAT_PLAYTIME = 'playTime';
const STAT_JOIN_COUNT = 'joinCount';
const STAT_PLAYTIME = 'playTime';
/**
* Public Properties
@@ -50,7 +50,7 @@ class PlayerManager implements CallbackListener {
$this->initTables();
$this->playerCommands = new PlayerCommands($maniaControl);
$this->playerActions = new PlayerActions($maniaControl);
$this->playerActions = new PlayerActions($maniaControl);
// Init settings
$this->maniaControl->settingManager->initSetting($this, self::SETTING_JOIN_LEAVE_MESSAGES, true);
@@ -58,10 +58,8 @@ class PlayerManager implements CallbackListener {
// Register for callbacks
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERCONNECT, $this, 'playerConnect');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERDISCONNECT, $this,
'playerDisconnect');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERINFOCHANGED, $this,
'playerInfoChanged');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERDISCONNECT, $this, 'playerDisconnect');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERINFOCHANGED, $this, 'playerInfoChanged');
// Define player stats
$this->maniaControl->statisticManager->defineStatMetaData(self::STAT_JOIN_COUNT);
@@ -74,8 +72,8 @@ class PlayerManager implements CallbackListener {
* @return bool
*/
private function initTables() {
$mysqli = $this->maniaControl->database->mysqli;
$playerTableQuery = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_PLAYERS . "` (
$mysqli = $this->maniaControl->database->mysqli;
$playerTableQuery = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_PLAYERS . "` (
`index` int(11) NOT NULL AUTO_INCREMENT,
`login` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`nickname` varchar(150) COLLATE utf8_unicode_ci NOT NULL,
@@ -86,12 +84,12 @@ class PlayerManager implements CallbackListener {
UNIQUE KEY `login` (`login`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Player Data' AUTO_INCREMENT=1;";
$playerTableStatement = $mysqli->prepare($playerTableQuery);
if ($mysqli->error) {
if($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR);
return false;
}
$playerTableStatement->execute();
if ($playerTableStatement->error) {
if($playerTableStatement->error) {
trigger_error($playerTableStatement->error, E_USER_ERROR);
return false;
}
@@ -108,13 +106,13 @@ class PlayerManager implements CallbackListener {
// Add all players
$this->maniaControl->client->query('GetPlayerList', 300, 0, 2);
$playerList = $this->maniaControl->client->getResponse();
foreach ($playerList as $playerItem) {
if ($playerItem['PlayerId'] <= 0) {
foreach($playerList as $playerItem) {
if($playerItem['PlayerId'] <= 0) {
continue;
}
$this->maniaControl->client->query('GetDetailedPlayerInfo', $playerItem['Login']);
$playerInfo = $this->maniaControl->client->getResponse();
$player = new Player($playerInfo);
$player = new Player($playerInfo);
$this->addPlayer($player);
}
@@ -131,20 +129,18 @@ class PlayerManager implements CallbackListener {
$login = $callback[1][0];
$this->maniaControl->client->query('GetDetailedPlayerInfo', $login);
$playerInfo = $this->maniaControl->client->getResponse();
$player = new Player($playerInfo);
$player = new Player($playerInfo);
$this->addPlayer($player);
if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_JOIN_LEAVE_MESSAGES) && !$player->isFakePlayer()) {
$string = array(0 => '$0f0Player', 1 => '$0f0Moderator', 2 => '$0f0Admin', 3 => '$0f0MasterAdmin', 4 => '$0f0MasterAdmin');
$chatMessage = '$s$0f0' . $string[$player->authLevel] . ' $fff' . $player->nickname . '$z$s$0f0 Nation:$fff ' .
$player->getCountry() . ' $z$s$0f0joined!';
if($this->maniaControl->settingManager->getSetting($this, self::SETTING_JOIN_LEAVE_MESSAGES) && !$player->isFakePlayer()) {
$string = array(0 => '$0f0Player', 1 => '$0f0Moderator', 2 => '$0f0Admin', 3 => '$0f0MasterAdmin', 4 => '$0f0MasterAdmin');
$chatMessage = '$s$0f0' . $string[$player->authLevel] . ' $fff' . $player->nickname . '$z$s$0f0 Nation:$fff ' . $player->getCountry() . ' $z$s$0f0joined!';
$this->maniaControl->chat->sendChat($chatMessage);
$this->maniaControl->chat->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}";
$logMessage = "Player joined: {$player->login} / " . Formatter::stripCodes($player->nickname) . " Nation: " . $player->getCountry() . " IP: {$player->ipAddress}";
$this->maniaControl->log($logMessage);
// Trigger own PlayerJoined callback
@@ -157,21 +153,21 @@ class PlayerManager implements CallbackListener {
* @param array $callback
*/
public function playerDisconnect(array $callback) {
$login = $callback[1][0];
$login = $callback[1][0];
$player = $this->removePlayer($login);
// Trigger own callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERDISCONNECTED, array(self::CB_PLAYERDISCONNECTED, $player));
if ($player == null || $player->isFakePlayer()) {
if($player == null || $player->isFakePlayer()) {
return;
}
$played = Formatter::formatTimeH(time() - $player->joinTime);
$played = Formatter::formatTimeH(time() - $player->joinTime);
$logMessage = "Player left: {$player->login} / {$player->nickname} Playtime: {$played}";
$this->maniaControl->log(Formatter::stripCodes($logMessage));
if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_JOIN_LEAVE_MESSAGES)) {
if($this->maniaControl->settingManager->getSetting($this, self::SETTING_JOIN_LEAVE_MESSAGES)) {
$this->maniaControl->chat->sendChat('$<' . $player->nickname . '$> $s$0f0has left the game');
}
}
@@ -183,11 +179,13 @@ class PlayerManager implements CallbackListener {
*/
public function playerInfoChanged(array $callback) {
$player = $this->getPlayer($callback[1][0]['Login']);
if ($player == null) return;
if($player == null) {
return;
}
$player->teamId = $callback[1][0]["TeamId"];
$player->teamId = $callback[1][0]["TeamId"];
$player->isSpectator = $callback[1][0]["SpectatorStatus"];
$player->ladderRank = $callback[1][0]["LadderRanking"];
$player->ladderRank = $callback[1][0]["LadderRanking"];
// Trigger own callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERINFOCHANGED, array(self::CB_PLAYERINFOCHANGED));
@@ -209,7 +207,7 @@ class PlayerManager implements CallbackListener {
* @return Player
*/
public function getPlayer($login) {
if (!isset($this->playerList[$login])) {
if(!isset($this->playerList[$login])) {
return null;
}
return $this->playerList[$login];
@@ -222,7 +220,7 @@ class PlayerManager implements CallbackListener {
* @return bool
*/
private function addPlayer(Player $player) {
if (!$player) {
if(!$player) {
return false;
}
$this->savePlayer($player);
@@ -234,16 +232,16 @@ class PlayerManager implements CallbackListener {
* Remove a Player from the PlayerList
*
* @param string $login
* @param bool $savePlayedTime
* @param bool $savePlayedTime
* @return Player $player
*/
private function removePlayer($login, $savePlayedTime = true) {
if (!isset($this->playerList[$login])) {
if(!isset($this->playerList[$login])) {
return null;
}
$player = $this->playerList[$login];
unset($this->playerList[$login]);
if ($savePlayedTime) {
if($savePlayedTime) {
$this->updatePlayedTime($player);
}
return $player;
@@ -253,14 +251,14 @@ class PlayerManager implements CallbackListener {
* Save player in database and fill up object properties
*
* @param Player $player
* @param int $joinCount
* @param int $joinCount
* @return bool
*/
private function savePlayer(Player &$player) {
$mysqli = $this->maniaControl->database->mysqli;
// Save player
$playerQuery = "INSERT INTO `" . self::TABLE_PLAYERS . "` (
$playerQuery = "INSERT INTO `" . self::TABLE_PLAYERS . "` (
`login`,
`nickname`,
`path`
@@ -271,13 +269,13 @@ class PlayerManager implements CallbackListener {
`nickname` = VALUES(`nickname`),
`path` = VALUES(`path`);";
$playerStatement = $mysqli->prepare($playerQuery);
if ($mysqli->error) {
if($mysqli->error) {
trigger_error($mysqli->error);
return false;
}
$playerStatement->bind_param('sss', $player->login, $player->nickname, $player->path);
$playerStatement->execute();
if ($playerStatement->error) {
if($playerStatement->error) {
trigger_error($playerStatement->error);
$playerStatement->close();
return false;
@@ -286,15 +284,15 @@ class PlayerManager implements CallbackListener {
$playerStatement->close();
// Get Player Auth Level from DB
$playerQuery = "SELECT `authLevel` FROM `" . self::TABLE_PLAYERS . "` WHERE `index` = ?;";
$playerQuery = "SELECT `authLevel` FROM `" . self::TABLE_PLAYERS . "` WHERE `index` = ?;";
$playerStatement = $mysqli->prepare($playerQuery);
if ($mysqli->error) {
if($mysqli->error) {
trigger_error($mysqli->error);
return false;
}
$playerStatement->bind_param('i', $player->index);
$playerStatement->execute();
if ($playerStatement->error) {
if($playerStatement->error) {
trigger_error($playerStatement->error);
$playerStatement->close();
return false;
@@ -306,10 +304,9 @@ class PlayerManager implements CallbackListener {
$playerStatement->close();
// Increment the Player Join Count
$success = $this->maniaControl->statisticManager->incrementStat(self::STAT_JOIN_COUNT, $player,
$this->maniaControl->server->getLogin());
$success = $this->maniaControl->statisticManager->incrementStat(self::STAT_JOIN_COUNT, $player, $this->maniaControl->server->getLogin());
if (!$success) {
if(!$success) {
trigger_error("Error while setting the JoinCount");
}
@@ -323,12 +320,11 @@ class PlayerManager implements CallbackListener {
* @return bool
*/
private function updatePlayedTime(Player $player) {
if (!$player) {
if(!$player) {
return false;
}
$playedTime = time() - $player->joinTime;
return $this->maniaControl->statisticManager->insertStat(self::STAT_PLAYTIME, $player, $this->maniaControl->server->getLogin(),
$playedTime);
return $this->maniaControl->statisticManager->insertStat(self::STAT_PLAYTIME, $player, $this->maniaControl->server->getLogin(), $playedTime);
}
}

27
application/core/Statistics/StatisticCollector.php
View File

@@ -10,7 +10,6 @@ namespace ManiaControl\Statistics;
use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\ManiaControl;
use ManiaControl\Players\Player;
use ManiaControl\Players\PlayerManager;
class StatisticCollector implements CallbackListener {
@@ -19,7 +18,7 @@ class StatisticCollector implements CallbackListener {
*/
const SETTING_COLLECT_STATS_ENABLED = 'Collect Stats Enabled';
const SETTING_COLLECT_STATS_MINPLAYERS = 'Minimum Playercount for Collecting Stats';
const SETTING_ON_SHOOT_PRESTORE = 'Prestore Shoots before insert into Database';
const SETTING_ON_SHOOT_PRESTORE = 'Prestore Shoots before insert into Database';
/*
* Statistics
*/
@@ -36,6 +35,7 @@ class StatisticCollector implements CallbackListener {
*/
private $maniaControl = null;
private $onShootArray = array();
/**
* Construct player manager
*
@@ -75,19 +75,20 @@ class StatisticCollector implements CallbackListener {
/**
* Handle Player Shoots
*
* @param $login
*/
private function handleOnShoot($login){
if(!isset($this->onShootArray[$login])){
private function handleOnShoot($login) {
if(!isset($this->onShootArray[$login])) {
$this->onShootArray[$login] = 1;
}else{
} else {
$this->onShootArray[$login]++;
}
//Write Shoot Data into database
if($this->onShootArray[$login] > self::SETTING_ON_SHOOT_PRESTORE){
if($this->onShootArray[$login] > self::SETTING_ON_SHOOT_PRESTORE) {
$serverLogin = $this->maniaControl->server->getLogin();
$player = $this->maniaControl->playerManager->getPlayer($login);
$player = $this->maniaControl->playerManager->getPlayer($login);
$this->maniaControl->statisticManager->insertStat(self::STAT_ON_SHOOT, $player, $serverLogin, $this->onShootArray[$login]);
$this->onShootArray[$login] = 0;
}
@@ -96,18 +97,20 @@ class StatisticCollector implements CallbackListener {
/**
* Insert OnShoot Statistic when a player leaves
* @param array $callback
* @param Player $player
*
* @param array $callback
*/
public function onPlayerDisconnect(array $callback, Player $player) {
public function onPlayerDisconnect(array $callback) {
$player = $callback[1];
//Check if Stat Collecting is enabled
if(!$this->maniaControl->settingManager->getSetting($this, self::SETTING_COLLECT_STATS_ENABLED)) {
return;
}
//Insert Data into Database, and destroy player
if(isset($this->onShootArray[$player->login])){
if($this->onShootArray[$player->login] > 0){
if(isset($this->onShootArray[$player->login])) {
if($this->onShootArray[$player->login] > 0) {
$serverLogin = $this->maniaControl->server->getLogin();
$this->maniaControl->statisticManager->insertStat(self::STAT_ON_SHOOT, $player, $serverLogin, $this->onShootArray[$player->login]);
}