Merge pull request #803 from annando/master

[friendica.git] / include / config.php

diff --git a/include/config.php b/include/config.php
index 1f2a70e5a144bc4529523bd104b1428646b1c29b..2664b78a88d657510ba36dd6c963695a4124ae76 100644 (file)
--- a/include/config.php
+++ b/include/config.php
@@ -18,6 +18,9 @@
 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) {
@@ -62,18 +65,40 @@ function get_config($family, $key, $instore = false) {
                        return $a->config[$family][$key];
                }
        }
+
+       // If APC is enabled then fetch the data from there
+       if (function_exists("apc_fetch") AND function_exists("apc_exists"))
+               if (apc_exists($family."|".$key)) {
+                       $val = apc_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),
                dbesc($key)
        );
        if(count($ret)) {
                // manage array value
-               $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
+               $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"))
+                       apc_store($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"))
+                       apc_store($family."|".$key, '!<unset>!', 600);
        }
        return false;
 }}
@@ -85,6 +110,15 @@ function get_config($family, $key, $instore = false) {
 if(! function_exists('set_config')) {
 function set_config($family,$key,$value) {
        global $a;
+
+       // If $a->config[$family] has been previously set to '!<unset>!', then
+       // $a->config[$family][$key] will evaluate to $a->config[$family][0], and
+       // $a->config[$family][$key] = $value will be equivalent to
+       // $a->config[$family][0] = $value[0] (this causes infuriating bugs),
+       // so unset the family before assigning a value to a family's key
+       if($a->config[$family] === '!<unset>!')
+               unset($a->config[$family]);
+
        // manage array value
        $dbvalue = (is_array($value)?serialize($value):$value);
        $dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
@@ -108,6 +142,10 @@ 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"))
+               apc_store($family."|".$key, $value, 600);
+
        if($ret)
                return $value;
        return $ret;
@@ -155,6 +193,19 @@ 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_exists($uid."|".$family."|".$key)) {
+                       $val = apc_fetch($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",
                intval($uid),
                dbesc($family),
@@ -162,12 +213,21 @@ function get_pconfig($uid,$family, $key, $instore = false) {
        );
 
        if(count($ret)) {
-               $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
+               $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"))
+                       apc_store($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"))
+                       apc_store($uid."|".$family."|".$key, '!<unset>!', 600);
        }
        return false;
 }}
@@ -182,6 +242,10 @@ function del_config($family,$key) {
                dbesc($family),
                dbesc($key)
        );
+       // If APC is enabled then store the data there
+       if (function_exists("apc_delete"))
+               apc_delete($family."|".$key);
+
        return $ret;
 }}
 
@@ -219,6 +283,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"))
+               apc_store($uid."|".$family."|".$key, $value, 600);
+
+
        if($ret)
                return $value;
        return $ret;