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

renamed server id to index

Browse Source
This commit is contained in:
Steffen Schröder 2014-01-05 14:41:19 +01:00
parent eb37af0579
commit 7eb1091511
8 changed files with 236 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/core/Configurators/ScriptSettings.php
View File

@ -57,10 +57,10 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
private function initTables() { private function initTables() {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SCRIPT_SETTINGS . "` ( $query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SCRIPT_SETTINGS . "` (
`serverId` int(11) NOT NULL AUTO_INCREMENT, `serverIndex` int(11) NOT NULL AUTO_INCREMENT,
`settingName` varchar(100) COLLATE utf8_unicode_ci NOT NULL, `settingName` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`settingValue` varchar(500) COLLATE utf8_unicode_ci NOT NULL, `settingValue` varchar(500) COLLATE utf8_unicode_ci NOT NULL,
UNIQUE KEY `setting` (`serverId`, `settingName`) UNIQUE KEY `setting` (`serverIndex`, `settingName`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Script Settings' AUTO_INCREMENT=1;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Script Settings' AUTO_INCREMENT=1;";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
@ -371,7 +371,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
// Save Settings into Database // Save Settings into Database
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "INSERT INTO `" . self::TABLE_SCRIPT_SETTINGS . "` ( $query = "INSERT INTO `" . self::TABLE_SCRIPT_SETTINGS . "` (
`serverId`, `serverIndex`,
`settingName`, `settingName`,
`settingValue` `settingValue`
) VALUES ( ) VALUES (
@ -384,7 +384,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
return false; return false;
} }
$serverId = $this->maniaControl->server->getServerId(); $serverIndex = $this->maniaControl->server->getIndex();
// Notifications // Notifications
$settingsCount = count($newSettings); $settingsCount = count($newSettings);
@ -400,7 +400,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
} }
// Add To Database // Add To Database
$statement->bind_param('iss', $serverId, $setting, $value); $statement->bind_param('iss', $serverIndex, $setting, $value);
$statement->execute(); $statement->execute();
if ($statement->error) { if ($statement->error) {
trigger_error($statement->error); trigger_error($statement->error);

10
application/core/Configurators/ServerSettings.php
View File

@ -56,10 +56,10 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
private function initTables() { private function initTables() {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SERVER_SETTINGS . "` ( $query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SERVER_SETTINGS . "` (
`serverId` int(11) NOT NULL AUTO_INCREMENT, `serverIndex` int(11) NOT NULL AUTO_INCREMENT,
`settingName` varchar(100) COLLATE utf8_unicode_ci NOT NULL, `settingName` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`settingValue` varchar(500) COLLATE utf8_unicode_ci NOT NULL, `settingValue` varchar(500) COLLATE utf8_unicode_ci NOT NULL,
UNIQUE KEY `setting` (`serverId`, `settingName`) UNIQUE KEY `setting` (`serverIndex`, `settingName`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Server Settings' AUTO_INCREMENT=1;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Server Settings' AUTO_INCREMENT=1;";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if ($mysqli->error) { if ($mysqli->error) {
@ -338,7 +338,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "INSERT INTO `" . self::TABLE_SERVER_SETTINGS . "` ( $query = "INSERT INTO `" . self::TABLE_SERVER_SETTINGS . "` (
`serverId`, `serverIndex`,
`settingName`, `settingName`,
`settingValue` `settingValue`
) VALUES ( ) VALUES (
@ -351,7 +351,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
return false; return false;
} }
$serverId = $this->maniaControl->server->getServerId(); $serverIndex = $this->maniaControl->server->getIndex();
// Notifications // Notifications
$settingsCount = count($newSettings); $settingsCount = count($newSettings);
@ -360,7 +360,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
// $chatMessage = '$ff0' . $title . ' $<' . $player->nickname . '$> set ScriptSetting' . ($settingsCount > 1 ? 's' : '') . ' '; // $chatMessage = '$ff0' . $title . ' $<' . $player->nickname . '$> set ScriptSetting' . ($settingsCount > 1 ? 's' : '') . ' ';
foreach ($newSettings as $setting => $value) { foreach ($newSettings as $setting => $value) {
$statement->bind_param('iss', $serverId, $setting, $value); $statement->bind_param('iss', $serverIndex, $setting, $value);
$statement->execute(); $statement->execute();
if ($statement->error) { if ($statement->error) {
trigger_error($statement->error); trigger_error($statement->error);

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

@ -308,7 +308,8 @@ class PlayerManager implements CallbackListener {
$playerStatement->close(); $playerStatement->close();
// Increment the Player Join Count // Increment the Player Join Count
$this->maniaControl->statisticManager->incrementStat(self::STAT_JOIN_COUNT, $player, $this->maniaControl->server->getServerId()); $serverIndex = $this->maniaControl->server->getIndex();
$this->maniaControl->statisticManager->incrementStat(self::STAT_JOIN_COUNT, $player, $serverIndex);
return true; return true;
} }
@ -325,6 +326,7 @@ class PlayerManager implements CallbackListener {
} }
$playedTime = time() - $player->joinTime; $playedTime = time() - $player->joinTime;
return $this->maniaControl->statisticManager->insertStat(self::STAT_SERVERTIME, $player, $this->maniaControl->server->getServerId(), $playedTime); $serverIndex = $this->maniaControl->server->getIndex();
return $this->maniaControl->statisticManager->insertStat(self::STAT_SERVERTIME, $player, $serverIndex, $playedTime);
} }
} }

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

@ -11,7 +11,7 @@ use ManiaControl\Players\Player;
require_once __DIR__ . '/ServerCommands.php'; require_once __DIR__ . '/ServerCommands.php';
/** /**
* Class providing information and commands for the connected maniaplanet server * Class providing Information about theconnected ManiaPlanet Server
* *
* @author steeffeen & kremsy * @author steeffeen & kremsy
*/ */
@ -23,16 +23,17 @@ class Server implements CallbackListener {
const TABLE_SERVERS = 'mc_servers'; const TABLE_SERVERS = 'mc_servers';
/** /**
* Public properties * Public Properties
*/ */
public $config = null; public $config = null;
/** /**
* Private properties * Private Properties
*/ */
private $maniaControl = null; private $maniaControl = null;
private $serverCommands = null; private $serverCommands = null;
private $serverId = 0; private $index = null;
private $login = null;
/** /**
* Construct server * Construct server
@ -41,6 +42,7 @@ class Server implements CallbackListener {
*/ */
public function __construct(ManiaControl $maniaControl) { public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl; $this->maniaControl = $maniaControl;
$this->initTables();
// Load config // Load config
$this->config = FileUtil::loadConfig('server.xml'); $this->config = FileUtil::loadConfig('server.xml');
@ -49,96 +51,71 @@ class Server implements CallbackListener {
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit');
$this->serverCommands = new ServerCommands($maniaControl); $this->serverCommands = new ServerCommands($maniaControl);
$this->initTables();
} }
/** /**
* Initialize necessary database tables * Initialize necessary Database Tables
* *
* @return bool * @return bool
*/ */
private function initTables() { private function initTables() {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SERVERS . "` ( $query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SERVERS . "` (
`serverId` int(11) NOT NULL AUTO_INCREMENT, `index` int(11) NOT NULL AUTO_INCREMENT,
`login` varchar(100) COLLATE utf8_unicode_ci NOT NULL, `login` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
PRIMARY KEY (`serverId`), PRIMARY KEY (`index`),
UNIQUE KEY `login` (`login`) UNIQUE KEY `login` (`login`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Servers' AUTO_INCREMENT=1;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Servers' AUTO_INCREMENT=1;";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR); trigger_error($mysqli->error, E_USER_ERROR);
return false; return false;
} }
$statement->execute(); $statement->execute();
if($statement->error) { if ($statement->error) {
trigger_error($statement->error, E_USER_ERROR); trigger_error($statement->error, E_USER_ERROR);
return false; return false;
} }
$statement->close(); $statement->close();
return true; return true;
} }
/** /**
* Handle OnInit callback * Handle OnInit Callback
* *
* @param array $callback * @param array $callback
*/ */
public function onInit(array $callback) { public function onInit(array $callback) {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$login = $this->getLogin();
$query = "INSERT IGNORE INTO `" . self::TABLE_SERVERS . "` ( $query = "INSERT IGNORE INTO `" . self::TABLE_SERVERS . "` (
`login` `login`
) VALUES ( ) VALUES (
? ?
);"; );";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error); trigger_error($mysqli->error);
return false; return;
} }
$login = $this->getLogin();
$statement->bind_param('s', $login); $statement->bind_param('s', $login);
$statement->execute(); $statement->execute();
if($statement->error) { if ($statement->error) {
trigger_error($statement->error); trigger_error($statement->error);
$statement->close(); $statement->close();
return false; return;
} }
$statement->close(); $statement->close();
$query = "SELECT serverId FROM `" . self::TABLE_SERVERS . "` WHERE `login` = '" . $login . "';";
$result = $mysqli->query($query);
if(!$result) {
trigger_error($mysqli->error);
}
$row = $result->fetch_object();
$result->close();
$this->serverId = $row->serverId;
return true; return true;
} }
/** /**
* Fetch game data directory * Fetch Game Data Directory
* *
* @return string * @return string
*/ */
public function getDataDirectory() { public function getDataDirectory() {
if(!$this->maniaControl->client->query('GameDataDirectory')) { if (!$this->maniaControl->client->query('GameDataDirectory')) {
trigger_error("Couldn't get data directory. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't get data directory. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
@ -146,60 +123,80 @@ class Server implements CallbackListener {
} }
/** /**
* Fetch maps directory * Fetch Maps Directory
* *
* @return string * @return string
*/ */
public function getMapsDirectory() { public function getMapsDirectory() {
$dataDirectory = $this->getDataDirectory(); $dataDirectory = $this->getDataDirectory();
if(!$dataDirectory) { if (!$dataDirectory) {
return null; return null;
} }
return $dataDirectory . 'Maps/'; return $dataDirectory . 'Maps/';
} }
/** /**
* Checks if ManiaControl has access to the given directory * Checks if ManiaControl has Access to the given Directory
* *
* @param string $directory * @param string $directory
* @return bool * @return bool
*/ */
public function checkAccess($directory) { public function checkAccess($directory) {
if(!$directory) { if (!$directory) return false;
return false;
}
return (is_dir($directory) && is_writable($directory)); return (is_dir($directory) && is_writable($directory));
} }
/** /**
* Fetch server login * Fetch Server Index
* *
* @return array * @return int
*/ */
public function getLogin() { //TODO save the info locally public function getIndex() {
$systemInfo = $this->getSystemInfo(); if ($this->index) return $this->index;
if(!$systemInfo) { $mysqli = $this->maniaControl->database->mysqli;
return null; $login = $this->getLogin();
$query = "SELECT `index` FROM `" . self::TABLE_SERVERS . "`
WHERE `login` = '" . $login . "';";
$result = $mysqli->query($query);
if (!$result) {
trigger_error($mysqli->error);
return;
} }
return $systemInfo['ServerLogin']; $row = $result->fetch_object();
$result->close();
$this->index = $row->index;
return $this->index;
} }
/** /**
* Get server info * Fetch Server Login
*
* @return string
*/
public function getLogin() {
if ($this->login) return $this->login;
$systemInfo = $this->getSystemInfo();
if (!$systemInfo) return null;
$this->login = $systemInfo['ServerLogin'];
return $this->login;
}
/**
* Get the Server Info
* *
* @param bool $detailed * @param bool $detailed
* @return array * @return array
*/ */
public function getInfo($detailed = false) { public function getInfo($detailed = false) {
if($detailed) { if ($detailed) {
$login = $this->getLogin(); $login = $this->getLogin();
if(!$this->maniaControl->client->query('GetDetailedPlayerInfo', $login)) { if (!$this->maniaControl->client->query('GetDetailedPlayerInfo', $login)) {
trigger_error("Couldn't fetch detailed server info. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch detailed server info. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
return $this->maniaControl->client->getResponse(); return $this->maniaControl->client->getResponse();
} }
if(!$this->maniaControl->client->query('GetMainServerPlayerInfo')) { if (!$this->maniaControl->client->query('GetMainServerPlayerInfo')) {
trigger_error("Couldn't fetch server info. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch server info. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
@ -207,12 +204,12 @@ class Server implements CallbackListener {
} }
/** /**
* Get server options * Get Server Options
* *
* @return array * @return array
*/ */
public function getOptions() { public function getOptions() {
if(!$this->maniaControl->client->query('GetServerOptions')) { if (!$this->maniaControl->client->query('GetServerOptions')) {
trigger_error("Couldn't fetch server options. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch server options. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
@ -220,12 +217,12 @@ class Server implements CallbackListener {
} }
/** /**
* Fetch server name * Fetch current Server Name
* *
* @return string * @return string
*/ */
public function getName() { public function getName() {
if(!$this->maniaControl->client->query('GetServerName')) { if (!$this->maniaControl->client->query('GetServerName')) {
trigger_error("Couldn't fetch server name. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch server name. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
@ -233,12 +230,12 @@ class Server implements CallbackListener {
} }
/** /**
* Fetch server version * Fetch Server Version
* *
* @return string * @return string
*/ */
public function getVersion() { public function getVersion() {
if(!$this->maniaControl->client->query('GetVersion')) { if (!$this->maniaControl->client->query('GetVersion')) {
trigger_error("Couldn't fetch server version. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch server version. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
@ -246,12 +243,12 @@ class Server implements CallbackListener {
} }
/** /**
* Fetch server system info * Fetch Server System Info
* *
* @return array * @return array
*/ */
public function getSystemInfo() { public function getSystemInfo() {
if(!$this->maniaControl->client->query('GetSystemInfo')) { if (!$this->maniaControl->client->query('GetSystemInfo')) {
trigger_error("Couldn't fetch server system info. " . $this->maniaControl->getClientErrorText($this->maniaControl->client)); trigger_error("Couldn't fetch server system info. " . $this->maniaControl->getClientErrorText($this->maniaControl->client));
return null; return null;
} }
@ -259,55 +256,56 @@ class Server implements CallbackListener {
} }
/** /**
* Fetch current game mode * Fetch current Game Mode
* *
* @param bool $stringValue * @param bool $stringValue
* @param int $parseValue * @param int $parseValue
* @return int | string * @return int | string
*/ */
public function getGameMode($stringValue = false, $parseValue = null) { public function getGameMode($stringValue = false, $parseValue = null) {
if(is_int($parseValue)) { if (is_int($parseValue)) {
$gameMode = $parseValue; $gameMode = $parseValue;
} else { }
if(!$this->maniaControl->client->query('GetGameMode')) { else {
if (!$this->maniaControl->client->query('GetGameMode')) {
trigger_error("Couldn't fetch current game mode. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch current game mode. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
$gameMode = $this->maniaControl->client->getResponse(); $gameMode = $this->maniaControl->client->getResponse();
} }
if($stringValue) { if ($stringValue) {
switch($gameMode) { switch ($gameMode) {
case 0: case 0:
{ {
return 'Script'; return 'Script';
} }
case 1: case 1:
{ {
return 'Rounds'; return 'Rounds';
} }
case 2: case 2:
{ {
return 'TimeAttack'; return 'TimeAttack';
} }
case 3: case 3:
{ {
return 'Team'; return 'Team';
} }
case 4: case 4:
{ {
return 'Laps'; return 'Laps';
} }
case 5: case 5:
{ {
return 'Cup'; return 'Cup';
} }
case 6: case 6:
{ {
return 'Stunts'; return 'Stunts';
} }
default: default:
{ {
return 'Unknown'; return 'Unknown';
} }
} }
} }
@ -315,13 +313,13 @@ class Server implements CallbackListener {
} }
/** /**
* Retrieve validation replay for given player * Retrieve Validation Replay for the given Player
* *
* @param Player $player * @param Player $player
* @return string * @return string
*/ */
public function getValidationReplay(Player $player) { public function getValidationReplay(Player $player) {
if(!$this->maniaControl->client->query('GetValidationReplay', $player->login)) { if (!$this->maniaControl->client->query('GetValidationReplay', $player->login)) {
trigger_error("Couldn't get validation replay of '{$player->login}'. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't get validation replay of '{$player->login}'. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
@ -329,32 +327,30 @@ class Server implements CallbackListener {
} }
/** /**
* Retrieve ghost replay for the given player * Retrieve Ghost Replay for the given Player
* *
* @param Player $player * @param Player $player
* @return string * @return string
*/ */
public function getGhostReplay(Player $player) { public function getGhostReplay(Player $player) {
$dataDir = $this->getDataDirectory(); $dataDir = $this->getDataDirectory();
if(!$this->checkAccess($dataDir)) { if (!$this->checkAccess($dataDir)) return null;
return null;
}
// Build file name // Build file name
$map = $this->getMap(); $map = $this->getMap();
$gameMode = $this->getGameMode(); $gameMode = $this->getGameMode();
$time = time(); $time = time();
$fileName = "GhostReplays/Ghost.{$player->login}.{$gameMode}.{$time}.{$map['UId']}.Replay.Gbx"; $fileName = "GhostReplays/Ghost.{$player->login}.{$gameMode}.{$time}.{$map['UId']}.Replay.Gbx";
// Save ghost replay // Save ghost replay
if(!$this->maniaControl->client->query('SaveBestGhostsReplay', $player->login, $fileName)) { if (!$this->maniaControl->client->query('SaveBestGhostsReplay', $player->login, $fileName)) {
trigger_error("Couldn't save ghost replay. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't save ghost replay. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
// Load replay file // Load replay file
$ghostReplay = file_get_contents($dataDir . 'Replays/' . $fileName); $ghostReplay = file_get_contents($dataDir . 'Replays/' . $fileName);
if(!$ghostReplay) { if (!$ghostReplay) {
trigger_error("Couldn't retrieve saved ghost replay."); trigger_error("Couldn't retrieve saved ghost replay.");
return null; return null;
} }
@ -362,7 +358,7 @@ class Server implements CallbackListener {
} }
/** /**
* Waits for the server to have the given status * Wait for the Server to have the given Status
* *
* @param int $statusCode * @param int $statusCode
* @return bool * @return bool
@ -371,24 +367,24 @@ class Server implements CallbackListener {
$this->maniaControl->client->query('GetStatus'); $this->maniaControl->client->query('GetStatus');
$response = $this->maniaControl->client->getResponse(); $response = $this->maniaControl->client->getResponse();
// Check if server has the given status // Check if server has the given status
if($response['Code'] === 4) { if ($response['Code'] === 4) {
return true; return true;
} }
// Server not yet in given status -> Wait for it... // Server not yet in given status -> Wait for it...
$waitBegin = time(); $waitBegin = time();
$maxWaitTime = 20; $maxWaitTime = 20;
$lastStatus = $response['Name']; $lastStatus = $response['Name'];
$this->maniaControl->log("Waiting for server to reach status {$statusCode}..."); $this->maniaControl->log("Waiting for server to reach status {$statusCode}...");
$this->maniaControl->log("Current Status: {$lastStatus}"); $this->maniaControl->log("Current Status: {$lastStatus}");
while($response['Code'] !== 4) { while ($response['Code'] !== 4) {
sleep(1); sleep(1);
$this->maniaControl->client->query('GetStatus'); $this->maniaControl->client->query('GetStatus');
$response = $this->maniaControl->client->getResponse(); $response = $this->maniaControl->client->getResponse();
if($lastStatus !== $response['Name']) { if ($lastStatus !== $response['Name']) {
$this->maniaControl->log("New Status: " . $response['Name']); $this->maniaControl->log("New Status: " . $response['Name']);
$lastStatus = $response['Name']; $lastStatus = $response['Name'];
} }
if(time() - $maxWaitTime > $waitBegin) { if (time() - $maxWaitTime > $waitBegin) {
// It took too long to reach the status // It took too long to reach the status
trigger_error("Server couldn't reach status {$statusCode} after {$maxWaitTime} seconds! " . $this->maniaControl->getClientErrorText()); trigger_error("Server couldn't reach status {$statusCode} after {$maxWaitTime} seconds! " . $this->maniaControl->getClientErrorText());
return false; return false;
@ -396,11 +392,4 @@ class Server implements CallbackListener {
} }
return true; return true;
} }
/**
* @return int
*/
public function getServerId() {
return $this->serverId;
}
} }

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

@ -90,9 +90,9 @@ class StatisticCollector implements CallbackListener {
//Write Shoot Data into database //Write Shoot Data into database
if($this->onShootArray[$login] > $this->maniaControl->settingManager->getSetting($this, self::SETTING_ON_SHOOT_PRESTORE)) { if($this->onShootArray[$login] > $this->maniaControl->settingManager->getSetting($this, self::SETTING_ON_SHOOT_PRESTORE)) {
$serverId = $this->maniaControl->server->getServerId(); $serverIndex = $this->maniaControl->server->getIndex();
$player = $this->maniaControl->playerManager->getPlayer($login); $player = $this->maniaControl->playerManager->getPlayer($login);
$this->maniaControl->statisticManager->insertStat(self::STAT_ON_SHOOT, $player, $serverId, $this->onShootArray[$login]); $this->maniaControl->statisticManager->insertStat(self::STAT_ON_SHOOT, $player, $serverIndex, $this->onShootArray[$login]);
$this->onShootArray[$login] = 0; $this->onShootArray[$login] = 0;
} }
} }
@ -114,8 +114,8 @@ class StatisticCollector implements CallbackListener {
//Insert Data into Database, and destroy player //Insert Data into Database, and destroy player
if(isset($this->onShootArray[$player->login])) { if(isset($this->onShootArray[$player->login])) {
if($this->onShootArray[$player->login] > 0) { if($this->onShootArray[$player->login] > 0) {
$serverId = $this->maniaControl->server->getServerId(); $serverIndex = $this->maniaControl->server->getIndex();
$this->maniaControl->statisticManager->insertStat(self::STAT_ON_SHOOT, $player, $serverId, $this->onShootArray[$player->login]); $this->maniaControl->statisticManager->insertStat(self::STAT_ON_SHOOT, $player, $serverIndex, $this->onShootArray[$player->login]);
} }
unset($this->onShootArray[$player->login]); unset($this->onShootArray[$player->login]);
} }

126
application/core/Statistics/StatisticManager.php
View File

@ -12,16 +12,15 @@ require_once __DIR__ . '/StatisticCollector.php';
* *
* @author steeffeen & kremsy * @author steeffeen & kremsy
*/ */
//TODO db reference between player index and statsitics playerId // TODO db reference between player index and statsitics playerId
//TODO db reference between metadata statId and statistics statId // TODO db reference between metadata statId and statistics statId
class StatisticManager { class StatisticManager {
/** /**
* Constants * Constants
*/ */
const TABLE_STATMETADATA = 'mc_statmetadata'; const TABLE_STATMETADATA = 'mc_statmetadata';
const TABLE_STATISTICS = 'mc_statistics'; const TABLE_STATISTICS = 'mc_statistics';
const STAT_TYPE_INT = '0';
const STAT_TYPE_INT = '0';
const STAT_TYPE_TIME = '1'; const STAT_TYPE_TIME = '1';
/** /**
@ -46,34 +45,37 @@ class StatisticManager {
$this->statisticCollector = new StatisticCollector($maniaControl); $this->statisticCollector = new StatisticCollector($maniaControl);
//Store Stats MetaData // Store Stats MetaData
$this->storeStatMetaData(); $this->storeStatMetaData();
} }
/** /**
* Get the value of an statistic * Get the value of an statistic
* *
* @param $statName * @param $statName
* @param $playerId * @param $playerId
* @param int $serverId * @param int $serverIndex
* @return int * @return int
*/ */
public function getStatisticData($statName, $playerId, $serverId = -1) { public function getStatisticData($statName, $playerId, $serverIndex = -1) {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$statId = $this->getStatId($statName); $statId = $this->getStatId($statName);
if($statId == null) { if ($statId == null) {
return -1; return -1;
} }
if($serverId == -1) { if ($serverIndex == -1) {
$query = "SELECT SUM(value) as value FROM `" . self::TABLE_STATISTICS . "` WHERE `statId` = " . $statId . " AND `playerId` = " . $playerId . ";"; $query = "SELECT SUM(value) as value FROM `" . self::TABLE_STATISTICS . "` WHERE `statId` = " . $statId . " AND `playerId` = " . $playerId .
} else { ";";
$query = "SELECT value FROM `" . self::TABLE_STATISTICS . "` WHERE `statId` = " . $statId . " AND `playerId` = " . $playerId . " AND `serverLogin` = '" . $serverId . "';"; }
else {
$query = "SELECT value FROM `" . self::TABLE_STATISTICS . "` WHERE `statId` = " . $statId . " AND `playerId` = " . $playerId .
" AND `serverIndex` = '" . $serverIndex . "';";
} }
$result = $mysqli->query($query); $result = $mysqli->query($query);
if(!$result) { if (!$result) {
trigger_error($mysqli->error); trigger_error($mysqli->error);
} }
@ -89,13 +91,13 @@ class StatisticManager {
private function storeStatMetaData() { private function storeStatMetaData() {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "SELECT * FROM `" . self::TABLE_STATMETADATA . "`;"; $query = "SELECT * FROM `" . self::TABLE_STATMETADATA . "`;";
$result = $mysqli->query($query); $result = $mysqli->query($query);
if(!$result) { if (!$result) {
trigger_error($mysqli->error); trigger_error($mysqli->error);
} }
while($row = $result->fetch_object()) { while ($row = $result->fetch_object()) {
$this->stats[$row->name] = $row; $this->stats[$row->name] = $row;
} }
@ -103,32 +105,32 @@ class StatisticManager {
} }
/** /**
* Returns the Stats Id * Returns the Stats Id
* *
* @param $statName * @param $statName
* @return int * @return int
*/ */
private function getStatId($statName) { private function getStatId($statName) {
if(isset($this->stats[$statName])) { if (isset($this->stats[$statName])) {
$stat = $this->stats[$statName]; $stat = $this->stats[$statName];
return (int)$stat->index; return (int) $stat->index;
} else { }
else {
return null; return null;
} }
} }
/** /**
* Get all statistics of a certain palyer * Get all statistics of a certain palyer
* *
* @param Player $player * @param Player $player
* @param int $serverId * @param int $serverIndex
* @return array * @return array
*/ */
public function getAllPlayerStats(Player $player, $serverId = -1) { public function getAllPlayerStats(Player $player, $serverIndex = -1) {
$playerStats = array(); //TODO improve performence $playerStats = array(); // TODO improve performence
foreach($this->stats as $stat) { foreach ($this->stats as $stat) {
$value = $this->getStatisticData($stat->name, $player->index, $serverId); $value = $this->getStatisticData($stat->name, $player->index, $serverIndex);
$playerStats[$stat->name] = array($stat, $value); $playerStats[$stat->name] = array($stat, $value);
} }
@ -138,38 +140,36 @@ class StatisticManager {
/** /**
* Inserts a Stat into the database * Inserts a Stat into the database
* *
* @param $statName * @param string $statName
* @param Player $player * @param Player $player
* @param int $serverId * @param int $serverIndex
* @param $value , value to Add * @param mixed $value , value to Add
* @param string $statType * @param string $statType
* @internal param string $serverLogin
* @return bool * @return bool
*/ */
public function insertStat($statName, $player, $serverId = -1, $value, $statType = self::STAT_TYPE_INT) { public function insertStat($statName, $player, $serverIndex = -1, $value, $statType = self::STAT_TYPE_INT) {
$statId = $this->getStatId($statName); $statId = $this->getStatId($statName);
if($player == null) { if ($player == null) {
return false; return false;
} }
if($statId == null) { if ($statId == null) {
return false; return false;
} }
if($player->isFakePlayer()) { if ($player->isFakePlayer()) {
return true; return true;
} }
if($serverId == -1) { if ($serverIndex == -1) {
$serverId = $this->maniaControl->server->getServerId(); $serverIndex = $this->maniaControl->server->getIndex();
} }
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "INSERT INTO `" . self::TABLE_STATISTICS . "` ( $query = "INSERT INTO `" . self::TABLE_STATISTICS . "` (
`serverId`, `serverIndex`,
`playerId`, `playerId`,
`statId`, `statId`,
`value` `value`
@ -179,14 +179,14 @@ class StatisticManager {
`value` = `value` + VALUES(`value`);"; `value` = `value` + VALUES(`value`);";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error); trigger_error($mysqli->error);
return false; return false;
} }
$statement->bind_param('iiii', $serverId, $player->index, $statId, $value); $statement->bind_param('iiii', $serverIndex, $player->index, $statId, $value);
$statement->execute(); $statement->execute();
if($statement->error) { if ($statement->error) {
trigger_error($statement->error); trigger_error($statement->error);
$statement->close(); $statement->close();
return false; return false;
@ -199,29 +199,26 @@ class StatisticManager {
/** /**
* Increments a Statistic by one * Increments a Statistic by one
* *
* @param $statName * @param string $statName
* @param \ManiaControl\Players\Player $player * @param Player $player
* @param int $serverId * @param int $serverIndex
* @internal param string $serverLogin
* @internal param \ManiaControl\Players\Player $playerId
* @return bool * @return bool
*/ */
public function incrementStat($statName, $player, $serverId = -1) { public function incrementStat($statName, Player $player, $serverIndex = -1) {
return $this->insertStat($statName, $player, $serverId, 1); return $this->insertStat($statName, $player, $serverIndex, 1);
} }
/** /**
* Defines a Stat * Defines a Stat
* *
* @param $statName * @param $statName
* @param string $type * @param string $type
* @param string $statDescription * @param string $statDescription
* @return bool * @return bool
*/ */
public function defineStatMetaData($statName, $type = self::STAT_TYPE_INT, $statDescription = '') { public function defineStatMetaData($statName, $type = self::STAT_TYPE_INT, $statDescription = '') {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "INSERT INTO `" . self::TABLE_STATMETADATA . "` ( $query = "INSERT INTO `" . self::TABLE_STATMETADATA . "` (
`name`, `name`,
`type`, `type`,
`description` `description`
@ -231,13 +228,13 @@ class StatisticManager {
`type` = VALUES(`type`), `type` = VALUES(`type`),
`description` = VALUES(`description`);"; `description` = VALUES(`description`);";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error); trigger_error($mysqli->error);
return false; return false;
} }
$statement->bind_param('sis', $statName, $type, $statDescription); $statement->bind_param('sis', $statName, $type, $statDescription);
$statement->execute(); $statement->execute();
if($statement->error) { if ($statement->error) {
trigger_error($statement->error); trigger_error($statement->error);
$statement->close(); $statement->close();
return false; return false;
@ -248,7 +245,6 @@ class StatisticManager {
return true; return true;
} }
/** /**
* Initialize necessary database tables * Initialize necessary database tables
* *
@ -256,7 +252,7 @@ class StatisticManager {
*/ */
private function initTables() { private function initTables() {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_STATMETADATA . "` ( $query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_STATMETADATA . "` (
`index` int(11) NOT NULL AUTO_INCREMENT, `index` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(100) COLLATE utf8_unicode_ci NOT NULL, `name` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`type` int(5) NOT NULL, `type` int(5) NOT NULL,
@ -266,13 +262,13 @@ class StatisticManager {
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Statistics Meta Data' AUTO_INCREMENT=1;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Statistics Meta Data' AUTO_INCREMENT=1;";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR); trigger_error($mysqli->error, E_USER_ERROR);
return false; return false;
} }
$statement->execute(); $statement->execute();
if($statement->error) { if ($statement->error) {
trigger_error($statement->error, E_USER_ERROR); trigger_error($statement->error, E_USER_ERROR);
return false; return false;
@ -281,22 +277,22 @@ class StatisticManager {
$query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_STATISTICS . "` ( $query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_STATISTICS . "` (
`index` int(11) NOT NULL AUTO_INCREMENT, `index` int(11) NOT NULL AUTO_INCREMENT,
`serverId` int(11) NOT NULL, `serverIndex` int(11) NOT NULL,
`playerId` int(11) NOT NULL, `playerId` int(11) NOT NULL,
`statId` int(11) NOT NULL, `statId` int(11) NOT NULL,
`value` int(20) COLLATE utf8_unicode_ci NOT NULL, `value` int(20) COLLATE utf8_unicode_ci NOT NULL,
PRIMARY KEY (`index`), PRIMARY KEY (`index`),
UNIQUE KEY `unique` (`statId`,`playerId`,`serverId`) UNIQUE KEY `unique` (`statId`,`playerId`,`serverIndex`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Statistics' AUTO_INCREMENT=1;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Statistics' AUTO_INCREMENT=1;";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR); trigger_error($mysqli->error, E_USER_ERROR);
return false; return false;
} }
$statement->execute(); $statement->execute();
if($statement->error) { if ($statement->error) {
trigger_error($statement->error, E_USER_ERROR); trigger_error($statement->error, E_USER_ERROR);
return false; return false;

4
application/plugins/Donations.php
View File

@ -424,8 +424,8 @@ class DonationPlugin implements CallbackListener, CommandListener, Plugin {
$message = 'Donation successful! Thanks.'; $message = 'Donation successful! Thanks.';
} }
$this->maniaControl->chat->sendSuccess($message, $login); $this->maniaControl->chat->sendSuccess($message, $login);
$this->maniaControl->statisticManager->insertStat(self::STAT_PLAYER_DONATIONS, $player, $serverIndex = $this->maniaControl->server->getIndex();
$this->maniaControl->server->getServerId(), $amount); $this->maniaControl->statisticManager->insertStat(self::STAT_PLAYER_DONATIONS, $player, $serverIndex, $amount);
} }
} }
else { else {

3
application/plugins/Karma.php
View File

@ -272,7 +272,8 @@ class KarmaPlugin implements CallbackListener, Plugin {
$voted = $this->getPlayerVote($player, $map); $voted = $this->getPlayerVote($player, $map);
var_dump($voted); var_dump($voted);
if(!$voted){ if(!$voted){
$this->maniaControl->statisticManager->incrementStat(self::STAT_PLAYER_MAPVOTES, $player, $this->maniaControl->server->getServerId()); $serverIndex = $this->maniaControl->server->getIndex();
$this->maniaControl->statisticManager->incrementStat(self::STAT_PLAYER_MAPVOTES, $player, $serverIndex);
} }
$success = $this->savePlayerVote($player, $map, $vote); $success = $this->savePlayerVote($player, $map, $vote);