X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConfig.php;h=56b85dba46a5ec1a55ae4a05606e7d28b3b31cc3;hb=51a29d381f6babcbd18787c72d4e1c702b94c0ec;hp=fbb79bc5b1bd72d6bff316c2970f0f0abe59cf69;hpb=64718b53d1733df0dcd758fb50cf5b215ccc0832;p=friendica.git

diff --git a/src/Core/Config.php b/src/Core/Config.php
index fbb79bc5b1..56b85dba46 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -1,15 +1,15 @@
 <?php
-namespace Friendica\Core;
-
-use dba;
-use dbm;
-
 /**
+ * System Configuration Class
+ *
  * @file include/Core/Config.php
  *
- *  @brief Contains the class with methods for system configuration
+ * @brief Contains the class with methods for system configuration
  */
+namespace Friendica\Core;
 
+use Friendica\Database\DBM;
+use dba;
 
 /**
  * @brief Arbitrary sytem configuration storage
@@ -46,7 +46,7 @@ class Config {
 
 		$a = get_app();
 
-		$r = dba::select('config', array('v', 'k'), array('cat' => $family), array("order" => array("cat", "k")));
+		$r = dba::select('config', array('v', 'k'), array('cat' => $family));
 		while ($rr = dba::fetch($r)) {
 			$k = $rr['k'];
 			if ($family === 'config') {
@@ -57,6 +57,7 @@ class Config {
 				self::$in_db[$family][$k] = true;
 			}
 		}
+		dba::close($r);
 	}
 
 	/**
@@ -86,7 +87,6 @@ class Config {
 		$a = get_app();
 
 		if (!$refresh) {
-
 			// Do we have the cached value? Then return it
 			if (isset(self::$cache[$family][$key])) {
 				if (self::$cache[$family][$key] === '!<unset>!') {
@@ -97,9 +97,8 @@ class Config {
 			}
 		}
 
-		$ret = dba::select('config', array('v'), array('cat' => $family, 'k' => $key),
-				array("order" => array("cat", "k"), 'limit' => 1));
-		if (dbm::is_result($ret)) {
+		$ret = dba::select('config', array('v'), array('cat' => $family, 'k' => $key), array('limit' => 1));
+		if (DBM::is_result($ret)) {
 			// manage array value
 			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret['v']) ? unserialize($ret['v']) : $ret['v']);
 
@@ -108,7 +107,6 @@ class Config {
 			self::$in_db[$family][$key] = true;
 			return $val;
 		} elseif (isset($a->config[$family][$key])) {
-
 			// Assign the value (mostly) from the .htconfig.php to the cache
 			self::$cache[$family][$key] = $a->config[$family][$key];
 			self::$in_db[$family][$key] = false;
@@ -164,20 +162,8 @@ class Config {
 		// manage array value
 		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
 
-		if (is_null($stored) || !self::$in_db[$family][$key]) {
-			$ret = q("INSERT INTO `config` (`cat`, `k`, `v`) VALUES ('%s', '%s', '%s') ON DUPLICATE KEY UPDATE `v` = '%s'",
-				dbesc($family),
-				dbesc($key),
-				dbesc($dbvalue),
-				dbesc($dbvalue)
-			);
-		} else {
-			$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s'",
-				dbesc($dbvalue),
-				dbesc($family),
-				dbesc($key)
-			);
-		}
+		dba::update('config', array('v' => $dbvalue), array('cat' => $family, 'k' => $key), true);
+
 		if ($ret) {
 			self::$in_db[$family][$key] = true;
 			return $value;