X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FPConfig.php;h=da4c802937d301271f3d80497bb454a50b5a2983;hb=dc0978141c444f452071f076c2309fcf67546b57;hp=2080f716ceb5cfac2b329108cd004535210ecfa3;hpb=571e37f4d4bde114d4b300871c61ac828ff160fe;p=friendica.git

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 2080f716ce..da4c802937 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -8,11 +8,6 @@
  */
 namespace Friendica\Core;
 
-use Friendica\App;
-use Friendica\BaseObject;
-
-require_once 'include/dba.php';
-
 /**
  * @brief Management of user configuration storage
  * Note:
@@ -20,135 +15,79 @@ require_once 'include/dba.php';
  * The PConfig::get() functions return boolean false for keys that are unset,
  * and this could lead to subtle bugs.
  */
-class PConfig extends BaseObject
+class PConfig
 {
 	/**
-	 * @var Friendica\Core\Config\IPConfigAdapter
+	 * @var Config\PConfiguration
 	 */
-	private static $adapter = null;
+	private static $config;
 
-	public static function init($uid)
+	/**
+	 * Initialize the config with only the cache
+	 *
+	 * @param Config\PConfiguration $config The configuration cache
+	 */
+	public static function init(Config\PConfiguration $config)
 	{
-		$a = self::getApp();
-
-		// Database isn't ready or populated yet
-		if (!$a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
-			return;
-		}
-
-		if ($a->getConfigValue('system', 'config_adapter') == 'preload') {
-			self::$adapter = new Config\PreloadPConfigAdapter($uid);
-		} else {
-			self::$adapter = new Config\JITPConfigAdapter($uid);
-		}
+		self::$config = $config;
 	}
 
 	/**
 	 * @brief Loads all configuration values of a user's config family into a cached storage.
 	 *
-	 * All configuration values of the given user are stored in global cache
-	 * which is available under the global variable $a->config[$uid].
-	 *
-	 * @param string $uid    The user_id
-	 * @param string $family The category of the configuration value
+	 * @param string $uid The user_id
+	 * @param string $cat The category of the configuration value
 	 *
 	 * @return void
 	 */
-	public static function load($uid, $family)
+	public static function load($uid, $cat)
 	{
-		// Database isn't ready or populated yet
-		if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
-			return;
-		}
-
-		if (empty(self::$adapter)) {
-			self::init($uid);
-		}
-
-		self::$adapter->load($uid, $family);
+		self::$config->load($uid, $cat);
 	}
 
 	/**
 	 * @brief Get a particular user's config variable given the category name
-	 * ($family) and a key.
-	 *
-	 * Get a particular user's config value from the given category ($family)
-	 * and the $key from a cached storage in $a->config[$uid].
+	 * ($cat) and a key.
 	 *
 	 * @param string  $uid           The user_id
-	 * @param string  $family        The category of the configuration value
+	 * @param string  $cat           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($uid, $family, $key, $default_value = null, $refresh = false)
+	public static function get($uid, $cat, $key, $default_value = null, $refresh = false)
 	{
-		// Database isn't ready or populated yet
-		if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
-			return;
-		}
-
-		if (empty(self::$adapter)) {
-			self::init($uid);
-		}
-
-		return self::$adapter->get($uid, $family, $key, $default_value, $refresh);
+		return self::$config->get($uid, $cat, $key, $default_value, $refresh);
 	}
 
 	/**
 	 * @brief Sets a configuration value for a user
 	 *
-	 * 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!
-	 *
 	 * @param string $uid    The user_id
-	 * @param string $family The category of the configuration value
+	 * @param string $cat    The category of the configuration value
 	 * @param string $key    The configuration key to set
-	 * @param string $value  The value to store
+	 * @param mixed  $value  The value to store
 	 *
 	 * @return bool Operation success
 	 */
-	public static function set($uid, $family, $key, $value)
+	public static function set($uid, $cat, $key, $value)
 	{
-		// Database isn't ready or populated yet
-		if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
-			return false;
-		}
-
-		if (empty(self::$adapter)) {
-			self::init($uid);
-		}
-
-		return self::$adapter->set($uid, $family, $key, $value);
+		return self::$config->set($uid, $cat, $key, $value);
 	}
 
 	/**
 	 * @brief Deletes the given key from the users's configuration.
 	 *
-	 * Removes the configured value from the stored cache in $a->config[$uid]
-	 * and removes it from the database.
-	 *
-	 * @param string $uid    The user_id
-	 * @param string $family The category of the configuration value
-	 * @param string $key    The configuration key to delete
+	 * @param string $uid The user_id
+	 * @param string $cat The category of the configuration value
+	 * @param string $key The configuration key to delete
 	 *
-	 * @return mixed
+	 * @return bool
 	 */
-	public static function delete($uid, $family, $key)
+	public static function delete($uid, $cat, $key)
 	{
-		// Database isn't ready or populated yet
-		if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
-			return false;
-		}
-
-		if (empty(self::$adapter)) {
-			self::init($uid);
-		}
-
-		return self::$adapter->delete($uid, $family, $key);
+		return self::$config->delete($uid, $cat, $key);
 	}
 }