From e4fa085940502eba4f7909c2c71bf5f57b92deb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Mon, 27 Jan 2014 09:07:43 +0100 Subject: [PATCH] fixed setting manager namespace --- application/core/Settings/SettingManager.php | 159 ++++++++++--------- 1 file changed, 80 insertions(+), 79 deletions(-) diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php index c45f3c05..fae1b7bf 100644 --- a/application/core/Settings/SettingManager.php +++ b/application/core/Settings/SettingManager.php @@ -1,6 +1,8 @@ maniaControl->database->mysqli; + $mysqli = $this->maniaControl->database->mysqli; $defaultType = "'" . self::TYPE_STRING . "'"; - $typeSet = $defaultType; + $typeSet = $defaultType; $typeSet .= ",'" . self::TYPE_INT . "'"; $typeSet .= ",'" . self::TYPE_REAL . "'"; $typeSet .= ",'" . self::TYPE_BOOL . "'"; $typeSet .= ",'" . self::TYPE_ARRAY . "'"; - $settingTableQuery = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SETTINGS . "` ( + $settingTableQuery = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SETTINGS . "` ( `index` int(11) NOT NULL AUTO_INCREMENT, `class` varchar(50) COLLATE utf8_unicode_ci NOT NULL, `setting` varchar(50) COLLATE utf8_unicode_ci NOT NULL, @@ -59,12 +61,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 +81,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 +98,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)); @@ -119,23 +121,23 @@ class SettingManager { * Cast a setting to the given type * * @param string $type - * @param mixed $value + * @param mixed $value * @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)); @@ -145,18 +147,18 @@ class SettingManager { /** * Format a setting for saving it to the database * - * @param mixed $value + * @param mixed $value * @param string $type * @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; @@ -167,18 +169,18 @@ class SettingManager { * * @param object $object * @param string $settingName - * @param mixed $default + * @param mixed $default * @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); - $type = $this->getType($default); - $default = $this->formatSetting($default, $type); - $mysqli = $this->maniaControl->database->mysqli; - $settingQuery = "INSERT INTO `" . self::TABLE_SETTINGS . "` ( + $className = $this->getClassName($object); + $type = $this->getType($default); + $default = $this->formatSetting($default, $type); + $mysqli = $this->maniaControl->database->mysqli; + $settingQuery = "INSERT INTO `" . self::TABLE_SETTINGS . "` ( `class`, `setting`, `type`, @@ -193,13 +195,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; @@ -211,29 +213,28 @@ class SettingManager { /** * Get a Setting by its index * - * @param $settingIndex + * @param $settingIndex * @param bool $default * @internal param null $default * @internal param $className * @internal param \ManiaControl\gIndex $settin - * @return mixed|null + * @return mixed null */ public function getSettingByIndex($settingIndex, $default = false) { - $mysqli = $this->maniaControl->database->mysqli; + $mysqli = $this->maniaControl->database->mysqli; $settingQuery = "SELECT * FROM `" . self::TABLE_SETTINGS . "` WHERE `index` = {$settingIndex};"; - $result = $mysqli->query($settingQuery); - if(!$result) { + $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 * @@ -242,23 +243,23 @@ class SettingManager { * @param $value */ public function getSettingByClassName($className, $settingName, $default = null) { - $mysqli = $this->maniaControl->database->mysqli; - $settingQuery = "SELECT `type`, `value` FROM `" . self::TABLE_SETTINGS . "` + $mysqli = $this->maniaControl->database->mysqli; + $settingQuery = "SELECT `type`, `value` FROM `" . self::TABLE_SETTINGS . "` WHERE `class` = ? AND `setting` = ?;"; $settingStatement = $mysqli->prepare($settingQuery); - if($mysqli->error) { + if ($mysqli->error) { trigger_error($mysqli->error); return null; } $settingStatement->bind_param('ss', $className, $settingName); $settingStatement->execute(); - if($settingStatement->error) { + if ($settingStatement->error) { trigger_error($settingStatement->error); return null; } $settingStatement->store_result(); - if($settingStatement->num_rows <= 0) { + if ($settingStatement->num_rows <= 0) { $this->updateSetting($className, $settingName, $default); return $default; } @@ -275,7 +276,7 @@ class SettingManager { * * @param object $object * @param string $settingName - * @param mixed $default + * @param mixed $default * @return mixed */ public function getSetting($object, $settingName, $default = null) { @@ -292,20 +293,20 @@ class SettingManager { * @return bool */ public function updateSetting($className, $settingName, $value) { - $mysqli = $this->maniaControl->database->mysqli; - $settingQuery = "UPDATE `" . self::TABLE_SETTINGS . "` + $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; @@ -319,7 +320,7 @@ class SettingManager { * * @param object $object * @param string $settingName - * @param mixed $value + * @param mixed $value * @return bool */ public function setSetting($object, $settingName, $value) { @@ -335,20 +336,20 @@ class SettingManager { * @return bool */ public function resetSetting($object, $settingName) { - $className = $this->getClassName($object); - $mysqli = $this->maniaControl->database->mysqli; - $settingQuery = "UPDATE `" . self::TABLE_SETTINGS . "` + $className = $this->getClassName($object); + $mysqli = $this->maniaControl->database->mysqli; + $settingQuery = "UPDATE `" . self::TABLE_SETTINGS . "` SET `value` = `default` 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; @@ -365,19 +366,19 @@ class SettingManager { * @return bool */ public function deleteSetting($object, $settingName) { - $className = $this->getClassName($object); - $mysqli = $this->maniaControl->database->mysqli; - $settingQuery = "DELETE FROM `" . self::TABLE_SETTINGS . "` + $className = $this->getClassName($object); + $mysqli = $this->maniaControl->database->mysqli; + $settingQuery = "DELETE FROM `" . self::TABLE_SETTINGS . "` 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; @@ -394,17 +395,17 @@ class SettingManager { */ public function getSettingsByClass($className) { $mysqli = $this->maniaControl->database->mysqli; - $query = "SELECT * FROM `" . self::TABLE_SETTINGS . "` WHERE `class`= '" . $mysqli->escape_string($className) . "' + $query = "SELECT * FROM `" . self::TABLE_SETTINGS . "` WHERE `class`= '" . $mysqli->escape_string($className) . "' ORDER BY `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); + // array_push($settings, $setting); } $result->free(); return $settings; @@ -417,17 +418,17 @@ class SettingManager { */ public function getSettings() { $mysqli = $this->maniaControl->database->mysqli; - $query = "SELECT * FROM `" . self::TABLE_SETTINGS . "` + $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); + // array_push($settings, $setting); } $result->free(); return $settings;