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,9 +45,95 @@ 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
 	 *
@@ -176,8 +270,7 @@ class Server {
 	public function getGameMode($stringValue = false, $parseValue = null) {
 		if(is_int($parseValue)) {
 			$gameMode = $parseValue;
-		}
+		} else {
-		else {
 			if(!$this->maniaControl->client->query('GetGameMode')) {
 				trigger_error("Couldn't fetch current game mode. " . $this->maniaControl->getClientErrorText());
 				return null;
@@ -299,9 +392,7 @@ class Server {
 			}
 			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;