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

boolean thing working

Browse Source
This commit is contained in:
kremsy 2014-01-05 22:51:21 +01:00
parent 2154276a71
commit 5d4cf86f61
3 changed files with 190 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
application/core/Configurators/ManiaControlSettings.php
View File

@ -14,10 +14,12 @@ use FML\Controls\Label;
use FML\Controls\Labels\Label_Text;
use FML\Controls\Quads\Quad_Icons64x64_1;
use FML\Script\Script;
use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\ManiaControl;
use ManiaControl\Players\Player;
class ManiaControlSettings implements ConfiguratorMenu {
class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
/**
* Constants
*/
@ -38,6 +40,8 @@ class ManiaControlSettings implements ConfiguratorMenu {
public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl;
// Register for callbacks
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer');
}
/**
@ -225,7 +229,7 @@ class ManiaControlSettings implements ConfiguratorMenu {
foreach($configData[3] as $setting) {
$settingName = substr($setting['Name'], $prefixLength + 1);
$oldSetting = $maniaControlSettings[$settingName];
if($setting['Value'] == $oldSetting->value) {
if($setting['Value'] == $oldSetting->value || $oldSetting->type = 'bool') {
continue;
}
@ -236,4 +240,54 @@ class ManiaControlSettings implements ConfiguratorMenu {
$menuId = $this->maniaControl->configurator->getMenuId($this->getTitle());
$this->maniaControl->configurator->reopenMenu($menuId);
}
/**
* Handle ManialinkPageAnswer Callback
*
* @param array $callback
*/
public function handleManialinkPageAnswer(array $callback) {
$actionId = $callback[1][2];
$boolSetting = (strpos($actionId, self::ACTION_SETTING_BOOL) === 0);
if(!$boolSetting) {
return;
}
$actionArray = explode(".", $actionId);
$setting = $actionArray[2];
$login = $callback[1][1];
$player = $this->maniaControl->playerManager->getPlayer($login);
// Toggle the Boolean Setting
$this->toggleBooleanSetting($setting, $player);
// Save all Changes
$this->saveConfigData($callback[1], $player);
}
/**
* Toggles a Boolean Value
*
* @param $setting
* @param Player $player
*/
public function toggleBooleanSetting($setting, Player $player) {
$oldSetting = $this->maniaControl->settingManager->getSettingByIndex($setting);
if(!isset($oldSetting)) {
var_dump('no setting ' . $setting);
return;
}
//Toggle value
if($oldSetting->value == "1") {
$this->maniaControl->settingManager->updateSetting($oldSetting->class, $oldSetting->setting, "0");
} else {
$this->maniaControl->settingManager->updateSetting($oldSetting->class, $oldSetting->setting, "1");
}
}
}

9
application/core/Configurators/ScriptSettings.php
View File

