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

changed direct public access of maniacontrol properties to using getter methods

Browse Source
This commit is contained in:
Steffen Schröder
2014-08-03 01:34:18 +02:00
parent e560919096
commit 4d3dc92ad5
64 changed files with 2337 additions and 2055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
application/core/Admin/AuthenticationManager.php
View File

@ -49,7 +49,8 @@ class AuthenticationManager implements CallbackListener {
$this->maniaControl = $maniaControl;
$this->authCommands = new AuthCommands($maniaControl);
$this->maniaControl->callbackManager->registerCallbackListener(Callbacks::ONINIT, $this, 'handleOnInit');
// Callbacks
$this->maniaControl->getCallbackManager()->registerCallbackListener(Callbacks::ONINIT, $this, 'handleOnInit');
}
/**
@ -144,14 +145,14 @@ class AuthenticationManager implements CallbackListener {
* @return bool
*/
private function updateMasterAdmins() {
$masterAdminsElements = $this->maniaControl->config->xpath('masteradmins');
$masterAdminsElements = $this->maniaControl->getConfig()->xpath('masteradmins');
if (!$masterAdminsElements) {
$this->maniaControl->log("Missing MasterAdmins configuration!", true);
$this->maniaControl->log('Missing MasterAdmins configuration!', true);
return false;
}
$masterAdminsElement = $masterAdminsElements[0];
$mysqli = $this->maniaControl->database->mysqli;
$mysqli = $this->maniaControl->getDatabase()->getMysqli();
// Remove all MasterAdmins
$adminQuery = "UPDATE `" . PlayerManager::TABLE_PLAYERS . "`
@ -207,7 +208,7 @@ class AuthenticationManager implements CallbackListener {
* @return Player[]
*/
public function getConnectedAdmins($authLevel = self::AUTH_LEVEL_MODERATOR) {
$players = $this->maniaControl->playerManager->getPlayers();
$players = $this->maniaControl->getPlayerManager()->getPlayers();
$admins = array();
foreach ($players as $player) {
if (self::checkRight($player, $authLevel)) {
@ -238,7 +239,7 @@ class AuthenticationManager implements CallbackListener {
* @return Player[]
*/
public function getAdmins($authLevel = self::AUTH_LEVEL_MODERATOR) {
$mysqli = $this->maniaControl->database->mysqli;
$mysqli = $this->maniaControl->getDatabase()->getMysqli();
$query = "SELECT `login` FROM `" . PlayerManager::TABLE_PLAYERS . "`
WHERE `authLevel` > " . $authLevel . "
ORDER BY `authLevel` DESC;";
@ -249,7 +250,7 @@ class AuthenticationManager implements CallbackListener {
}
$admins = array();
while ($row = $result->fetch_object()) {
$player = $this->maniaControl->playerManager->getPlayer($row->login, false);
$player = $this->maniaControl->getPlayerManager()->getPlayer($row->login, false);
if ($player) {
array_push($admins, $player);
}
@ -274,7 +275,7 @@ class AuthenticationManager implements CallbackListener {
return false;
}
$mysqli = $this->maniaControl->database->mysqli;
$mysqli = $this->maniaControl->getDatabase()->getMysqli();
$authQuery = "INSERT INTO `" . PlayerManager::TABLE_PLAYERS . "` (
`login`,
`authLevel`
@ -297,7 +298,7 @@ class AuthenticationManager implements CallbackListener {
$authStatement->close();
$player->authLevel = $authLevel;
$this->maniaControl->callbackManager->triggerCallback(self::CB_AUTH_LEVEL_CHANGED, $player);
$this->maniaControl->getCallbackManager()->triggerCallback(self::CB_AUTH_LEVEL_CHANGED, $player);
return true;
}
@ -312,7 +313,7 @@ class AuthenticationManager implements CallbackListener {
if (!$player) {
return false;
}
return $this->maniaControl->chat->sendError('You do not have the required Rights to perform this Action!', $player->login);
return $this->maniaControl->getChat()->sendError('You do not have the required Rights to perform this Action!', $player);
}
/**
@ -323,7 +324,7 @@ class AuthenticationManager implements CallbackListener {
* @return bool
*/
public function checkPermission(Player $player, $rightName) {
$right = $this->maniaControl->settingManager->getSettingValue($this, $rightName);
$right = $this->maniaControl->getSettingManager()->getSettingValue($this, $rightName);
return $this->checkRight($player, $this->getAuthLevel($right));
}
@ -334,7 +335,7 @@ class AuthenticationManager implements CallbackListener {
* @param int $authLevelNeeded
*/
public function definePermissionLevel($rightName, $authLevelNeeded) {
$this->maniaControl->settingManager->initSetting($this, $rightName, $this->getPermissionLevelNameArray($authLevelNeeded));
$this->maniaControl->getSettingManager()->initSetting($this, $rightName, $this->getPermissionLevelNameArray($authLevelNeeded));
}
/**