Merge pull request #3991 from MrPetovan/bug/undefined-variables

[friendica.git] / src / Core / PConfig.php

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index e5a852e40393fb05ff701485b7773819f3160d01..3467032fa2ce6ddb46d71443bb66ce4c3bd020c0 100644 (file)
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -1,8 +1,11 @@
 <?php
+/**
+ * @file src/Core/PConfig.php
+ */
 namespace Friendica\Core;
 
+use Friendica\Database\DBM;
 use dba;
-use dbm;
 
 /**
  * @file include/Core/PConfig.php
@@ -17,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;
 
        /**
@@ -27,17 +30,17 @@ 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 = dba::select('pconfig', array('v', 'k'), array('cat' => $family, 'uid' => $uid));
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        while ($rr = dba::fetch($r)) {
                                $k = $rr['k'];
                                $a->config[$uid][$family][$k] = $rr['v'];
@@ -47,6 +50,7 @@ class PConfig {
                        // Negative caching
                        $a->config[$uid][$family] = "!<unset>!";
                }
+               dba::close($r);
        }
 
        /**
@@ -56,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,7 +89,7 @@ class PConfig {
                }
 
                $ret = dba::select('pconfig', array('v'), array('uid' => $uid, 'cat' => $family, 'k' => $key), array('limit' => 1));
-               if (dbm::is_result($ret)) {
+               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;
@@ -111,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.
@@ -141,11 +138,7 @@ class PConfig {
                // manage array value
                $dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
 
-               if (is_null($stored) || !self::$in_db[$uid][$family][$key]) {
-                       dba::insert('pconfig', array('uid' => $uid, 'cat' => $family, 'k' => $key, 'v' => $dbvalue), true);
-               } else {
-                       dba::update('pconfig', array('v' => $dbvalue), array('uid' => $uid, 'cat' => $family, 'k' => $key), true);
-               }
+               dba::update('pconfig', array('v' => $dbvalue), array('uid' => $uid, 'cat' => $family, 'k' => $key), true);
 
                if ($ret) {
                        self::$in_db[$uid][$family][$key] = true;
@@ -160,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)) {