X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConfig.php;h=d3daece159e1863c94357692409e1fef76bb5a65;hb=b0fb398844adacecdb0ffb6eb3ac338a89fc13f1;hp=56b85dba46a5ec1a55ae4a05606e7d28b3b31cc3;hpb=d7dc51ecc1c1e86f3469b82c434fdd82107766a2;p=friendica.git diff --git a/src/Core/Config.php b/src/Core/Config.php index 56b85dba46..d3daece159 100644 --- a/src/Core/Config.php +++ b/src/Core/Config.php @@ -13,16 +13,17 @@ use dba; /** * @brief Arbitrary sytem configuration storage + * * Note: - * Please do not store booleans - convert to 0/1 integer values - * The Config::get() functions return boolean false for keys that are unset, - * and this could lead to subtle bugs. + * If we ever would decide to return exactly the variable type as entered, + * we will have fun with the additional features. :-) + * + * The config class always returns strings but in the default features + * we use a "false" to determine if the config value isn't set. * - * There are a few places in the code (such as the admin panel) where boolean - * configurations need to be fixed as of 10/08/2011. */ -class Config { - +class Config +{ private static $cache; private static $in_db; @@ -32,12 +33,12 @@ class Config { * All configuration values of the system are stored in global cache * which is available under the global variable $a->config * - * @param string $family - * The category of the configuration value + * @param string $family The category of the configuration value + * * @return void */ - public static function load($family = "config") { - + public static function load($family = "config") + { // We don't preload "system" anymore. // This reduces the number of database reads a lot. if ($family === 'system') { @@ -72,18 +73,15 @@ class Config { * local config cache, pull it into the cache so we don't have * to hit the DB again for this item. * - * @param string $family - * The category of the configuration value - * @param string $key - * The configuration key to query - * @param mixed $default_value optional - * The value to return if key is not set (default: null) - * @param boolean $refresh optional - * If true the config is loaded from the db and not from the cache (default: false) + * @param string $family The category of the configuration value + * @param string $key The configuration key to query + * @param mixed $default_value optional, The value to return if key is not set (default: null) + * @param boolean $refresh optional, If true the config is loaded from the db and not from the cache (default: false) + * * @return mixed Stored value or null if it does not exist */ - public static function get($family, $key, $default_value = null, $refresh = false) { - + public static function get($family, $key, $default_value = null, $refresh = false) + { $a = get_app(); if (!$refresh) { @@ -128,15 +126,14 @@ class Config { * * Note: Please do not store booleans - convert to 0/1 integer values! * - * @param string $family - * The category of the configuration value - * @param string $key - * The configuration key to set - * @param string $value - * The value to store + * @param string $family The category of the configuration value + * @param string $key The configuration key to set + * @param string $value The value to store + * * @return mixed Stored $value or false if the database update failed */ - public static function set($family, $key, $value) { + public static function set($family, $key, $value) + { $a = get_app(); // We store our setting values in a string variable. @@ -162,7 +159,7 @@ class Config { // manage array value $dbvalue = (is_array($value) ? serialize($value) : $dbvalue); - dba::update('config', array('v' => $dbvalue), array('cat' => $family, 'k' => $key), true); + $ret = dba::update('config', array('v' => $dbvalue), array('cat' => $family, 'k' => $key), true); if ($ret) { self::$in_db[$family][$key] = true; @@ -177,14 +174,13 @@ class Config { * Removes the configured value from the stored cache in $a->config * and removes it from the database. * - * @param string $family - * The category of the configuration value - * @param string $key - * The configuration key to delete + * @param string $family The category of the configuration value + * @param string $key The configuration key to delete + * * @return mixed */ - public static function delete($family, $key) { - + public static function delete($family, $key) + { if (isset(self::$cache[$family][$key])) { unset(self::$cache[$family][$key]); unset(self::$in_db[$family][$key]);