added servers database

application/core/Server/Server.php

@@ -2,6 +2,8 @@
 
 namespace ManiaControl\Server;
 
+use ManiaControl\Callbacks\CallbackListener;
+use ManiaControl\Callbacks\CallbackManager;
 use ManiaControl\FileUtil;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
@@ -13,7 +15,12 @@ require_once __DIR__ . '/ServerCommands.php';
  *
  * @author steeffeen & kremsy
  */
-class Server {
+class Server implements CallbackListener {
+
+	/**
+	 * Constants
+	 */
+	const TABLE_SERVERS = 'mc_servers';
 
 	/**
 	 * Public properties
@@ -25,6 +32,7 @@ class Server {
 	 */
 	private $maniaControl = null;
 	private $serverCommands = null;
+	private $serverId = 0;
 
 	/**
 	 * Construct server
@@ -37,16 +45,102 @@ class Server {
 		// Load config
 		$this->config = FileUtil::loadConfig('server.xml');
 
+		// Register for callbacks
+		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit');
+
 		$this->serverCommands = new ServerCommands($maniaControl);
+
+		$this->initTables();
+
+		//$this->initServer();
 	}
 
+	/**
+	 * Initialize necessary database tables
+	 *
+	 * @return bool
+	 */
+	private function initTables() {
+		$mysqli = $this->maniaControl->database->mysqli;
+		$query  = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SERVERS . "` (
+				`serverId` int(11) NOT NULL AUTO_INCREMENT,
+				`login` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+				PRIMARY KEY (`serverId`),
+				UNIQUE KEY `login` (`login`)
+				) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Servers' AUTO_INCREMENT=1;";
+
+		$statement = $mysqli->prepare($query);
+		if($mysqli->error) {
+			trigger_error($mysqli->error, E_USER_ERROR);
+
+			return false;
+		}
+		$statement->execute();
+		if($statement->error) {
+			trigger_error($statement->error, E_USER_ERROR);
+
+			return false;
+		}
+		$statement->close();
+
+		return true;
+	}
+
+	/**
+	 * Handle OnInit callback
+	 *
+	 * @param array $callback
+	 */
+	public function onInit(array $callback) {
+		$mysqli = $this->maniaControl->database->mysqli;
+
+		$login = $this->getLogin();
+
+		$query = "INSERT IGNORE INTO `" . self::TABLE_SERVERS . "` (
+					`login`
+				) VALUES (
+					?
+				);";
+
+		$statement = $mysqli->prepare($query);
+		if($mysqli->error) {
+			trigger_error($mysqli->error);
+			return false;
+		}
+		$statement->bind_param('s', $login);
+		$statement->execute();
+		if($statement->error) {
+			trigger_error($statement->error);
+			$statement->close();
+			return false;
+		}
+
+		$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;
+	}
+
+
 	/**
 	 * Fetch game data directory
 	 *
 	 * @return string
 	 */
 	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());
 			return null;
 		}
