permission levels for settings

application/core/Configurators/Configurator.php

@@ -40,6 +40,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
 	const SETTING_MENU_HEIGHT   = 'Menu Widget Height';
 	const SETTING_MENU_STYLE    = 'Menu Widget BackgroundQuad Style';
 	const SETTING_MENU_SUBSTYLE = 'Menu Widget BackgroundQuad Substyle';
+	const SETTING_PERMISSION_OPEN_CONFIGURATOR = 'Open Configurator';
 
 	/*
 	 * Private Properties
@@ -68,6 +69,9 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
 		$this->maniaControl->settingManager->initSetting($this, self::SETTING_MENU_STYLE, Quad_BgRaceScore2::STYLE);
 		$this->maniaControl->settingManager->initSetting($this, self::SETTING_MENU_SUBSTYLE, Quad_BgRaceScore2::SUBSTYLE_HandleSelectable);
 
+		//Permission for opening
+		$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_OPEN_CONFIGURATOR, AuthenticationManager::AUTH_LEVEL_ADMIN);
+
 		// Register for page answers
 		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_TOGGLEMENU, $this, 'handleToggleMenuAction');
 		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_SAVECONFIG, $this, 'handleSaveConfigAction');
@@ -78,6 +82,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
 		$this->maniaControl->callbackManager->registerCallbackListener(ManialinkManager::CB_MAIN_WINDOW_OPENED, $this, 'handleWidgetOpened');
 		$this->maniaControl->callbackManager->registerCallbackListener(ManialinkManager::CB_MAIN_WINDOW_CLOSED, $this, 'closeWidget');
 
+
 		// Create server settings
 		$this->serverSettings = new ServerSettings($maniaControl);
 		$this->addMenu($this->serverSettings);
@@ -100,7 +105,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
 	 * @param array $callback
 	 */
 	public function handleConfigCommand(array $callback, Player $player) {
-		if(!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) {
+		if (!$this->maniaControl->authenticationManager->checkPermission($player, self::SETTING_PERMISSION_OPEN_CONFIGURATOR)) {
 			$this->maniaControl->authenticationManager->sendNotAllowed($player);
 			return;
 		}

application/core/Configurators/ScriptSettings.php

@@ -9,6 +9,7 @@ use FML\Controls\Label;
 use FML\Controls\Labels\Label_Text;
 use FML\Controls\Quads\Quad_Icons64x64_1;
 use FML\Script\Script;
+use ManiaControl\Admin\AuthenticationManager;
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\CallbackManager;
 use ManiaControl\ManiaControl;
@@ -34,6 +35,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	const CB_SCRIPTSETTINGS_CHANGED               = 'ScriptSettings.SettingsChanged';
 	const TABLE_SCRIPT_SETTINGS                   = 'mc_scriptsettings';
 	const SETTING_LOAD_DEFAULT_SETTINGS_MAP_BEGIN = 'Load Stored Script-Settings on Map-Begin';
+	const SETTING_PERMISSION_CHANGE_SCRIPT_SETTINGS = 'Change Script-Settings';
 
 	/*
 	 * Private Properties
@@ -54,6 +56,9 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 		$this->maniaControl->callbackManager->registerCallbackListener(MapManager::CB_BEGINMAP, $this, 'onBeginMap');
 		$this->maniaControl->settingManager->initSetting($this, self::SETTING_LOAD_DEFAULT_SETTINGS_MAP_BEGIN, true);
 		$this->initTables();
+
+		//Permission for Change Script-Settings
+		$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_CHANGE_SCRIPT_SETTINGS, AuthenticationManager::AUTH_LEVEL_ADMIN);
 	}
 
 	/**
@@ -303,6 +308,10 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	 * @see \ManiaControl\Configurators\ConfiguratorMenu::saveConfigData()
 	 */
 	public function saveConfigData(array $configData, Player $player) {
+		if (!$this->maniaControl->authenticationManager->checkPermission($player, self::SETTING_PERMISSION_CHANGE_SCRIPT_SETTINGS)) {
+			$this->maniaControl->authenticationManager->sendNotAllowed($player);
+			return;
+		}
 
 		$prefix = explode(".", $configData[3][0]['Name']);
 		if ($prefix[0] != self::ACTION_PREFIX_SETTING) {

application/core/Configurators/ServerSettings.php

@@ -9,6 +9,7 @@ use FML\Controls\Label;
 use FML\Controls\Labels\Label_Text;
 use FML\Controls\Quads\Quad_Icons64x64_1;
 use FML\Script\Script;
+use ManiaControl\Admin\AuthenticationManager;
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\CallbackManager;
 use ManiaControl\ManiaControl;
@@ -30,6 +31,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 	const CB_SERVERSETTING_CHANGED                  = 'ServerSettings.SettingChanged';
 	const CB_SERVERSETTINGS_CHANGED                 = 'ServerSettings.SettingsChanged';
 	const TABLE_SERVER_SETTINGS                     = 'mc_serversettings';
+	const SETTING_PERMISSION_CHANGE_SERVER_SETTINGS = 'Change Server-Settings';
 
 	/*
 	 * Private Properties
@@ -48,6 +50,9 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 		// Register for callbacks
 		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer');
 		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit');
+
+		//Permission for Change Script-Settings
+		$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_CHANGE_SERVER_SETTINGS, AuthenticationManager::AUTH_LEVEL_SUPERADMIN);
 	}
 
 	/**
@@ -102,7 +107,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 		}
 		$serverSettings = $this->maniaControl->client->getServerOptions()->toArray();
 		$applySettings  = false;
-		while ($row = $result->fetch_object()) {
+		while($row = $result->fetch_object()) {
 			if (!isset($serverSettings[$row->settingName])) {
 				continue;
 			}
@@ -257,6 +262,11 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 	 * @see \ManiaControl\Configurators\ConfiguratorMenu::saveConfigData()
 	 */
 	public function saveConfigData(array $configData, Player $player) {
+		if (!$this->maniaControl->authenticationManager->checkPermission($player, self::SETTING_PERMISSION_CHANGE_SERVER_SETTINGS)) {
+			$this->maniaControl->authenticationManager->sendNotAllowed($player);
+			return;
+		}
+
 		$prefix = explode(".", $configData[3][0]['Name']);
 		if ($prefix[0] != self::ACTION_PREFIX_SETTING) {
 			return;

application/core/Server/UsageReporter.php

@@ -7,6 +7,7 @@ use ManiaControl\Formatter;
 use ManiaControl\ManiaControl;
 use ManiaControl\Plugins\Plugin;
 use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
+use Maniaplanet\DedicatedServer\Xmlrpc\FatalException;
 
 /**
  * Class reporting ManiaControl Usage for the Server
@@ -57,6 +58,7 @@ class UsageReporter implements TimerListener {
 		$properties['ServerLogin']         = $this->maniaControl->server->login;
 		$properties['TitleId']             = $this->maniaControl->server->titleId;
 		$properties['ServerName']          = Formatter::stripDirtyCodes($this->maniaControl->client->getServerName());
+
 		$properties['PlayerCount']         = $this->maniaControl->playerManager->getPlayerCount();
 		$properties['MemoryUsage']         = memory_get_usage();
 		$properties['MemoryPeakUsage']     = memory_get_peak_usage();

application/plugins/WidgetPlugin.php

@@ -8,16 +8,15 @@ use FML\Controls\Quads\Quad_Icons64x64_1;
 use FML\ManiaLink;
 use FML\Script\Script;
 use ManiaControl\Callbacks\CallbackListener;
-use ManiaControl\Callbacks\CallbackManager;
 use ManiaControl\Callbacks\TimerListener;
 use ManiaControl\Formatter;
 use ManiaControl\ManiaControl;
 use ManiaControl\Manialinks\IconManager;
+use ManiaControl\Maps\Map;
+use ManiaControl\Maps\MapManager;
 use ManiaControl\Players\Player;
 use ManiaControl\Players\PlayerManager;
 use ManiaControl\Plugins\Plugin;
-use ManiaControl\Maps\MapManager;
-use ManiaControl\Maps\Map;
 
 /**
  * ManiaControl Widget Plugin