@ -111,14 +111,16 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
$loadedSettings = array();
while($row = $result->fetch_object()) {
if(!isset($scriptSettings[$row->settingName]))
if(!isset($scriptSettings[$row->settingName])) {
continue;
}
$loadedSettings[$row->settingName] = $row->settingValue;
settype($loadedSettings[$row->settingName], gettype($scriptSettings[$row->settingName]));
}
$result->close();
if(!$loadedSettings)
if(!$loadedSettings) {
return true;
}
$success = $this->maniaControl->client->query('SetModeScriptSettings', $loadedSettings);
if(!$success) {
@ -368,8 +370,9 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
* @param bool
*/
private function applyNewScriptSettings(array $newSettings, Player $player) {
if(!$newSettings)
if(!$newSettings) {
return true;
}
$success = $this->maniaControl->client->query('SetModeScriptSettings', $newSettings);
if(!$success) {
$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $player->login);

158
application/core/Settings/SettingManager.php
View File

@ -59,12 +59,12 @@ class SettingManager {
UNIQUE KEY `settingId` (`class`,`setting`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Settings and Configurations' AUTO_INCREMENT=1;";
$settingTableStatement = $mysqli->prepare($settingTableQuery);
if ($mysqli->error) {
if($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR);
return false;
}
$settingTableStatement->execute();
if ($settingTableStatement->error) {
if($settingTableStatement->error) {
trigger_error($settingTableStatement->error, E_USER_ERROR);
return false;
}
@ -79,14 +79,14 @@ class SettingManager {
* @return string
*/
private function getClassName($object) {
if (is_object($object)) {
if(is_object($object)) {
return get_class($object);
}
if (is_string($object)) {
if(is_string($object)) {
return $object;
}
trigger_error('Invalid class param. ' . $object);
return (string) $object;
return (string)$object;
}
/**
@ -96,19 +96,19 @@ class SettingManager {
* @return string
*/
private function getType($param) {
if (is_int($param)) {
if(is_int($param)) {
return self::TYPE_INT;
}
if (is_real($param)) {
if(is_real($param)) {
return self::TYPE_REAL;
}
if (is_bool($param)) {
if(is_bool($param)) {
return self::TYPE_BOOL;
}
if (is_string($param)) {
if(is_string($param)) {
return self::TYPE_STRING;
}
if (is_array($param)) {
if(is_array($param)) {
return self::TYPE_ARRAY;
}
trigger_error('Unsupported setting type. ' . print_r($param, true));
@ -123,19 +123,19 @@ class SettingManager {
* @return mixed
*/
private function castSetting($type, $value) {
if ($type === self::TYPE_INT) {
return (int) $value;
if($type === self::TYPE_INT) {
return (int)$value;
}
if ($type === self::TYPE_REAL) {
return (float) $value;
if($type === self::TYPE_REAL) {
return (float)$value;
}
if ($type === self::TYPE_BOOL) {
return (bool) $value;
if($type === self::TYPE_BOOL) {
return (bool)$value;
}
if ($type === self::TYPE_STRING) {
return (string) $value;
if($type === self::TYPE_STRING) {
return (string)$value;
}
if ($type === self::TYPE_ARRAY) {
if($type === self::TYPE_ARRAY) {
return explode($this->arrayDelimiter, $value);
}
trigger_error('Unsupported setting type. ' . print_r($type, true));
@ -150,13 +150,13 @@ class SettingManager {
* @return mixed
*/
private function formatSetting($value, $type = null) {
if ($type === null) {
if($type === null) {
$type = $this->getType($value);
}
if ($type === self::TYPE_ARRAY) {
if($type === self::TYPE_ARRAY) {
return implode($this->arrayDelimiter, $value);
}
if ($type === self::TYPE_BOOL) {
if($type === self::TYPE_BOOL) {
return ($value ? 1 : 0);
}
return $value;
@ -171,7 +171,7 @@ class SettingManager {
* @return bool
*/
public function initSetting($object, $settingName, $default) {
if ($default === null || is_object($default)) {
if($default === null || is_object($default)) {
return false;
}
$className = $this->getClassName($object);
@ -193,13 +193,13 @@ class SettingManager {
`value` = IF(`default` = VALUES(`default`), `value`, VALUES(`default`)),
`default` = VALUES(`default`);";
$settingStatement = $mysqli->prepare($settingQuery);
if ($mysqli->error) {
if($mysqli->error) {
trigger_error($mysqli->error);
return false;
}
$settingStatement->bind_param('ssss', $className, $settingName, $type, $default);
$success = $settingStatement->execute();
if ($settingStatement->error) {
if($settingStatement->error) {
trigger_error($settingStatement->error);
$settingStatement->close();
return false;
@ -208,6 +208,68 @@ class SettingManager {
return $success;
}
/**
* Get a Setting by its index
*
* @param $settingIndex
* @param bool $default
* @internal param null $default
* @internal param $className
* @internal param \ManiaControl\gIndex $settin
* @return mixed|null
*/
public function getSettingByIndex($settingIndex, $default = false) {
$mysqli = $this->maniaControl->database->mysqli;
$settingQuery = "SELECT * FROM `" . self::TABLE_SETTINGS . "`
WHERE `index` = {$settingIndex};";
$result = $mysqli->query($settingQuery);
if(!$result) {
trigger_error($mysqli->error);
return false;
}
$row = $result->fetch_object();
$result->close();
return $row;
}
/**
* Gets a Setting Via it's class name
*
* @param $className
* @param $settingName
* @param $value
*/
public function getSettingByClassName($className, $settingName, $default = null) {
$mysqli = $this->maniaControl->database->mysqli;
$settingQuery = "SELECT `type`, `value` FROM `" . self::TABLE_SETTINGS . "`
WHERE `class` = ?
AND `setting` = ?;";
$settingStatement = $mysqli->prepare($settingQuery);
if($mysqli->error) {
trigger_error($mysqli->error);
return null;
}
$settingStatement->bind_param('ss', $className, $settingName);
$settingStatement->execute();
if($settingStatement->error) {
trigger_error($settingStatement->error);
return null;
}
$settingStatement->store_result();
if($settingStatement->num_rows <= 0) {
$this->updateSetting($className, $settingName, $default);
return $default;
}
$settingStatement->bind_result($type, $value);
$settingStatement->fetch();
$settingStatement->free_result();
$settingStatement->close();
$setting = $this->castSetting($type, $value);
return $setting;
}
/**
* Get setting by name for given object
*
@ -218,56 +280,32 @@ class SettingManager {
*/
public function getSetting($object, $settingName, $default = null) {
$className = $this->getClassName($object);
$mysqli = $this->maniaControl->database->mysqli;
$settingQuery = "SELECT `type`, `value` FROM `" . self::TABLE_SETTINGS . "`
WHERE `class` = ?
AND `setting` = ?;";
$settingStatement = $mysqli->prepare($settingQuery);
if ($mysqli->error) {
trigger_error($mysqli->error);
return null;
}
$settingStatement->bind_param('ss', $className, $settingName);
$settingStatement->execute();
if ($settingStatement->error) {
trigger_error($settingStatement->error);
return null;
}
$settingStatement->store_result();
if ($settingStatement->num_rows <= 0) {
$this->initSetting($object, $settingName, $default);
return $default;
}
$settingStatement->bind_result($type, $value);
$settingStatement->fetch();
$settingStatement->free_result();
$settingStatement->close();
$setting = $this->castSetting($type, $value);
return $setting;
return $this->getSettingByClassName($className, $settingName, $default);
}
/**
* Updates a Setting
*
* @param $className
* @param $settingName
* @param $value
* @return bool
*/
public function updateSetting($className, $settingName, $value){
public function updateSetting($className, $settingName, $value) {
$mysqli = $this->maniaControl->database->mysqli;
$settingQuery = "UPDATE `" . self::TABLE_SETTINGS . "`
SET `value` = ?
WHERE `class` = ?
AND `setting` = ?;";
$settingStatement = $mysqli->prepare($settingQuery);
if ($mysqli->error) {
if($mysqli->error) {
trigger_error($mysqli->error);
return false;
}
$value = $this->formatSetting($value);
$settingStatement->bind_param('sss', $value, $className, $settingName);
$success = $settingStatement->execute();
if ($settingStatement->error) {
if($settingStatement->error) {
trigger_error($settingStatement->error);
$settingStatement->close();
return false;
@ -304,13 +342,13 @@ class SettingManager {
WHERE `class` = ?
AND `setting` = ?;";
$settingStatement = $mysqli->prepare($settingQuery);
if ($mysqli->error) {
if($mysqli->error) {
trigger_error($mysqli->error);
return false;
}
$settingStatement->bind_param('ss', $className, $settingName);
$success = $settingStatement->execute();
if ($settingStatement->error) {
if($settingStatement->error) {
trigger_error($settingStatement->error);
$settingStatement->close();
return false;
@ -333,13 +371,13 @@ class SettingManager {
WHERE `class` = ?
AND `setting` = ?;";
$settingStatement = $mysqli->prepare($settingQuery);
if ($mysqli->error) {
if($mysqli->error) {
trigger_error($mysqli->error);
return false;
}
$settingStatement->bind_param('ss', $className, $settingName);
$success = $settingStatement->execute();
if ($settingStatement->error) {
if($settingStatement->error) {
trigger_error($settingStatement->error);
$settingStatement->close();
return false;
@ -358,12 +396,12 @@ class SettingManager {
$query = "SELECT * FROM `" . self::TABLE_SETTINGS . "`
ORDER BY `class` ASC, `setting` ASC;";
$result = $mysqli->query($query);
if ($mysqli->error) {
if($mysqli->error) {
trigger_error($mysqli->error);
return null;
}
$settings = array();
while ($setting = $result->fetch_object()) {
while($setting = $result->fetch_object()) {
$settings[$setting->index] = $setting;
//array_push($settings, $setting);
}