Add refresh feature to Preload (P)Config adapters

- Add private methods to manipulat the App config variable

diff --git a/src/Core/Config/PreloadConfigAdapter.php b/src/Core/Config/PreloadConfigAdapter.php
index c10f2ee6489ef07e24453ab0b3b4ee1bd217aa1d..4abcc4a1a42b9aa0826c3456d16910412a2dfbde 100644 (file)
--- a/src/Core/Config/PreloadConfigAdapter.php
+++ b/src/Core/Config/PreloadConfigAdapter.php
@@ -4,7 +4,9 @@ namespace Friendica\Core\Config;
 \r
 use dba;\r
 use Exception;\r
+use Friendica\App;\r
 use Friendica\BaseObject;\r
+use Friendica\Database\DBM;\r
 \r
 require_once 'include/dba.php';\r
 \r
@@ -30,19 +32,9 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
                        return;\r
                }\r
 \r
-               $a = self::getApp();\r
-\r
                $configs = dba::select('config', ['cat', 'v', 'k']);\r
                while ($config = dba::fetch($configs)) {\r
-                       $cat   = $config['cat'];\r
-                       $k     = $config['k'];\r
-                       $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);\r
-\r
-                       if ($cat === 'config') {\r
-                               $a->config[$k] = $value;\r
-                       } else {\r
-                               $a->config[$cat][$k] = $value;\r
-                       }\r
+                       $this->setPreloadedValue($config['cat'], $config['k'], $config['v']);\r
                }\r
                dba::close($configs);\r
 \r
@@ -51,41 +43,32 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
 \r
        public function get($cat, $k, $default_value = null, $refresh = false)\r
        {\r
-               $a = self::getApp();\r
-\r
-               $return = $default_value;\r
-\r
-               if ($cat === 'config') {\r
-                       if (isset($a->config[$k])) {\r
-                               $return = $a->config[$k];\r
-                       }\r
-               } else {\r
-                       if (isset($a->config[$cat][$k])) {\r
-                               $return = $a->config[$cat][$k];\r
+               if ($refresh) {\r
+                       $config = dba::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);\r
+                       if (DBM::is_result($config)) {\r
+                               $this->setPreloadedValue($cat, $k, $config['v']);\r
+                       } else {\r
+                               $this->deletePreloadedValue($cat, $k);\r
                        }\r
                }\r
 \r
+               $return = $this->getPreloadedValue($cat, $k, $default_value);\r
+\r
                return $return;\r
        }\r
 \r
        public function set($cat, $k, $value)\r
        {\r
-               $a = self::getApp();\r
-\r
                // We store our setting values as strings.\r
                // So we have to do the conversion here so that the compare below works.\r
                // The exception are array values.\r
                $compare_value = !is_array($value) ? (string)$value : $value;\r
 \r
-               if ($this->get($cat, $k) === $compare_value) {\r
+               if ($this->getPreloadedValue($cat, $k) === $compare_value) {\r
                        return true;\r
                }\r
 \r
-               if ($cat === 'config') {\r
-                       $a->config[$k] = $value;\r
-               } else {\r
-                       $a->config[$cat][$k] = $value;\r
-               }\r
+               $this->setPreloadedValue($cat, $k, $value);\r
 \r
                // manage array value\r
                $dbvalue = is_array($value) ? serialize($value) : $value;\r
@@ -99,21 +82,81 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
        }\r
 \r
        public function delete($cat, $k)\r
+       {\r
+               $this->deletePreloadedValue($cat, $k);\r
+\r
+               $result = dba::delete('config', ['cat' => $cat, 'k' => $k]);\r
+\r
+               return $result;\r
+       }\r
+\r
+       /**\r
+        * Retrieves a preloaded value from the App config cache\r
+        *\r
+        * @param string $cat\r
+        * @param string $k\r
+        * @param mixed  $default\r
+        */\r
+       private function getPreloadedValue($cat, $k, $default = null)\r
        {\r
                $a = self::getApp();\r
 \r
+               $return = $default;\r
+\r
                if ($cat === 'config') {\r
                        if (isset($a->config[$k])) {\r
-                               unset($a->config[$k]);\r
+                               $return = $a->config[$k];\r
                        }\r
                } else {\r
                        if (isset($a->config[$cat][$k])) {\r
-                               unset($a->config[$cat][$k]);\r
+                               $return = $a->config[$cat][$k];\r
                        }\r
                }\r
 \r
-               $result = dba::delete('config', ['cat' => $cat, 'k' => $k]);\r
+               return $return;\r
+       }\r
 \r
-               return $result;\r
+       /**\r
+        * Sets a preloaded value in the App config cache\r
+        *\r
+        * Accepts raw output from the config table\r
+        *\r
+        * @param string $cat\r
+        * @param string $k\r
+        * @param mixed $v\r
+        */\r
+       private function setPreloadedValue($cat, $k, $v)\r
+       {\r
+               $a = self::getApp();\r
+\r
+               // Only arrays are serialized in database, so we have to unserialize sparingly\r
+               $value = is_string($v) && preg_match("|^a:[0-9]+:{.*}$|s", $v) ? unserialize($v) : $v;\r
+\r
+               if ($cat === 'config') {\r
+                       $a->config[$k] = $value;\r
+               } else {\r
+                       $a->config[$cat][$k] = $value;\r
+               }\r
+       }\r
+\r
+       /**\r
+        * Deletes a preloaded value from the App config cache\r
+        *\r
+        * @param string $cat\r
+        * @param string $k\r
+        */\r
+       private function deletePreloadedValue($cat, $k)\r
+       {\r
+               $a = self::getApp();\r
+\r
+               if ($cat === 'config') {\r
+                       if (isset($a->config[$k])) {\r
+                               unset($a->config[$k]);\r
+                       }\r
+               } else {\r
+                       if (isset($a->config[$cat][$k])) {\r
+                               unset($a->config[$cat][$k]);\r
+                       }\r
+               }\r
        }\r
 }\r

diff --git a/src/Core/Config/PreloadPConfigAdapter.php b/src/Core/Config/PreloadPConfigAdapter.php
index 002094a51692f00b85dd2ff5f7fa5bfaed5f2355..d6a44e07c0d325da184655817ffef500a6435305 100644 (file)
--- a/src/Core/Config/PreloadPConfigAdapter.php
+++ b/src/Core/Config/PreloadPConfigAdapter.php
@@ -4,7 +4,9 @@ namespace Friendica\Core\Config;
 \r
 use dba;\r
 use Exception;\r
+use Friendica\App;\r
 use Friendica\BaseObject;\r
+use Friendica\Database\DBM;\r
 \r
 require_once 'include/dba.php';\r
 \r
@@ -30,15 +32,9 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
                        return;\r
                }\r
 \r
