X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FPConfig.php;h=3467032fa2ce6ddb46d71443bb66ce4c3bd020c0;hb=de4a2e6fd03cd0aab94a256eba92ed593931534b;hp=2cfcfc235a94a658e4b550721b843d188949bdf0;hpb=4e49939421d39dfa971d8744691568bcdbdca15e;p=friendica.git

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 2cfcfc235a..3467032fa2 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -1,7 +1,11 @@
 <?php
+/**
+ * @file src/Core/PConfig.php
+ */
 namespace Friendica\Core;
 
-use dbm;
+use Friendica\Database\DBM;
+use dba;
 
 /**
  * @file include/Core/PConfig.php
@@ -16,8 +20,8 @@ use dbm;
  * The PConfig::get() functions return boolean false for keys that are unset,
  * and this could lead to subtle bugs.
  */
-class PConfig {
-
+class PConfig
+{
 	private static $in_db;
 
 	/**
@@ -26,20 +30,18 @@ class PConfig {
 	 * All configuration values of the given user are stored in global cache
 	 * which is available under the global variable $a->config[$uid].
 	 *
-	 * @param string $uid
-	 *  The user_id
-	 * @param string $family
-	 *  The category of the configuration value
+	 * @param string $uid    The user_id
+	 * @param string $family The category of the configuration value
+	 *
 	 * @return void
 	 */
-	public static function load($uid, $family) {
+	public static function load($uid, $family)
+	{
 		$a = get_app();
-		$r = q("SELECT `v`,`k` FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d ORDER BY `cat`, `k`, `id`",
-			dbesc($family),
-			intval($uid)
-		);
-		if (dbm::is_result($r)) {
-			foreach ($r as $rr) {
+
+		$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;
@@ -48,6 +50,7 @@ class PConfig {
 			// Negative caching
 			$a->config[$uid][$family] = "!<unset>!";
 		}
+		dba::close($r);
 	}
 
 	/**
@@ -57,20 +60,16 @@ class PConfig {
 	 * Get a particular user's config value from the given category ($family)
 	 * and the $key from a cached storage in $a->config[$uid].
 	 *
-	 * @param string $uid
-	 *  The user_id
-	 * @param string $family
-	 *  The category of the configuration value
-	 * @param string $key
-	 *  The configuration key to query
-	 * @param mixed $default_value optional
-	 *  The value to return if key is not set (default: null)
-	 * @param boolean $refresh optional
-	 *  If true the config is loaded from the db and not from the cache (default: false)
+	 * @param string  $uid           The user_id
+	 * @param string  $family        The category of the configuration value
+	 * @param string  $key           The configuration key to query
+	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)
+	 * @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
 	 */
-	public static function get($uid, $family, $key, $default_value = null, $refresh = false) {
-
+	public static function get($uid, $family, $key, $default_value = null, $refresh = false)
+	{
 		$a = get_app();
 
 		if (!$refresh) {
@@ -89,14 +88,9 @@ class PConfig {
 			}
 		}
 
-		$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' ORDER BY `id` DESC LIMIT 1",
-			intval($uid),
-			dbesc($family),
-			dbesc($key)
-		);
-
-		if (count($ret)) {
-			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
+		$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;
 
@@ -117,18 +111,15 @@ class PConfig {
 	 *
 	 * @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 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
+	 *
 	 * @return mixed Stored $value or false
 	 */
-	public static function set($uid, $family, $key, $value) {
-
+	public static function set($uid, $family, $key, $value)
+	{
 		$a = get_app();
 
 		// We store our setting values in a string variable.
@@ -147,22 +138,7 @@ class PConfig {
 		// manage array value
 		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
 
-		if (is_null($stored) || !self::$in_db[$uid][$family][$key]) {
-			$ret = q("INSERT INTO `pconfig` (`uid`, `cat`, `k`, `v`) VALUES (%d, '%s', '%s', '%s') ON DUPLICATE KEY UPDATE `v` = '%s'",
-				intval($uid),
-				dbesc($family),
-				dbesc($key),
-				dbesc($dbvalue),
-				dbesc($dbvalue)
-			);
-		} else {
-			$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'",
-				dbesc($dbvalue),
-				intval($uid),
-				dbesc($family),
-				dbesc($key)
-			);
-		}
+		dba::update('pconfig', array('v' => $dbvalue), array('uid' => $uid, 'cat' => $family, 'k' => $key), true);
 
 		if ($ret) {
 			self::$in_db[$uid][$family][$key] = true;
@@ -177,15 +153,14 @@ class PConfig {
 	 * Removes the configured value from the stored cache in $a->config[$uid]
 	 * and removes it from the database.
 	 *
-	 * @param string $uid The user_id
-	 * @param string $family
-	 *  The category of the configuration value
-	 * @param string $key
-	 *  The configuration key to delete
+	 * @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
 	 */
-	public static function delete($uid,$family,$key) {
-
+	public static function delete($uid, $family, $key)
+	{
 		$a = get_app();
 
 		if (x($a->config[$uid][$family], $key)) {
@@ -193,11 +168,7 @@ class PConfig {
 			unset(self::$in_db[$uid][$family][$key]);
 		}
 
-		$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'",
-			intval($uid),
-			dbesc($family),
-			dbesc($key)
-		);
+		$ret = dba::delete('pconfig', array('uid' => $uid, 'cat' => $family, 'k' => $key));
 
 		return $ret;
 	}