Merge pull request #2106 from annando/1511-ostatus-bookmark-design

[friendica.git] / include / config.php

diff --git a/include/config.php b/include/config.php
index ce30d2d192ce12be96b17a5d7d7b893f52e934d4..05bcea6212d7769359febba441b6b79c36bfc161 100644 (file)
--- a/include/config.php
+++ b/include/config.php
@@ -19,8 +19,6 @@ 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));
        if(count($r)) {
                foreach($r as $rr) {
@@ -66,11 +64,10 @@ 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>!')
@@ -78,9 +75,17 @@ function get_config($family, $key, $instore = 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),
@@ -91,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;
 }}
@@ -138,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)
@@ -146,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;
@@ -197,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",
@@ -222,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;
 }}
@@ -244,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;
 }}
@@ -280,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),
@@ -289,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)
@@ -305,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)