X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConfig%2FPreloadConfigAdapter.php;h=dc5c45379fdefc3af1cb304911cce8deb3c7e671;hb=be6b2295349d4d3e399b58f845efc5014e299275;hp=204e462948e4d5cde40ac5edd83948868e78863e;hpb=da40c96e9a059e1f41ff62bdf7107c9dbfca6dbe;p=friendica.git

diff --git a/src/Core/Config/PreloadConfigAdapter.php b/src/Core/Config/PreloadConfigAdapter.php
index 204e462948..dc5c45379f 100644
--- a/src/Core/Config/PreloadConfigAdapter.php
+++ b/src/Core/Config/PreloadConfigAdapter.php
@@ -2,22 +2,18 @@
 
 namespace Friendica\Core\Config;
 
-use dba;
 use Exception;
-use Friendica\App;
-use Friendica\BaseObject;
-use Friendica\Database\DBM;
-
-require_once 'include/dba.php';
+use Friendica\Core\Config;
+use Friendica\Database\DBA;
 
 /**
  * Preload Configuration Adapter
  *
  * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
+class PreloadConfigAdapter implements IConfigAdapter
 {
 	private $config_loaded = false;
 
@@ -32,11 +28,11 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
 			return;
 		}
 
-		$configs = dba::select('config', ['cat', 'v', 'k']);
-		while ($config = dba::fetch($configs)) {
-			self::getApp()->setConfigValue($config['cat'], $config['k'], $config['v']);
+		$configs = DBA::select('config', ['cat', 'v', 'k']);
+		while ($config = DBA::fetch($configs)) {
+			Config::setConfigValue($config['cat'], $config['k'], $config['v']);
 		}
-		dba::close($configs);
+		DBA::close($configs);
 
 		$this->config_loaded = true;
 	}
@@ -44,13 +40,13 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
 	public function get($cat, $k, $default_value = null, $refresh = false)
 	{
 		if ($refresh) {
-			$config = dba::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
-			if (DBM::is_result($config)) {
-				self::getApp()->setConfigValue($cat, $k, $config['v']);
+			$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
+			if (DBA::isResult($config)) {
+				Config::setConfigValue($cat, $k, $config['v']);
 			}
 		}
 
-		$return = self::getApp()->getConfigValue($cat, $k, $default_value);
+		$return = Config::getConfigValue($cat, $k, $default_value);
 
 		return $return;
 	}
@@ -62,16 +58,16 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
 		// The exception are array values.
 		$compare_value = !is_array($value) ? (string)$value : $value;
 
-		if (self::getApp()->getConfigValue($cat, $k) === $compare_value) {
+		if (Config::getConfigValue($cat, $k) === $compare_value) {
 			return true;
 		}
 
-		self::getApp()->setConfigValue($cat, $k, $value);
+		Config::setConfigValue($cat, $k, $value);
 
 		// manage array value
 		$dbvalue = is_array($value) ? serialize($value) : $value;
 
-		$result = dba::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
+		$result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
 		if (!$result) {
 			throw new Exception('Unable to store config value in [' . $cat . '][' . $k . ']');
 		}
@@ -81,9 +77,9 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
 
 	public function delete($cat, $k)
 	{
-		self::getApp()->deleteConfigValue($cat, $k);
+		Config::deleteConfigValue($cat, $k);
 
-		$result = dba::delete('config', ['cat' => $cat, 'k' => $k]);
+		$result = DBA::delete('config', ['cat' => $cat, 'k' => $k]);
 
 		return $result;
 	}