-               $a = self::getApp();\r
-\r
                $pconfigs = dba::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);\r
                while ($pconfig = dba::fetch($pconfigs)) {\r
-                       $cat   = $pconfig['cat'];\r
-                       $k     = $pconfig['k'];\r
-                       $value = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);\r
-\r
-                       $a->config[$uid][$cat][$k] = $value;\r
+                       $this->setPreloadedValue($uid, $pconfig['cat'], $pconfig['k'], $pconfig['v']);\r
                }\r
                dba::close($pconfigs);\r
 \r
@@ -47,37 +43,37 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
 \r
        public function get($uid, $cat, $k, $default_value = null, $refresh = false)\r
        {\r
-               $a = self::getApp();\r
-\r
-               $return = $default_value;\r
-\r
-               if (isset($a->config[$uid][$cat][$k])) {\r
-                       $return = $a->config[$uid][$cat][$k];\r
+               if ($refresh) {\r
+                       $config = dba::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);\r
+                       if (DBM::is_result($config)) {\r
+                               $this->setPreloadedValue($uid, $cat, $k, $config['v']);\r
+                       } else {\r
+                               $this->deletePreloadedValue($uid, $cat, $k);\r
+                       }\r
                }\r
 \r
+               $return = $this->getPreloadedValue($uid, $cat, $k, $default_value);\r
+\r
                return $return;\r
        }\r
 \r
        public function set($uid, $cat, $k, $value)\r
        {\r
-               $a = self::getApp();\r
-\r
                // We store our setting values as strings.\r
                // So we have to do the conversion here so that the compare below works.\r
                // The exception are array values.\r
                $compare_value = !is_array($value) ? (string)$value : $value;\r
 \r
-               if ($this->get($uid, $cat, $k) === $compare_value) {\r
+               if ($this->getPreloadedValue($uid, $cat, $k) === $compare_value) {\r
                        return true;\r
                }\r
 \r
-               $a->config[$uid][$cat][$k] = $value;\r
+               $this->setPreloadedValue($uid, $cat, $k, $value);\r
 \r
                // manage array value\r
                $dbvalue = is_array($value) ? serialize($value) : $value;\r
 \r
                $result = dba::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);\r
-\r
                if (!$result) {\r
                        throw new Exception('Unable to store config value in [' . $uid . '][' . $cat . '][' . $k . ']');\r
                }\r
@@ -86,17 +82,69 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
        }\r
 \r
        public function delete($uid, $cat, $k)\r
+       {\r
+               $this->deletePreloadedValue($uid, $cat, $k);\r
+\r
+               $result = dba::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);\r
+\r
+               return $result;\r
+       }\r
+\r
+\r
+       /**\r
+        * Retrieves a preloaded value from the App user config cache\r
+        *\r
+        * @param int    $uid\r
+        * @param string $cat\r
+        * @param string $k\r
+        * @param mixed  $default\r
+        */\r
+       private function getPreloadedValue($uid, $cat, $k, $default = null)\r
        {\r
                $a = self::getApp();\r
 \r
-               if (!isset($a->config[$uid][$cat][$k])) {\r
-                       return true;\r
+               $return = $default;\r
+\r
+               if (isset($a->config[$uid][$cat][$k])) {\r
+                       $return = $a->config[$uid][$cat][$k];\r
                }\r
 \r
-               unset($a->config[$uid][$cat][$k]);\r
+               return $return;\r
+       }\r
 \r
-               $result = dba::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);\r
+       /**\r
+        * Sets a preloaded value in the App user config cache\r
+        *\r
+        * Accepts raw output from the pconfig table\r
+        *\r
+        * @param int    $uid\r
+        * @param string $cat\r
+        * @param string $k\r
+        * @param mixed  $v\r
+        */\r
+       private function setPreloadedValue($uid, $cat, $k, $v)\r
+       {\r
+               $a = self::getApp();\r
 \r
-               return $result;\r
+               // Only arrays are serialized in database, so we have to unserialize sparingly\r
+               $value = is_string($v) && preg_match("|^a:[0-9]+:{.*}$|s", $v) ? unserialize($v) : $v;\r
+\r
+               $a->config[$uid][$cat][$k] = $value;\r
+       }\r
+\r
+       /**\r
+        * Deletes a preloaded value from the App user config cache\r
+        *\r
+        * @param int    $uid\r
+        * @param string $cat\r
+        * @param string $k\r
+        */\r
+       private function deletePreloadedValue($uid, $cat, $k)\r
+       {\r
+               $a = self::getApp();\r
+\r
+               if (isset($a->config[$uid][$cat][$k])) {\r
+                       unset($a->config[$uid][$cat][$k]);\r
+               }\r
        }\r
 }\r