X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FPConfig.php;h=df024f0f3426dfa84abc665789066a1c6427316a;hb=d6a82c6c2d7befde9914fce3bd4e3e07b97ca036;hp=274122deda4513dd63acaeded4414989b0d7fd21;hpb=538760d9daf9c1d9442364da516edba3879aa70e;p=friendica.git

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 274122deda..df024f0f34 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -8,11 +8,6 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
-use Friendica\Core\Config;
-
-require_once 'include/dba.php';
-
 /**
  * @brief Management of user configuration storage
  * Note:
@@ -20,27 +15,43 @@ 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\IPConfigAdapter
+	 */
+	private static $adapter;
+
+	/**
+	 * @var Config\IPConfigCache
 	 */
-	private static $adapter = null;
+	private static $cache;
 
-	public static function init($uid)
+	/**
+	 * Initialize the config with only the cache
+	 *
+	 * @param Config\IPConfigCache $cache  The configuration cache
+	 */
+	public static function init(Config\IPConfigCache $cache)
 	{
-		if (Config::get('system', 'config_adapter') == 'preload') {
-			self::$adapter = new Config\PreloadPConfigAdapter($uid);
-		} else {
-			self::$adapter = new Config\JITPConfigAdapter($uid);
-		}
+		self::$cache  = $cache;
+	}
+
+	/**
+	 * Add the adapter for DB-backend
+	 *
+	 * @param Config\IPConfigAdapter $adapter
+	 */
+	public static function setAdapter(Config\IPConfigAdapter $adapter)
+	{
+		self::$adapter = $adapter;
 	}
 
 	/**
 	 * @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].
+	 * All configuration values of the given user are stored with the $uid in
+	 * the cache ( @see IPConfigCache )
 	 *
 	 * @param string $uid    The user_id
 	 * @param string $family The category of the configuration value
@@ -49,8 +60,8 @@ class PConfig extends BaseObject
 	 */
 	public static function load($uid, $family)
 	{
-		if (empty(self::$adapter)) {
-			self::init($uid);
+		if (!isset(self::$adapter)) {
+			return;
 		}
 
 		self::$adapter->load($uid, $family);
@@ -61,7 +72,8 @@ class PConfig extends BaseObject
 	 * ($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].
+	 * and the $key with the $uid from a cached storage either from the self::$adapter
+	 * (@see IConfigAdapter ) or from the static::$cache (@see IConfigCache ).
 	 *
 	 * @param string  $uid           The user_id
 	 * @param string  $family        The category of the configuration value
@@ -73,8 +85,8 @@ class PConfig extends BaseObject
 	 */
 	public static function get($uid, $family, $key, $default_value = null, $refresh = false)
 	{
-		if (empty(self::$adapter)) {
-			self::init($uid);
+		if (!isset(self::$adapter)) {
+			return self::$cache->getP($uid, $family, $key, $default_value);
 		}
 
 		return self::$adapter->get($uid, $family, $key, $default_value, $refresh);
@@ -86,19 +98,19 @@ class PConfig extends BaseObject
 	 * 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!
+	 * @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 $key    The configuration key to set
-	 * @param string $value  The value to store
+	 * @param mixed  $value  The value to store
 	 *
-	 * @return mixed Stored $value or false
+	 * @return bool Operation success
 	 */
 	public static function set($uid, $family, $key, $value)
 	{
-		if (empty(self::$adapter)) {
-			self::init($uid);
+		if (!isset(self::$adapter)) {
+			return self::$cache->setP($uid, $family, $key, $value);
 		}
 
 		return self::$adapter->set($uid, $family, $key, $value);
@@ -107,8 +119,9 @@ class PConfig extends BaseObject
 	/**
 	 * @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.
+	 * Removes the configured value from the stored cache in self::$config
+	 * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter )
+	 * with the given $uid.
 	 *
 	 * @param string $uid    The user_id
 	 * @param string $family The category of the configuration value
@@ -118,8 +131,8 @@ class PConfig extends BaseObject
 	 */
 	public static function delete($uid, $family, $key)
 	{
-		if (empty(self::$adapter)) {
-			self::init($uid);
+		if (!isset(self::$adapter)) {
+			return self::$cache->deleteP($uid, $family, $key);
 		}
 
 		return self::$adapter->delete($uid, $family, $key);