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

dedimania update

Browse Source
This commit is contained in:
kremsy
2014-02-23 15:28:53 +01:00
committed by Steffen Schröder
parent bcd8a9de67
commit dc248a69ed
4 changed files with 121 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,10 +5,6 @@ namespace ManiaControl\Server;
use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\ManiaControl;
use ManiaControl\Players\Player;
use Maniaplanet\DedicatedServer\Structures\ServerOptions;
use Maniaplanet\DedicatedServer\Structures\SystemInfos;
use Maniaplanet\DedicatedServer\Structures\Version;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
/**
@ -21,7 +17,7 @@ class Server implements CallbackListener {
/**
* Constants
*/
const TABLE_SERVERS = 'mc_servers';
const TABLE_SERVERS = 'mc_servers';
const CB_TEAM_MODE_CHANGED = 'ServerCallback.TeamModeChanged';
/**
@ -124,6 +120,29 @@ class Server implements CallbackListener {
return true;
}
/**
* Gets all Servers from the Database
*
* @return array
*/
public function getAllServers() {
$mysqli = $this->maniaControl->database->mysqli;
$query = "SELECT * FROM `" . self::TABLE_SERVERS . "`";
$result = $mysqli->query($query);
if (!$result) {
trigger_error($mysqli->error);
return array();
}
$servers = array();
while($row = $result->fetch_object()) {
array_push($servers, $row);
}
$result->close();
return $servers;
}
/**
* Handle OnInit Callback
*/

4
application/core/Settings/SettingManager.php
View File

@ -72,7 +72,7 @@ class SettingManager implements CallbackListener {
if ($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR);
}
// TODO: remove before release
$settingTableChangesQuery = "ALTER TABLE `".self::TABLE_SETTINGS."`
MODIFY `class` VARCHAR(100) NOT NULL,
@ -81,7 +81,7 @@ class SettingManager implements CallbackListener {
if ($mysqli->error) {
trigger_error($mysqli->error);
}
return $result && $result2;
}