@@ -60,7 +154,7 @@ class Server {
 	 */
 	public function getMapsDirectory() {
 		$dataDirectory = $this->getDataDirectory();
-		if (!$dataDirectory) {
+		if(!$dataDirectory) {
 			return null;
 		}
 		return $dataDirectory . 'Maps/';
@@ -73,7 +167,7 @@ class Server {
 	 * @return bool
 	 */
 	public function checkAccess($directory) {
-		if (!$directory) {
+		if(!$directory) {
 			return false;
 		}
 		return (is_dir($directory) && is_writable($directory));
@@ -86,7 +180,7 @@ class Server {
 	 */
 	public function getLogin() { //TODO save the info locally
 		$systemInfo = $this->getSystemInfo();
-		if (!$systemInfo) {
+		if(!$systemInfo) {
 			return null;
 		}
 		return $systemInfo['ServerLogin'];
@@ -99,15 +193,15 @@ class Server {
 	 * @return array
 	 */
 	public function getInfo($detailed = false) {
-		if ($detailed) {
+		if($detailed) {
 			$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());
 				return null;
 			}
 			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());
 			return null;
 		}
@@ -120,7 +214,7 @@ class Server {
 	 * @return array
 	 */
 	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());
 			return null;
 		}
@@ -133,7 +227,7 @@ class Server {
 	 * @return string
 	 */
 	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());
 			return null;
 		}
@@ -146,7 +240,7 @@ class Server {
 	 * @return string
 	 */
 	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());
 			return null;
 		}
@@ -159,7 +253,7 @@ class Server {
 	 * @return array
 	 */
 	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));
 			return null;
 		}
@@ -174,18 +268,17 @@ class Server {
 	 * @return int | string
 	 */
 	public function getGameMode($stringValue = false, $parseValue = null) {
-		if (is_int($parseValue)) {
+		if(is_int($parseValue)) {
 			$gameMode = $parseValue;
-		}
+		} else {
-		else {
+			if(!$this->maniaControl->client->query('GetGameMode')) {
-			if (!$this->maniaControl->client->query('GetGameMode')) {
 				trigger_error("Couldn't fetch current game mode. " . $this->maniaControl->getClientErrorText());
 				return null;
 			}
 			$gameMode = $this->maniaControl->client->getResponse();
 		}
-		if ($stringValue) {
+		if($stringValue) {
-			switch ($gameMode) {
+			switch($gameMode) {
 				case 0:
 				{
 					return 'Script';
@@ -230,7 +323,7 @@ class Server {
 	 * @return string
 	 */
 	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());
 			return null;
 		}
@@ -245,7 +338,7 @@ class Server {
 	 */
 	public function getGhostReplay(Player $player) {
 		$dataDir = $this->getDataDirectory();
-		if (!$this->checkAccess($dataDir)) {
+		if(!$this->checkAccess($dataDir)) {
 			return null;
 		}
 
@@ -256,14 +349,14 @@ class Server {
 		$fileName = "GhostReplays/Ghost.{$player->login}.{$gameMode}.{$time}.{$map['UId']}.Replay.Gbx";
 
 		// 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());
 			return null;
 		}
 
 		// Load replay file
 		$ghostReplay = file_get_contents($dataDir . 'Replays/' . $fileName);
-		if (!$ghostReplay) {
+		if(!$ghostReplay) {
 			trigger_error("Couldn't retrieve saved ghost replay.");
 			return null;
 		}
@@ -280,7 +373,7 @@ class Server {
 		$this->maniaControl->client->query('GetStatus');
 		$response = $this->maniaControl->client->getResponse();
 		// Check if server has the given status
-		if ($response['Code'] === 4) {
+		if($response['Code'] === 4) {
 			return true;
 		}
 		// Server not yet in given status -> Wait for it...
@@ -289,19 +382,17 @@ class Server {
 		$lastStatus  = $response['Name'];
 		$this->maniaControl->log("Waiting for server to reach status {$statusCode}...");
 		$this->maniaControl->log("Current Status: {$lastStatus}");
-		while ($response['Code'] !== 4) {
+		while($response['Code'] !== 4) {
 			sleep(1);
 			$this->maniaControl->client->query('GetStatus');
 			$response = $this->maniaControl->client->getResponse();
-			if ($lastStatus !== $response['Name']) {
+			if($lastStatus !== $response['Name']) {
 				$this->maniaControl->log("New Status: " . $response['Name']);
 				$lastStatus = $response['Name'];
 			}
-			if (time() - $maxWaitTime > $waitBegin) {
+			if(time() - $maxWaitTime > $waitBegin) {
 				// It took too long to reach the status
-				trigger_error(
+				trigger_error("Server couldn't reach status {$statusCode} after {$maxWaitTime} seconds! " . $this->maniaControl->getClientErrorText());
-						"Server couldn't reach status {$statusCode} after {$maxWaitTime} seconds! " .
-								 $this->maniaControl->getClientErrorText());
 				return false;
 			}
 		}

application/plugins/Donations.php

@@ -19,7 +19,7 @@ use ManiaControl\Plugins\Plugin;
  * @author steeffeen and Lukas
  */
 class DonationPlugin implements CallbackListener, CommandListener, Plugin {
-	/**ts
+	/**
 	 * Constants
 	 */
 	const ID                              = 3;