X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FPConfig.php;h=df024f0f3426dfa84abc665789066a1c6427316a;hb=4facd1dfdba93ede48ca40b5e146424e6701118b;hp=7104ce83dcfb77b6570cd3c6cc0bb67a648f19bb;hpb=d43a8184f49715d6716373d360551dcc7fa58d41;p=friendica.git

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 7104ce83dc..df024f0f34 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -8,9 +8,6 @@
  */
 namespace Friendica\Core;
 
-use Friendica\App;
-use Friendica\BaseObject;
-
 /**
  * @brief Management of user configuration storage
  * Note:
@@ -18,54 +15,55 @@ use Friendica\BaseObject;
  * 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
 {
-	private static $config;
+	/**
+	 * @var Config\IPConfigAdapter
+	 */
+	private static $adapter;
 
 	/**
-	 * @var \Friendica\Core\Config\IPConfigAdapter
+	 * @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)
 	{
-		$a = self::getApp();
-
-		// Database isn't ready or populated yet
-		if (!$a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
-			return;
-		}
+		self::$cache  = $cache;
+	}
 
-		if (Config::getConfigValue('system', 'config_adapter') == 'preload') {
-			self::$adapter = new Config\PreloadPConfigAdapter($uid);
-		} else {
-			self::$adapter = new Config\JITPConfigAdapter();
-		}
+	/**
+	 * 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 self::$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
 	 *
 	 * @return void
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function load($uid, $family)
 	{
-		// Database isn't ready or populated yet
-		if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
+		if (!isset(self::$adapter)) {
 			return;
 		}
 
-		if (empty(self::$adapter)) {
-			self::init($uid);
-		}
-
 		self::$adapter->load($uid, $family);
 	}
 
@@ -74,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 self::$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
@@ -83,17 +82,11 @@ class PConfig extends BaseObject
 	 * @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
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function get($uid, $family, $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);
+		if (!isset(self::$adapter)) {
+			return self::$cache->getP($uid, $family, $key, $default_value);
 		}
 
 		return self::$adapter->get($uid, $family, $key, $default_value, $refresh);
@@ -113,17 +106,11 @@ class PConfig extends BaseObject
 	 * @param mixed  $value  The value to store
 	 *
 	 * @return bool Operation success
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function set($uid, $family, $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);
+		if (!isset(self::$adapter)) {
+			return self::$cache->setP($uid, $family, $key, $value);
 		}
 
 		return self::$adapter->set($uid, $family, $key, $value);
@@ -132,91 +119,22 @@ class PConfig extends BaseObject
 	/**
 	 * @brief Deletes the given key from the users's configuration.
 	 *
-	 * Removes the configured value from the stored cache in self::$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
 	 * @param string $key    The configuration key to delete
 	 *
 	 * @return mixed
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function delete($uid, $family, $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);
+		if (!isset(self::$adapter)) {
+			return self::$cache->deleteP($uid, $family, $key);
 		}
 
 		return self::$adapter->delete($uid, $family, $key);
 	}
-
-
-	/**
-	 * Retrieves a value from the user config cache
-	 *
-	 * @param int    $uid     User Id
-	 * @param string $cat     Config category
-	 * @param string $k       Config key
-	 * @param mixed  $default Default value if key isn't set
-	 *
-	 * @return string The value of the config entry
-	 */
-	public static function getPConfigValue($uid, $cat, $k = null, $default = null)
-	{
-		$return = $default;
-
-		if (isset(self::$config[$uid][$cat][$k])) {
-			$return = self::$config[$uid][$cat][$k];
-		} elseif ($k == null && isset(self::$config[$uid][$cat])) {
-			$return = self::$config[$uid][$cat];
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Sets a value in the user config cache
-	 *
-	 * Accepts raw output from the pconfig table
-	 *
-	 * @param int    $uid User Id
-	 * @param string $cat Config category
-	 * @param string $k   Config key
-	 * @param mixed  $v   Value to set
-	 */
-	public static function setPConfigValue($uid, $cat, $k, $v)
-	{
-		// Only arrays are serialized in database, so we have to unserialize sparingly
-		$value = is_string($v) && preg_match("|^a:[0-9]+:{.*}$|s", $v) ? unserialize($v) : $v;
-
-		if (!isset(self::$config[$uid]) || !is_array(self::$config[$uid])) {
-			self::$config[$uid] = [];
-		}
-
-		if (!isset(self::$config[$uid][$cat]) || !is_array(self::$config[$uid][$cat])) {
-			self::$config[$uid][$cat] = [];
-		}
-
-		self::$config[$uid][$cat][$k] = $value;
-	}
-
-	/**
-	 * Deletes a value from the user config cache
-	 *
-	 * @param int    $uid User Id
-	 * @param string $cat Config category
-	 * @param string $k   Config key
-	 */
-	public static function deletePConfigValue($uid, $cat, $k)
-	{
-		if (isset(self::$config[$uid][$cat][$k])) {
-			unset(self::$config[$uid][$cat][$k]);
-		}
-	}
 }