X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConfig%2FPreloadPConfigAdapter.php;h=af97815adef38d159ab6ba44f27766d10ed7ca9d;hb=01b7a3976ff1a00700c429db43fcbdec7158abca;hp=d2354103396bc6bbce35d66a09ce002b1f76b5ca;hpb=9665f4ed415d34cbcf09df8c6ca04882303e9544;p=friendica.git

diff --git a/src/Core/Config/PreloadPConfigAdapter.php b/src/Core/Config/PreloadPConfigAdapter.php
index d235410339..af97815ade 100644
--- a/src/Core/Config/PreloadPConfigAdapter.php
+++ b/src/Core/Config/PreloadPConfigAdapter.php
@@ -1,92 +1,125 @@
-<?php
-
-namespace Friendica\Core\Config;
-
-use dba;
-use Exception;
-use Friendica\App;
-use Friendica\BaseObject;
-use Friendica\Database\DBM;
-
-require_once 'include/dba.php';
-
-/**
- * Preload User Configuration Adapter
- *
- * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
- *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
- */
-class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
-{
-	private $config_loaded = false;
-
-	public function __construct($uid)
-	{
-		$this->load($uid, 'config');
-	}
-
-	public function load($uid, $family)
-	{
-		if ($this->config_loaded) {
-			return;
-		}
-
-		$pconfigs = dba::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
-		while ($pconfig = dba::fetch($pconfigs)) {
-			self::getApp()->setPConfigValue($uid, $pconfig['cat'], $pconfig['k'], $pconfig['v']);
-		}
-		dba::close($pconfigs);
-
-		$this->config_loaded = true;
-	}
-
-	public function get($uid, $cat, $k, $default_value = null, $refresh = false)
-	{
-		if ($refresh) {
-			$config = dba::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-			if (DBM::is_result($config)) {
-				self::getApp()->setPConfigValue($uid, $cat, $k, $config['v']);
-			} else {
-				self::getApp()->deletePConfigValue($uid, $cat, $k);
-			}
-		}
-
-		$return = self::getApp()->getPConfigValue($uid, $cat, $k, $default_value);
-
-		return $return;
-	}
-
-	public function set($uid, $cat, $k, $value)
-	{
-		// We store our setting values as strings.
-		// So we have to do the conversion here so that the compare below works.
-		// The exception are array values.
-		$compare_value = !is_array($value) ? (string)$value : $value;
-
-		if (self::getApp()->getPConfigValue($uid, $cat, $k) === $compare_value) {
-			return true;
-		}
-
-		self::getApp()->setPConfigValue($uid, $cat, $k, $value);
-
-		// manage array value
-		$dbvalue = is_array($value) ? serialize($value) : $value;
-
-		$result = dba::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
-		if (!$result) {
-			throw new Exception('Unable to store config value in [' . $uid . '][' . $cat . '][' . $k . ']');
-		}
-
-		return true;
-	}
-
-	public function delete($uid, $cat, $k)
-	{
-		self::getApp()->deletePConfigValue($uid, $cat, $k);
-
-		$result = dba::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-
-		return $result;
-	}
-}
+<?php
+
+namespace Friendica\Core\Config;
+
+use Exception;
+use Friendica\Database\DBA;
+
+/**
+ * Preload User Configuration Adapter
+ *
+ * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class PreloadPConfigAdapter implements IPConfigAdapter
+{
+	private $config_loaded = false;
+
+	/**
+	 * The config cache of this adapter
+	 * @var IPConfigCache
+	 */
+	private $configCache;
+
+	/**
+	 * @param IPConfigCache $configCache The config cache of this adapter
+	 * @param int           $uid    The UID of the current user
+	 */
+	public function __construct(IPConfigCache $configCache, $uid = null)
+	{
+		$this->configCache = $configCache;
+		if (isset($uid)) {
+			$this->load($uid, 'config');
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function load($uid, $family)
+	{
+		if ($this->config_loaded) {
+			return;
+		}
+
+		if (empty($uid)) {
+			return;
+		}
+
+		$pconfigs = DBA::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
+		while ($pconfig = DBA::fetch($pconfigs)) {
+			$this->configCache->setP($uid, $pconfig['cat'], $pconfig['k'], $pconfig['v']);
+		}
+		DBA::close($pconfigs);
+
+		$this->config_loaded = true;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get($uid, $cat, $k, $default_value = null, $refresh = false)
+	{
+		if (!$this->config_loaded) {
+			$this->load($uid, $cat);
+		}
+
+		if ($refresh) {
+			$config = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
+			if (DBA::isResult($config)) {
+				$this->configCache->setP($uid, $cat, $k, $config['v']);
+			} else {
+				$this->configCache->deleteP($uid, $cat, $k);
+			}
+		}
+
+		return $this->configCache->getP($uid, $cat, $k, $default_value);;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function set($uid, $cat, $k, $value)
+	{
+		if (!$this->config_loaded) {
+			$this->load($uid, $cat);
+		}
+		// We store our setting values as strings.
+		// So we have to do the conversion here so that the compare below works.
+		// The exception are array values.
+		$compare_value = !is_array($value) ? (string)$value : $value;
+
+		if ($this->configCache->getP($uid, $cat, $k) === $compare_value) {
+			return true;
+		}
+
+		$this->configCache->setP($uid, $cat, $k, $value);
+
+		// manage array value
+		$dbvalue = is_array($value) ? serialize($value) : $value;
+
+		$result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
+		if (!$result) {
+			throw new Exception('Unable to store config value in [' . $uid . '][' . $cat . '][' . $k . ']');
+		}
+
+		return true;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function delete($uid, $cat, $k)
+	{
+		if (!$this->config_loaded) {
+			$this->load($uid, $cat);
+		}
+
+		$this->configCache->deleteP($uid, $cat, $k);
+
+		$result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
+
+		return $result;
+	}
+}