definiations of permission levels

This commit is contained in:
kremsy 2014-01-09 18:45:39 +01:00
parent 6e4cf32a16
commit 4ab7f8ff49
4 changed files with 88 additions and 52 deletions

View File

@ -2,7 +2,6 @@
namespace ManiaControl\Admin; namespace ManiaControl\Admin;
use ManiaControl\FileUtil;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
use ManiaControl\Players\Player; use ManiaControl\Players\Player;
use ManiaControl\Players\PlayerManager; use ManiaControl\Players\PlayerManager;
@ -18,18 +17,18 @@ class AuthenticationManager {
/** /**
* Constants * Constants
*/ */
const AUTH_LEVEL_PLAYER = 0; const AUTH_LEVEL_PLAYER = 0;
const AUTH_LEVEL_MODERATOR = 1; const AUTH_LEVEL_MODERATOR = 1;
const AUTH_LEVEL_ADMIN = 2; const AUTH_LEVEL_ADMIN = 2;
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';
/** /**
* Public Properties * Public Properties
*/ */
public $authCommands = null; public $authCommands = null;
/** /**
* Private Properties * Private Properties
*/ */
@ -43,10 +42,11 @@ class AuthenticationManager {
public function __construct(ManiaControl $maniaControl) { public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl; $this->maniaControl = $maniaControl;
$this->updateMasterAdmins(); $this->updateMasterAdmins();
$this->authCommands = new AuthCommands($maniaControl); $this->authCommands = new AuthCommands($maniaControl);
} }
/** /**
* Set MasterAdmins * Set MasterAdmins
* *
@ -54,28 +54,28 @@ class AuthenticationManager {
*/ */
private function updateMasterAdmins() { private function updateMasterAdmins() {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
// Remove all MasterAdmins // Remove all MasterAdmins
$adminQuery = "UPDATE `" . PlayerManager::TABLE_PLAYERS . "` $adminQuery = "UPDATE `" . PlayerManager::TABLE_PLAYERS . "`
SET `authLevel` = ? SET `authLevel` = ?
WHERE `authLevel` = ?;"; WHERE `authLevel` = ?;";
$adminStatement = $mysqli->prepare($adminQuery); $adminStatement = $mysqli->prepare($adminQuery);
if ($mysqli->error) { if($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR); trigger_error($mysqli->error, E_USER_ERROR);
return false; return false;
} }
$adminLevel = self::AUTH_LEVEL_SUPERADMIN; $adminLevel = self::AUTH_LEVEL_SUPERADMIN;
$masterAdminLevel = self::AUTH_LEVEL_MASTERADMIN; $masterAdminLevel = self::AUTH_LEVEL_MASTERADMIN;
$adminStatement->bind_param('ii', $adminLevel, $masterAdminLevel); $adminStatement->bind_param('ii', $adminLevel, $masterAdminLevel);
$adminStatement->execute(); $adminStatement->execute();
if ($adminStatement->error) { if($adminStatement->error) {
trigger_error($adminStatement->error); trigger_error($adminStatement->error);
} }
$adminStatement->close(); $adminStatement->close();
// Set MasterAdmins // Set MasterAdmins
$masterAdmins = $this->maniaControl->config->masteradmins->xpath('login'); $masterAdmins = $this->maniaControl->config->masteradmins->xpath('login');
$adminQuery = "INSERT INTO `" . PlayerManager::TABLE_PLAYERS . "` ( $adminQuery = "INSERT INTO `" . PlayerManager::TABLE_PLAYERS . "` (
`login`, `login`,
`authLevel` `authLevel`
) VALUES ( ) VALUES (
@ -83,16 +83,16 @@ class AuthenticationManager {
) ON DUPLICATE KEY UPDATE ) ON DUPLICATE KEY UPDATE
`authLevel` = VALUES(`authLevel`);"; `authLevel` = VALUES(`authLevel`);";
$adminStatement = $mysqli->prepare($adminQuery); $adminStatement = $mysqli->prepare($adminQuery);
if ($mysqli->error) { if($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR); trigger_error($mysqli->error, E_USER_ERROR);
return false; return false;
} }
$adminStatement->bind_param('si', $login, $masterAdminLevel); $adminStatement->bind_param('si', $login, $masterAdminLevel);
$success = true; $success = true;
foreach ($masterAdmins as $masterAdmin) { foreach($masterAdmins as $masterAdmin) {
$login = (string) $masterAdmin; $login = (string)$masterAdmin;
$adminStatement->execute(); $adminStatement->execute();
if ($adminStatement->error) { if($adminStatement->error) {
trigger_error($adminStatement->error); trigger_error($adminStatement->error);
$success = false; $success = false;
} }
@ -105,16 +105,20 @@ 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_numeric($authLevel)) return false; if(!$player || !is_numeric($authLevel)) {
$authLevel = (int) $authLevel; return false;
if ($authLevel >= self::AUTH_LEVEL_MASTERADMIN) return false; }
$authLevel = (int)$authLevel;
$mysqli = $this->maniaControl->database->mysqli; if($authLevel >= self::AUTH_LEVEL_MASTERADMIN) {
$authQuery = "INSERT INTO `" . PlayerManager::TABLE_PLAYERS . "` ( return false;
}
$mysqli = $this->maniaControl->database->mysqli;
$authQuery = "INSERT INTO `" . PlayerManager::TABLE_PLAYERS . "` (
`login`, `login`,
`authLevel` `authLevel`
) VALUES ( ) VALUES (
@ -122,22 +126,22 @@ class AuthenticationManager {
) ON DUPLICATE KEY UPDATE ) ON DUPLICATE KEY UPDATE
`authLevel` = VALUES(`authLevel`);"; `authLevel` = VALUES(`authLevel`);";
$authStatement = $mysqli->prepare($authQuery); $authStatement = $mysqli->prepare($authQuery);
if ($mysqli->error) { if($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR); trigger_error($mysqli->error, E_USER_ERROR);
return false; return false;
} }
$authStatement->bind_param('si', $player->login, $authLevel); $authStatement->bind_param('si', $player->login, $authLevel);
$authStatement->execute(); $authStatement->execute();
if ($authStatement->error) { if($authStatement->error) {
trigger_error($authStatement->error); trigger_error($authStatement->error);
$authStatement->close(); $authStatement->close();
return false; return false;
} }
$authStatement->close(); $authStatement->close();
$player->authLevel = $authLevel; $player->authLevel = $authLevel;
$this->maniaControl->callbackManager->triggerCallback(self::CB_AUTH_LEVEL_CHANGED, array(self::CB_AUTH_LEVEL_CHANGED, $player)); $this->maniaControl->callbackManager->triggerCallback(self::CB_AUTH_LEVEL_CHANGED, array(self::CB_AUTH_LEVEL_CHANGED, $player));
return true; return true;
} }
@ -148,7 +152,9 @@ class AuthenticationManager {
* @return bool * @return bool
*/ */
public function sendNotAllowed(Player $player) { public function sendNotAllowed(Player $player) {
if (!$player) return false; if(!$player) {
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);
} }
@ -156,13 +162,36 @@ class AuthenticationManager {
* 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
* @return bool * @return bool
*/ */
public static function checkRight(Player $player, $neededAuthLevel) { public static function checkRight(Player $player, $neededAuthLevel) {
return ($player->authLevel >= $neededAuthLevel); return ($player->authLevel >= $neededAuthLevel);
} }
/**
* Checks the permission by a right name
*
* @param Player $player
* @param $rightName
* @return bool
*/
public function checkPermission(Player $player, $rightName) {
$right = $this->maniaControl->settingManager->getSetting($this, $rightName);
return $this->checkRight($player, $right);
}
/**
* Defines a Minimum Right Level needed for an action
*
* @param $rightName
* @param $authLevelNeeded
*/
public function definePermissionLevel($rightName, $authLevelNeeded) {
$this->maniaControl->settingManager->initSetting($this, $rightName, $authLevelNeeded);
}
/** /**
* Get Name of the Authentication Level from Level Int * Get Name of the Authentication Level from Level Int
* *
@ -170,16 +199,16 @@ class AuthenticationManager {
* @return string * @return string
*/ */
public static function getAuthLevelName($authLevelInt) { public static function getAuthLevelName($authLevelInt) {
if ($authLevelInt == self::AUTH_LEVEL_MASTERADMIN) { if($authLevelInt == self::AUTH_LEVEL_MASTERADMIN) {
return 'MasterAdmin'; return 'MasterAdmin';
} }
if ($authLevelInt == self::AUTH_LEVEL_SUPERADMIN) { if($authLevelInt == self::AUTH_LEVEL_SUPERADMIN) {
return 'SuperAdmin'; return 'SuperAdmin';
} }
if ($authLevelInt == self::AUTH_LEVEL_ADMIN) { if($authLevelInt == self::AUTH_LEVEL_ADMIN) {
return 'Admin'; return 'Admin';
} }
if ($authLevelInt == self::AUTH_LEVEL_MODERATOR) { if($authLevelInt == self::AUTH_LEVEL_MODERATOR) {
return 'Moderator'; return 'Moderator';
} }
return 'Player'; return 'Player';
@ -192,16 +221,16 @@ class AuthenticationManager {
* @return string * @return string
*/ */
public static function getAuthLevelAbbreviation($authLevelInt) { public static function getAuthLevelAbbreviation($authLevelInt) {
if ($authLevelInt == self::AUTH_LEVEL_MASTERADMIN) { if($authLevelInt == self::AUTH_LEVEL_MASTERADMIN) {
return 'MA'; return 'MA';
} }
if ($authLevelInt == self::AUTH_LEVEL_SUPERADMIN) { if($authLevelInt == self::AUTH_LEVEL_SUPERADMIN) {
return 'SA'; return 'SA';
} }
if ($authLevelInt == self::AUTH_LEVEL_ADMIN) { if($authLevelInt == self::AUTH_LEVEL_ADMIN) {
return 'AD'; return 'AD';
} }
if ($authLevelInt == self::AUTH_LEVEL_MODERATOR) { if($authLevelInt == self::AUTH_LEVEL_MODERATOR) {
return 'MOD'; return 'MOD';
} }
return 'PL'; return 'PL';
@ -215,16 +244,16 @@ class AuthenticationManager {
*/ */
public static function getAuthLevel($authLevelName) { public static function getAuthLevel($authLevelName) {
$authLevelName = strtolower($authLevelName); $authLevelName = strtolower($authLevelName);
if ($authLevelName == 'MasterAdmin') { if($authLevelName == 'MasterAdmin') {
return self::AUTH_LEVEL_MASTERADMIN; return self::AUTH_LEVEL_MASTERADMIN;
} }
if ($authLevelName == 'SuperAdmin') { if($authLevelName == 'SuperAdmin') {
return self::AUTH_LEVEL_SUPERADMIN; return self::AUTH_LEVEL_SUPERADMIN;
} }
if ($authLevelName == 'Admin') { if($authLevelName == 'Admin') {
return self::AUTH_LEVEL_ADMIN; return self::AUTH_LEVEL_ADMIN;
} }
if ($authLevelName == 'Moderator') { if($authLevelName == 'Moderator') {
return self::AUTH_LEVEL_MODERATOR; return self::AUTH_LEVEL_MODERATOR;
} }
return self::AUTH_LEVEL_PLAYER; return self::AUTH_LEVEL_PLAYER;

View File

@ -140,7 +140,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
// Pagers // Pagers
// Config // Config
$pagerSize = 6.; $pagerSize = 6.;
$pagesId = 'MapListPages'; $pagesId = 'MxListPages';
$pagerPrev = new Quad_Icons64x64_1(); $pagerPrev = new Quad_Icons64x64_1();
$frame->add($pagerPrev); $frame->add($pagerPrev);
@ -184,7 +184,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$i = 0; $i = 0;
$y -= 10; $y -= 10;
$pageFrames = array(); $pageFrames = array();
foreach($maps as $map) { //TODO pagers, order possabilities foreach($maps as $map) { //TODO order possabilities
if(!isset($pageFrame)) { if(!isset($pageFrame)) {
$pageFrame = new Frame(); $pageFrame = new Frame();
$frame->add($pageFrame); $frame->add($pageFrame);
@ -372,7 +372,6 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$maniaLink->setScript($script); $maniaLink->setScript($script);
// Pagers // Pagers
// Config // Config
$pagerSize = 6.; $pagerSize = 6.;
$pagesId = 'MapListPages'; $pagesId = 'MapListPages';

View File

@ -2,6 +2,7 @@
namespace ManiaControl\Maps; namespace ManiaControl\Maps;
use ManiaControl\Admin\AuthenticationManager;
use ManiaControl\Callbacks\CallbackListener; use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager; use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\FileUtil; use ManiaControl\FileUtil;
@ -21,9 +22,11 @@ class MapManager implements CallbackListener {
/** /**
* Constants * Constants
*/ */
const TABLE_MAPS = 'mc_maps'; const TABLE_MAPS = 'mc_maps';
const CB_MAPS_UPDATED = 'MapManager.MapsUpdated'; const CB_MAPS_UPDATED = 'MapManager.MapsUpdated';
const CB_KARMA_UPDATED = 'MapManager.KarmaUpdated'; const CB_KARMA_UPDATED = 'MapManager.KarmaUpdated';
const SETTING_PERMISSION_ADD_MAP = 'Add Maps';
const SETTING_PERMISSION_REMOVE_MAP = 'Remove Maps';
/** /**
* Public Properties * Public Properties
@ -60,6 +63,10 @@ class MapManager implements CallbackListener {
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'handleOnInit'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'handleOnInit');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_BEGINMAP, $this, 'handleBeginMap'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_BEGINMAP, $this, 'handleBeginMap');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MAPLISTMODIFIED, $this, 'mapsModified'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MAPLISTMODIFIED, $this, 'mapsModified');
//Define Rights
$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_ADD_MAP,AuthenticationManager::AUTH_LEVEL_ADMIN);
$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_REMOVE_MAP,AuthenticationManager::AUTH_LEVEL_ADMIN);
} }
/** /**

View File

@ -17,6 +17,7 @@ class SettingManager {
const TYPE_REAL = 'real'; const TYPE_REAL = 'real';
const TYPE_BOOL = 'bool'; const TYPE_BOOL = 'bool';
const TYPE_ARRAY = 'array'; const TYPE_ARRAY = 'array';
//const TYPE_AUTH_LEVEL = 'auth'; //TODO
/** /**
* Private properties * Private properties