X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconfig.php;h=b27274e9a946671f321062bf0d78827b6f8ac784;hb=416a0e5ec2684f1bfe029da9438b2782127d9355;hp=4f44de24fc1da801ea753e410cf88a317baba9da;hpb=d92a348cf049e9caf7f45fee388ac9d6ca15fe6e;p=friendica.git

diff --git a/include/config.php b/include/config.php
index 4f44de24fc..b27274e9a9 100644
--- a/include/config.php
+++ b/include/config.php
@@ -19,9 +19,7 @@ if(! function_exists('load_config')) {
 function load_config($family) {
 	global $a;
 
-	// To-Do: How to integrate APC here?
-
-	$r = q("SELECT * FROM `config` WHERE `cat` = '%s'", dbesc($family));
+	$r = q("SELECT `v`, `k` FROM `config` WHERE `cat` = '%s'", dbesc($family));
 	if(count($r)) {
 		foreach($r as $rr) {
 			$k = $rr['k'];
@@ -66,20 +64,28 @@ function get_config($family, $key, $instore = false) {
 		}
 	}
 
-	// If APC is enabled then fetch the data from there
-	if (function_exists("apc_fetch") AND function_exists("apc_exists"))
+	// If APC is enabled then fetch the data from there, else try XCache
+	/*if (function_exists("apc_fetch") AND function_exists("apc_exists"))
 		if (apc_exists($family."|".$key)) {
 			$val = apc_fetch($family."|".$key);
-			//logger("APC: fetched stored value ".$family."|".$key, LOGGER_DEBUG);
 			$a->config[$family][$key] = $val;
 
 			if ($val === '!<unset>!')
 				return false;
 			else
 				return $val;
-		} else
-			//logger("APC: cache miss for value ".$family."|".$key, LOGGER_DEBUG);
+		}
+	elseif (function_exists("xcache_fetch") AND function_exists("xcache_isset"))
+		if (xcache_isset($family."|".$key)) {
+			$val = xcache_fetch($family."|".$key);
+			$a->config[$family][$key] = $val;
 
+			if ($val === '!<unset>!')
+				return false;
+			else
+				return $val;
+		}
+	*/
 
 	$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
 		dbesc($family),
@@ -90,18 +96,22 @@ function get_config($family, $key, $instore = false) {
 		$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 		$a->config[$family][$key] = $val;
 
-		// If APC is enabled then store the data there
-		if (function_exists("apc_store"))
+		// If APC is enabled then store the data there, else try XCache
+		/*if (function_exists("apc_store"))
 			apc_store($family."|".$key, $val, 600);
+		elseif (function_exists("xcache_set"))
+			xcache_set($family."|".$key, $val, 600);*/
 
 		return $val;
 	}
 	else {
 		$a->config[$family][$key] = '!<unset>!';
 
-		// If APC is enabled then store the data there
-		if (function_exists("apc_store"))
+		// If APC is enabled then store the data there, else try XCache
+		/*if (function_exists("apc_store"))
 			apc_store($family."|".$key, '!<unset>!', 600);
+		elseif (function_exists("xcache_set"))
+			xcache_set($family."|".$key, '!<unset>!', 600);*/
 	}
 	return false;
 }}
@@ -137,7 +147,7 @@ function set_config($family,$key,$value) {
 		return $ret;
 	}
 
-	$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+	$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s'",
 		dbesc($dbvalue),
 		dbesc($family),
 		dbesc($key)
@@ -145,9 +155,11 @@ function set_config($family,$key,$value) {
 
 	$a->config[$family][$key] = $value;
 
-	// If APC is enabled then store the data there
-	if (function_exists("apc_store"))
+	// If APC is enabled then store the data there, else try XCache
+	/*if (function_exists("apc_store"))
 		apc_store($family."|".$key, $value, 600);
+	elseif (function_exists("xcache_set"))
+		xcache_set($family."|".$key, $value, 600);*/
 
 	if($ret)
 		return $value;
@@ -158,7 +170,7 @@ function set_config($family,$key,$value) {
 if(! function_exists('load_pconfig')) {
 function load_pconfig($uid,$family) {
 	global $a;
-	$r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d",
+	$r = q("SELECT `v`,`k` FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d",
 		dbesc($family),
 		intval($uid)
 	);
@@ -196,19 +208,27 @@ function get_pconfig($uid,$family, $key, $instore = false) {
 		}
 	}
 
-	// If APC is enabled then fetch the data from there
-	if (function_exists("apc_fetch") AND function_exists("apc_exists"))
+	// If APC is enabled then fetch the data from there, else try XCache
+	/*if (function_exists("apc_fetch") AND function_exists("apc_exists"))
 		if (apc_exists($uid."|".$family."|".$key)) {
 			$val = apc_fetch($uid."|".$family."|".$key);
-			//logger("APC: fetched stored value ".$uid."|".$family."|".$key, LOGGER_DEBUG);
 			$a->config[$uid][$family][$key] = $val;
 
 			if ($val === '!<unset>!')
 				return false;
 			else
 				return $val;
-		} else
-			//logger("APC: cache miss for value ".$family."|".$key, LOGGER_DEBUG);
+		}
+	elseif (function_exists("xcache_get") AND function_exists("xcache_isset"))
+		if (xcache_isset($uid."|".$family."|".$key)) {
+			$val = xcache_get($uid."|".$family."|".$key);
+			$a->config[$uid][$family][$key] = $val;
+
+			if ($val === '!<unset>!')
+				return false;
+			else
+				return $val;
+		}*/
 
 
 	$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
@@ -221,18 +241,22 @@ function get_pconfig($uid,$family, $key, $instore = false) {
 		$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 		$a->config[$uid][$family][$key] = $val;
 
-		// If APC is enabled then store the data there
-		if (function_exists("apc_store"))
+		// If APC is enabled then store the data there, else try XCache
+		/*if (function_exists("apc_store"))
 			apc_store($uid."|".$family."|".$key, $val, 600);
+		elseif (function_exists("xcache_set"))
+			xcache_set($uid."|".$family."|".$key, $val, 600);*/
 
 		return $val;
 	}
 	else {
 		$a->config[$uid][$family][$key] = '!<unset>!';
 
-		// If APC is enabled then store the data there
-		if (function_exists("apc_store"))
+		// If APC is enabled then store the data there, else try XCache
+		/*if (function_exists("apc_store"))
 			apc_store($uid."|".$family."|".$key, '!<unset>!', 600);
+		elseif (function_exists("xcache_set"))
+			xcache_set($uid."|".$family."|".$key, '!<unset>!', 600);*/
 	}
 	return false;
 }}
@@ -243,13 +267,15 @@ function del_config($family,$key) {
 	global $a;
 	if(x($a->config[$family],$key))
 		unset($a->config[$family][$key]);
-	$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+	$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s'",
 		dbesc($family),
 		dbesc($key)
 	);
-	// If APC is enabled then store the data there
-	if (function_exists("apc_delete"))
+	// If APC is enabled then delete the data from there, else try XCache
+	/*if (function_exists("apc_delete"))
 		apc_delete($family."|".$key);
+	elseif (function_exists("xcache_unset"))
+		xcache_unset($family."|".$key);*/
 
 	return $ret;
 }}
@@ -279,7 +305,7 @@ function set_pconfig($uid,$family,$key,$value) {
 			return $value;
 		return $ret;
 	}
-	$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+	$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'",
 		dbesc($dbvalue),
 		intval($uid),
 		dbesc($family),
@@ -288,9 +314,11 @@ function set_pconfig($uid,$family,$key,$value) {
 
 	$a->config[$uid][$family][$key] = $value;
 
-	// If APC is enabled then store the data there
-	if (function_exists("apc_store"))
+	// If APC is enabled then store the data there, else try XCache
+	/*if (function_exists("apc_store"))
 		apc_store($uid."|".$family."|".$key, $value, 600);
+	elseif (function_exists("xcache_set"))
+		xcache_set($uid."|".$family."|".$key, $value, 600);*/
 
 
 	if($ret)
@@ -304,7 +332,7 @@ function del_pconfig($uid,$family,$key) {
 	global $a;
 	if(x($a->config[$uid][$family],$key))
 		unset($a->config[$uid][$family][$key]);
-	$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+	$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'",
 		intval($uid),
 		dbesc($family),
 		dbesc($key)