X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FPConfig.php;h=df024f0f3426dfa84abc665789066a1c6427316a;hb=f786e8984f1bd61a617f00a3e312181846ab40dd;hp=4bc7193a0ab06c1f679778efd64ad741bab26f01;hpb=86922c4821d3e9ab2bb5738e82518e981637c1b1;p=friendica.git

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 4bc7193a0a..df024f0f34 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -1,19 +1,12 @@
 <?php
 /**
- * @file src/Core/PConfig.php
- */
-namespace Friendica\Core;
-
-use Friendica\Database\DBM;
-use dba;
-
-require_once 'include/dba.php';
-
-/**
+ * User Configuration Class
+ *
  * @file include/Core/PConfig.php
- * @brief contains the class with methods for the management
- * of the user configuration
+ *
+ * @brief Contains the class with methods for user configuration
  */
+namespace Friendica\Core;
 
 /**
  * @brief Management of user configuration storage
@@ -24,13 +17,41 @@ require_once 'include/dba.php';
  */
 class PConfig
 {
-	private static $in_db;
+	/**
+	 * @var Config\IPConfigAdapter
+	 */
+	private static $adapter;
+
+	/**
+	 * @var Config\IPConfigCache
+	 */
+	private static $cache;
+
+	/**
+	 * Initialize the config with only the cache
+	 *
+	 * @param Config\IPConfigCache $cache  The configuration cache
+	 */
+	public static function init(Config\IPConfigCache $cache)
+	{
+		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
@@ -39,20 +60,11 @@ class PConfig
 	 */
 	public static function load($uid, $family)
 	{
-		$a = get_app();
-
-		$r = dba::select('pconfig', array('v', 'k'), array('cat' => $family, 'uid' => $uid));
-		if (DBM::is_result($r)) {
-			while ($rr = dba::fetch($r)) {
-				$k = $rr['k'];
-				$a->config[$uid][$family][$k] = $rr['v'];
-				self::$in_db[$uid][$family][$k] = true;
-			}
-		} else if ($family != 'config') {
-			// Negative caching
-			$a->config[$uid][$family] = "!<unset>!";
+		if (!isset(self::$adapter)) {
+			return;
 		}
-		dba::close($r);
+
+		self::$adapter->load($uid, $family);
 	}
 
 	/**
@@ -60,7 +72,8 @@ class PConfig
 	 * ($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
@@ -72,37 +85,11 @@ class PConfig
 	 */
 	public static function get($uid, $family, $key, $default_value = null, $refresh = false)
 	{
-		$a = get_app();
-
-		if (!$refresh) {
-			// Looking if the whole family isn't set
-			if (isset($a->config[$uid][$family])) {
-				if ($a->config[$uid][$family] === '!<unset>!') {
-					return $default_value;
-				}
-			}
-
-			if (isset($a->config[$uid][$family][$key])) {
-				if ($a->config[$uid][$family][$key] === '!<unset>!') {
-					return $default_value;
-				}
-				return $a->config[$uid][$family][$key];
-			}
+		if (!isset(self::$adapter)) {
+			return self::$cache->getP($uid, $family, $key, $default_value);
 		}
 
-		$ret = dba::select('pconfig', array('v'), array('uid' => $uid, 'cat' => $family, 'k' => $key), array('limit' => 1));
-		if (DBM::is_result($ret)) {
-			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret['v']) ? unserialize($ret['v']) : $ret['v']);
-			$a->config[$uid][$family][$key] = $val;
-			self::$in_db[$uid][$family][$key] = true;
-
-			return $val;
-		} else {
-			$a->config[$uid][$family][$key] = '!<unset>!';
-			self::$in_db[$uid][$family][$key] = false;
-
-			return $default_value;
-		}
+		return self::$adapter->get($uid, $family, $key, $default_value, $refresh);
 	}
 
 	/**
@@ -111,49 +98,30 @@ class PConfig
 	 * 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)
 	{
-		$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($uid, $family, $key, null, true);
-
-		if (($stored === $dbvalue) && self::$in_db[$uid][$family][$key]) {
-			return true;
+		if (!isset(self::$adapter)) {
+			return self::$cache->setP($uid, $family, $key, $value);
 		}
 
-		$a->config[$uid][$family][$key] = $dbvalue;
-
-		// manage array value
-		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
-
-		$ret = dba::update('pconfig', array('v' => $dbvalue), array('uid' => $uid, 'cat' => $family, 'k' => $key), true);
-
-		if ($ret) {
-			self::$in_db[$uid][$family][$key] = true;
-			return $value;
-		}
-		return $ret;
+		return self::$adapter->set($uid, $family, $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.
+	 * 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
@@ -163,15 +131,10 @@ class PConfig
 	 */
 	public static function delete($uid, $family, $key)
 	{
-		$a = get_app();
-
-		if (x($a->config[$uid][$family], $key)) {
-			unset($a->config[$uid][$family][$key]);
-			unset(self::$in_db[$uid][$family][$key]);
+		if (!isset(self::$adapter)) {
+			return self::$cache->deleteP($uid, $family, $key);
 		}
 
-		$ret = dba::delete('pconfig', array('uid' => $uid, 'cat' => $family, 'k' => $key));
-
-		return $ret;
+		return self::$adapter->delete($uid, $family, $key);
 	}
 }