script settings improvements

application/core/Configurators/ScriptSettings.php

@@ -24,7 +24,6 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	/**
 	 * Constants
 	 */
-	const TITLE                    = 'Script Settings';
 	const ACTION_PREFIX_SETTING = 'ScriptSetting.';
 	const ACTION_SETTING_BOOL = 'ScriptSetting.ActionBoolSetting.';
 	const CB_SCRIPTSETTING_CHANGED = 'ScriptSettings.SettingChanged';
@@ -44,11 +43,17 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 		$this->maniaControl = $maniaControl;
 		
 		// Register for callbacks
-		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer');
+		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 
+				'handleManialinkPageAnswer');
 		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit');
 		$this->initTables();
 	}
 
+	/**
+	 * Create all necessary Database Tables
+	 *
+	 * @return boolean
+	 */
 	private function initTables() {
 		$mysqli = $this->maniaControl->database->mysqli;
 		$query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SCRIPT_SETTINGS . "` (
@@ -59,19 +64,16 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 				) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Script Settings' AUTO_INCREMENT=1;";
 		
 		$statement = $mysqli->prepare($query);
-		if($mysqli->error) {
+		if ($mysqli->error) {
 			trigger_error($mysqli->error, E_USER_ERROR);
-
 			return false;
 		}
 		$statement->execute();
-		if($statement->error) {
+		if ($statement->error) {
 			trigger_error($statement->error, E_USER_ERROR);
-
 			return false;
 		}
 		$statement->close();
-
 		return true;
 	}
 
@@ -90,33 +92,31 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	 * @return bool
 	 */
 	public function loadSettingsFromDatabase() {
-		$this->maniaControl->client->query('GetModeScriptSettings');
-		$scriptSettings = $this->maniaControl->client->getResponse();
-
 		$mysqli = $this->maniaControl->database->mysqli;
-
-		$loadedSettings = array();
-
 		$query = "SELECT * FROM `" . self::TABLE_SCRIPT_SETTINGS . "`;";
 		$result = $mysqli->query($query);
-		if(!$result) {
+		if ($mysqli->error) {
 			trigger_error($mysqli->error);
+			return false;
 		}
-
+		if ($result->num_rows) {
-		while($row = $result->fetch_object()) {
-			$loadedSettings[$row->settingName] = $row->settingValue;
-			settype($loadedSettings[$row->settingName], gettype($scriptSettings[$row->settingName]));
-		}
-
 			$result->close();
-
-		if(count($loadedSettings) == 0) {
 			return true;
 		}
 		
+		$this->maniaControl->client->query('GetModeScriptSettings');
+		$scriptSettings = $this->maniaControl->client->getResponse();
+		$loadedSettings = array();
+		while ($row = $result->fetch_object()) {
+			if (!isset($scriptSettings[$row->settingName])) continue;
+			$loadedSettings[$row->settingName] = $row->settingValue;
+			settype($loadedSettings[$row->settingName], gettype($scriptSettings[$row->settingName]));
+		}
+		$result->close();
+		
 		$success = $this->maniaControl->client->query('SetModeScriptSettings', $loadedSettings);
-		if(!$success) {
+		if (!$success) {
-			$this->maniaControl->log('Error occurred: ' . $this->maniaControl->getClientErrorText());
+			trigger_error('Error occured: ' . $this->maniaControl->getClientErrorText());
 			return false;
 		}
 		return true;
@@ -127,7 +127,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	 * @see \ManiaControl\Configurators\ConfiguratorMenu::getTitle()
 	 */
 	public function getTitle() {
-		return self::TITLE;
+		return 'Script Settings';
 	}
 
 	/**
@@ -140,7 +140,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 		
 		$this->maniaControl->client->query('GetModeScriptInfo');
 		$scriptInfo = $this->maniaControl->client->getResponse();
-		if(isset($scriptInfo['faultCode'])) {
+		if (isset($scriptInfo['faultCode'])) {
 			// Not in script mode
 			$label = new Label();
 			$frame->add($label);
@@ -186,17 +186,17 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 		// Setting pages
 		$pageFrames = array();
 		$y = 0.;
-		foreach($scriptParams as $index => $scriptParam) {
+		foreach ($scriptParams as $index => $scriptParam) {
 			$settingName = $scriptParam['Name'];
 			
-			if(!isset($scriptSettings[$settingName])) {
+			if (!isset($scriptSettings[$settingName])) {
 				continue;
 			}
 			
-			if(!isset($pageFrame)) {
+			if (!isset($pageFrame)) {
 				$pageFrame = new Frame();
 				$frame->add($pageFrame);
-				if(!empty($pageFrames)) {
+				if (!empty($pageFrames)) {
 					$pageFrame->setVisible(false);
 				}
 				array_push($pageFrames, $pageFrame);
@@ -220,13 +220,14 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 			$settingValue = $scriptSettings[$settingName];
 			
 			$substyle = '';
-			if($settingValue === false) {
+			if ($settingValue === false) {
 				$substyle = Quad_Icons64x64_1::SUBSTYLE_LvlRed;
-			} else if($settingValue === true) {
+			}
+			else if ($settingValue === true) {
 				$substyle = Quad_Icons64x64_1::SUBSTYLE_LvlGreen;
 			}
 			
-			if($substyle != '') {
+			if ($substyle != '') {
 				$quad = new Quad_Icons64x64_1();
 				$settingFrame->add($quad);
 				$quad->setX($width / 2 * 0.545);
@@ -235,7 +236,8 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 				$quad->setSize(4, 4);
 				$quad->setHAlign(Control::CENTER);
 				$quad->setAction(self::ACTION_SETTING_BOOL . $settingName);
-			} else {
+			}
+			else {
 				$entry = new Entry();
 				$settingFrame->add($entry);
 				$entry->setStyle(Label_Text::STYLE_TextValueSmall);
@@ -259,7 +261,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 			$script->addTooltip($nameLabel, $descriptionLabel);
 			
 			$y -= $settingHeight;
-			if($index % $pageMaxCount == $pageMaxCount - 1) {
+			if ($index % $pageMaxCount == $pageMaxCount - 1) {
 				unset($pageFrame);
 			}
 		}
@@ -272,25 +274,24 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	 * @see \ManiaControl\Configurators\ConfiguratorMenu::saveConfigData()
 	 */
 	public function saveConfigData(array $configData, Player $player) {
-
 		$this->maniaControl->client->query('GetModeScriptSettings');
 		$scriptSettings = $this->maniaControl->client->getResponse();
 		
 		$prefixLength = strlen(self::ACTION_PREFIX_SETTING);
 		
 		$newSettings = array();
-		foreach($configData[3] as $setting) {
+		foreach ($configData[3] as $setting) {
-			if(substr($setting['Name'], 0, $prefixLength) != self::ACTION_PREFIX_SETTING) {
+			if (substr($setting['Name'], 0, $prefixLength) != self::ACTION_PREFIX_SETTING) {
 				continue;
 			}
 			
 			$settingName = substr($setting['Name'], $prefixLength);
-			if(!isset($scriptSettings[$settingName])) {
+			if (!isset($scriptSettings[$settingName])) {
 				var_dump('no setting ' . $settingName);
 				continue;
 			}
 			
-			if($setting['Value'] == $scriptSettings[$settingName]) {
+			if ($setting['Value'] == $scriptSettings[$settingName]) {
 				// Not changed
 				continue;
 			}
@@ -310,7 +311,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	public function handleManialinkPageAnswer(array $callback) {
 		$actionId = $callback[1][2];
 		$boolSetting = (strpos($actionId, self::ACTION_SETTING_BOOL) === 0);
-		if(!$boolSetting) {
+		if (!$boolSetting) {
 			return;
 		}
 		
@@ -320,9 +321,9 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 		$login = $callback[1][1];
 		$player = $this->maniaControl->playerManager->getPlayer($login);
 		
-		//Save all Changes
+		// Save all Changes
 		$this->saveConfigData($callback[1], $player);
-		//Toggle the Boolean Setting
+		// Toggle the Boolean Setting
 		$this->toggleBooleanSetting($setting, $player);
 	}
 
@@ -336,7 +337,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 		$this->maniaControl->client->query('GetModeScriptSettings');
 		$scriptSettings = $this->maniaControl->client->getResponse();
 		
-		if(!isset($scriptSettings[$setting])) {
+		if (!isset($scriptSettings[$setting])) {
 			var_dump('no setting ' . $setting);
 			return;
 		}
@@ -354,18 +355,15 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	 * @param Player $player
 	 */
 	private function applyNewScriptSettings(array $newSettings, Player $player) {
-		if(!$newSettings) {
+		if (!$newSettings) return true;
-			return true;
-		}
 		$success = $this->maniaControl->client->query('SetModeScriptSettings', $newSettings);
-		if(!$success) {
+		if (!$success) {
 			$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $player->login);
 			return false;
 		}
 		
 		// Save Settings into Database
 		$mysqli = $this->maniaControl->database->mysqli;
-
 		$query = "INSERT INTO `" . self::TABLE_SCRIPT_SETTINGS . "` (
 				`serverId`,
 				`settingName`,
@@ -375,38 +373,38 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 				) ON DUPLICATE KEY UPDATE
 				`settingValue` = VALUES(`settingValue`);";
 		$statement = $mysqli->prepare($query);
-		if($mysqli->error) {
+		if ($mysqli->error) {
 			trigger_error($mysqli->error);
 			return false;
 		}
 		
 		$serverId = $this->maniaControl->server->getServerId();
 		
-
 		// Notifications
 		$settingsCount = count($newSettings);
 		$settingIndex = 0;
 		$title = $this->maniaControl->authenticationManager->getAuthLevelName($player->authLevel);
 		$chatMessage = '$ff0' . $title . ' $<' . $player->nickname . '$> set ScriptSetting' . ($settingsCount > 1 ? 's' : '') . ' ';
-		foreach($newSettings as $setting => $value) {
+		foreach ($newSettings as $setting => $value) {
 			$chatMessage .= '$<' . '$fff' . preg_replace('/^S_/', '', $setting) . '$z$s$ff0 ';
 			$chatMessage .= 'to $fff' . $this->parseSettingValue($value) . '$>';
 			
-			if($settingIndex <= $settingsCount - 2) {
+			if ($settingIndex <= $settingsCount - 2) {
 				$chatMessage .= ', ';
 			}
 			
-			//Add To Database
+			// Add To Database
 			$statement->bind_param('iss', $serverId, $setting, $value);
 			$statement->execute();
-			if($statement->error) {
+			if ($statement->error) {
 				trigger_error($statement->error);
 				$statement->close();
 				return false;
 			}
 			
 			// Trigger own callback
-			$this->maniaControl->callbackManager->triggerCallback(self::CB_SCRIPTSETTING_CHANGED, array(self::CB_SCRIPTSETTING_CHANGED, $setting, $value));
+			$this->maniaControl->callbackManager->triggerCallback(self::CB_SCRIPTSETTING_CHANGED, 
+					array(self::CB_SCRIPTSETTING_CHANGED, $setting, $value));
 			
 			$settingIndex++;
 		}
@@ -425,9 +423,9 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 	 * @return string
 	 */
 	private function parseSettingValue($value) {
-		if(is_bool($value)) {
+		if (is_bool($value)) {
 			return ($value ? 'True' : 'False');
 		}
-		return (string)$value;
+		return (string) $value;
 	}
 }