authentication manager improvement

This commit is contained in:
Steffen Schröder 2014-01-06 17:48:40 +01:00
parent 3d9362724a
commit 50906f1856

View File

@ -10,7 +10,7 @@ use ManiaControl\Players\PlayerManager;
require_once __DIR__ . '/AuthCommands.php'; require_once __DIR__ . '/AuthCommands.php';
/** /**
* Class managing authentication levels * Class managing Authentication Levels
* *
* @author steeffeen & kremsy * @author steeffeen & kremsy
*/ */
@ -24,11 +24,16 @@ class AuthenticationManager {
const AUTH_LEVEL_SUPERADMIN = 3; const AUTH_LEVEL_SUPERADMIN = 3;
const AUTH_LEVEL_MASTERADMIN = 4; const AUTH_LEVEL_MASTERADMIN = 4;
const CB_AUTH_LEVEL_CHANGED = 'AuthenticationManager.AuthLevelChanged'; const CB_AUTH_LEVEL_CHANGED = 'AuthenticationManager.AuthLevelChanged';
/** /**
* Private properties * Public Properties
*/
public $authCommands = null;
/**
* Private Properties
*/ */
private $maniaControl = null; private $maniaControl = null;
private $authCommands = null;
/** /**
* Construct authentication manager * Construct authentication manager
@ -37,17 +42,17 @@ class AuthenticationManager {
*/ */
public function __construct(ManiaControl $maniaControl) { public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl; $this->maniaControl = $maniaControl;
$this->loadConfig(); $this->updateMasterAdmins();
$this->authCommands = new AuthCommands($maniaControl); $this->authCommands = new AuthCommands($maniaControl);
} }
/** /**
* Load config and initialize strong superadmins * Set MasterAdmins
* *
* @return bool * @return bool
*/ */
private function loadConfig() { private function updateMasterAdmins() {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
// Remove all MasterAdmins // Remove all MasterAdmins
@ -97,16 +102,17 @@ class AuthenticationManager {
} }
/** /**
* Grant the auth level to the player * Grant the Auth Level to the Player
* *
* @param Player $player * @param Player $player
* @param int $authLevel * @param int $authLevel
* @return bool * @return bool
*/ */
public function grantAuthLevel(Player $player, $authLevel) { public function grantAuthLevel(Player &$player, $authLevel) {
if (!$player || !is_int($authLevel) || $authLevel >= self::AUTH_LEVEL_MASTERADMIN) { if (!$player || !is_numeric($authLevel)) return false;
return false; $authLevel = (int) $authLevel;
} if ($authLevel >= self::AUTH_LEVEL_MASTERADMIN) return false;
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$authQuery = "INSERT INTO `" . PlayerManager::TABLE_PLAYERS . "` ( $authQuery = "INSERT INTO `" . PlayerManager::TABLE_PLAYERS . "` (
`login`, `login`,
@ -121,7 +127,7 @@ class AuthenticationManager {
return false; return false;
} }
$authStatement->bind_param('si', $player->login, $authLevel); $authStatement->bind_param('si', $player->login, $authLevel);
$success = $authStatement->execute(); $authStatement->execute();
if ($authStatement->error) { if ($authStatement->error) {
trigger_error($authStatement->error); trigger_error($authStatement->error);
$authStatement->close(); $authStatement->close();
@ -129,31 +135,25 @@ class AuthenticationManager {
} }
$authStatement->close(); $authStatement->close();
if ($success) { $player->authLevel = $authLevel;
// Trigger callback $this->maniaControl->callbackManager->triggerCallback(self::CB_AUTH_LEVEL_CHANGED, array(self::CB_AUTH_LEVEL_CHANGED, $player));
$player->authLevel = $authLevel;
$this->maniaControl->callbackManager->triggerCallback(self::CB_AUTH_LEVEL_CHANGED,
array(self::CB_AUTH_LEVEL_CHANGED, $player));
}
return $success; return true;
} }
/** /**
* Sends an error message to the player * Send an Error Message to the Player
* *
* @param Player $player * @param Player $player
* @return bool * @return bool
*/ */
public function sendNotAllowed(Player $player) { public function sendNotAllowed(Player $player) {
if (!$player) { if (!$player) return false;
return false;
}
return $this->maniaControl->chat->sendError('You do not have the required Rights to perform this Command!', $player->login); return $this->maniaControl->chat->sendError('You do not have the required Rights to perform this Command!', $player->login);
} }
/** /**
* Check if the player has enough rights * Check if the Player has enough Rights
* *
* @param Player $player * @param Player $player
* @param int $neededAuthLevel * @param int $neededAuthLevel