X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConfig.php;h=559ee83ece57e08b8bfedb53d94510b082606459;hb=4facd1dfdba93ede48ca40b5e146424e6701118b;hp=b0c05fff8d4f1eb17714ff899ba19b85dd940dbd;hpb=5fc492776436dd06d46b1a8936a3f19cc96abbcf;p=friendica.git diff --git a/src/Core/Config.php b/src/Core/Config.php index b0c05fff8d..559ee83ece 100644 --- a/src/Core/Config.php +++ b/src/Core/Config.php @@ -8,32 +8,53 @@ */ namespace Friendica\Core; -use Friendica\Database\DBM; -use dba; - -require_once 'include/dba.php'; +use Friendica\Core\Config\ConfigCache; +use Friendica\Core\Config\IConfigAdapter; +use Friendica\Core\Config\IConfigCache; /** - * @brief Arbitrary sytem configuration storage + * @brief Arbitrary system configuration storage * * Note: * 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. - * */ class Config { + /** + * @var Config\IConfigAdapter|null + */ + private static $adapter; + + /** + * @var Config\IConfigCache + */ private static $cache; - private static $in_db; + + /** + * Initialize the config with only the cache + * + * @param Config\IConfigCache $cache The configuration cache + */ + public static function init(Config\IConfigCache $cache) + { + self::$cache = $cache; + } + + /** + * Add the adapter for DB-backend + * + * @param Config\IConfigAdapter $adapter + */ + public static function setAdapter(Config\IConfigAdapter $adapter) + { + self::$adapter = $adapter; + } /** * @brief Loads all configuration values of family into a cached storage. * - * All configuration values of the system are stored in global cache - * which is available under the global variable $a->config + * All configuration values of the system are stored in the cache ( @see IConfigCache ) * * @param string $family The category of the configuration value * @@ -41,26 +62,11 @@ class 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') { + if (!isset(self::$adapter) || !self::$adapter->isConnected()) { return; } - $a = get_app(); - - $r = dba::select('config', array('v', 'k'), array('cat' => $family)); - while ($rr = dba::fetch($r)) { - $k = $rr['k']; - if ($family === 'config') { - $a->config[$k] = $rr['v']; - } else { - $a->config[$family][$k] = $rr['v']; - self::$cache[$family][$k] = $rr['v']; - self::$in_db[$family][$k] = true; - } - } - dba::close($r); + self::$adapter->load($family); } /** @@ -68,12 +74,8 @@ class Config * ($family) and a key. * * Get a particular config value from the given category ($family) - * and the $key from a cached storage in $a->config[$uid]. - * $instore is only used by the set_config function - * to determine if the key already exists in the DB - * If a key is found in the DB but doesn't exist in - * local config cache, pull it into the cache so we don't have - * to hit the DB again for this item. + * and the $key from a cached storage either from the self::$adapter + * (@see IConfigAdapter ) or from the static::$cache (@see IConfigCache ). * * @param string $family The category of the configuration value * @param string $key The configuration key to query @@ -84,47 +86,17 @@ class Config */ public static function get($family, $key, $default_value = null, $refresh = false) { - $a = get_app(); - - if (!$refresh) { - // Do we have the cached value? Then return it - if (isset(self::$cache[$family][$key])) { - if (self::$cache[$family][$key] === '!!') { - return $default_value; - } else { - return self::$cache[$family][$key]; - } - } - } - - $config = dba::selectFirst('config', ['v'], ['cat' => $family, 'k' => $key]); - if (DBM::is_result($config)) { - // manage array value - $val = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']); - - // Assign the value from the database to the cache - self::$cache[$family][$key] = $val; - self::$in_db[$family][$key] = true; - return $val; - } elseif (isset($a->config[$family][$key])) { - // Assign the value (mostly) from the .htconfig.php to the cache - self::$cache[$family][$key] = $a->config[$family][$key]; - self::$in_db[$family][$key] = false; - - return $a->config[$family][$key]; + if (!isset(self::$adapter) || !self::$adapter->isConnected()) { + return self::$cache->get($family, $key, $default_value); } - self::$cache[$family][$key] = '!!'; - self::$in_db[$family][$key] = false; - - return $default_value; + return self::$adapter->get($family, $key, $default_value, $refresh); } /** * @brief Sets a configuration value for system config * * Stores a config value ($value) in the category ($family) under the key ($key) - * for the user_id $uid. * * Note: Please do not store booleans - convert to 0/1 integer values! * @@ -132,49 +104,22 @@ class Config * @param string $key The configuration key to set * @param mixed $value The value to store * - * @return mixed Stored $value or false if the database update failed + * @return bool Operation success */ public static function set($family, $key, $value) { - $a = get_app(); - - // We store our setting values in a string variable. - // So we have to do the conversion here so that the compare below works. - // The exception are array values. - $dbvalue = (!is_array($value) ? (string)$value : $value); - - $stored = self::get($family, $key, null, true); - - if (($stored === $dbvalue) && self::$in_db[$family][$key]) { - return true; + if (!isset(self::$adapter) || !self::$adapter->isConnected()) { + return self::$cache->set($family, $key, $value); } - if ($family === 'config') { - $a->config[$key] = $dbvalue; - } elseif ($family != 'system') { - $a->config[$family][$key] = $dbvalue; - } - - // Assign the just added value to the cache - self::$cache[$family][$key] = $dbvalue; - - // manage array value - $dbvalue = (is_array($value) ? serialize($value) : $dbvalue); - - $ret = dba::update('config', array('v' => $dbvalue), array('cat' => $family, 'k' => $key), true); - - if ($ret) { - self::$in_db[$family][$key] = true; - return $value; - } - return $ret; + return self::$adapter->set($family, $key, $value); } /** * @brief Deletes the given key from the system configuration. * - * Removes the configured value from the stored cache in $a->config - * and removes it from the database. + * Removes the configured value from the stored cache in self::$config + * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter ). * * @param string $family The category of the configuration value * @param string $key The configuration key to delete @@ -183,13 +128,10 @@ class Config */ public static function delete($family, $key) { - if (isset(self::$cache[$family][$key])) { - unset(self::$cache[$family][$key]); - unset(self::$in_db[$family][$key]); + if (!isset(self::$adapter) || !self::$adapter->isConnected()) { + self::$cache->delete($family, $key); } - $ret = dba::delete('config', array('cat' => $family, 'k' => $key)); - - return $ret; + return self::$adapter->delete($family, $key); } }