mirror of
https://github.com/friendica/friendica
synced 2025-04-25 09:10:11 +00:00
Move *ConfigValue functions to App
This commit is contained in:
parent
047f949967
commit
87f2d18554
6 changed files with 150 additions and 172 deletions
|
@ -11,9 +11,9 @@ use Friendica\Database\DBM;
|
|||
require_once 'include/dba.php';
|
||||
|
||||
/**
|
||||
* Preload PConfigAdapter
|
||||
* Preload User Configuration Adapter
|
||||
*
|
||||
* Minimize the number of database queries to retrieve configuration values at the cost of memory.
|
||||
* Minimizes the number of database queries to retrieve configuration values at the cost of memory.
|
||||
*
|
||||
* @author Hypolite Petovan <mrpetovan@gmail.com>
|
||||
*/
|
||||
|
@ -34,7 +34,7 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
|
|||
|
||||
$pconfigs = dba::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
|
||||
while ($pconfig = dba::fetch($pconfigs)) {
|
||||
$this->setPreloadedValue($uid, $pconfig['cat'], $pconfig['k'], $pconfig['v']);
|
||||
self::getApp()->setPConfigValue($uid, $pconfig['cat'], $pconfig['k'], $pconfig['v']);
|
||||
}
|
||||
dba::close($pconfigs);
|
||||
|
||||
|
@ -46,13 +46,13 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
|
|||
if ($refresh) {
|
||||
$config = dba::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
|
||||
if (DBM::is_result($config)) {
|
||||
$this->setPreloadedValue($uid, $cat, $k, $config['v']);
|
||||
self::getApp()->setPConfigValue($uid, $cat, $k, $config['v']);
|
||||
} else {
|
||||
$this->deletePreloadedValue($uid, $cat, $k);
|
||||
self::getApp()->deletePConfigValue($uid, $cat, $k);
|
||||
}
|
||||
}
|
||||
|
||||
$return = $this->getPreloadedValue($uid, $cat, $k, $default_value);
|
||||
$return = self::getApp()->getPConfigValue($uid, $cat, $k, $default_value);
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
@ -64,11 +64,11 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
|
|||
// The exception are array values.
|
||||
$compare_value = !is_array($value) ? (string)$value : $value;
|
||||
|
||||
if ($this->getPreloadedValue($uid, $cat, $k) === $compare_value) {
|
||||
if (self::getApp()->getPConfigValue($uid, $cat, $k) === $compare_value) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$this->setPreloadedValue($uid, $cat, $k, $value);
|
||||
self::getApp()->setPConfigValue($uid, $cat, $k, $value);
|
||||
|
||||
// manage array value
|
||||
$dbvalue = is_array($value) ? serialize($value) : $value;
|
||||
|
@ -83,68 +83,10 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
|
|||
|
||||
public function delete($uid, $cat, $k)
|
||||
{
|
||||
$this->deletePreloadedValue($uid, $cat, $k);
|
||||
self::getApp()->deletePConfigValue($uid, $cat, $k);
|
||||
|
||||
$result = dba::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Retrieves a preloaded value from the App user config cache
|
||||
*
|
||||
* @param int $uid
|
||||
* @param string $cat
|
||||
* @param string $k
|
||||
* @param mixed $default
|
||||
*/
|
||||
private function getPreloadedValue($uid, $cat, $k, $default = null)
|
||||
{
|
||||
$a = self::getApp();
|
||||
|
||||
$return = $default;
|
||||
|
||||
if (isset($a->config[$uid][$cat][$k])) {
|
||||
$return = $a->config[$uid][$cat][$k];
|
||||
}
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a preloaded value in the App user config cache
|
||||
*
|
||||
* Accepts raw output from the pconfig table
|
||||
*
|
||||
* @param int $uid
|
||||
* @param string $cat
|
||||
* @param string $k
|
||||
* @param mixed $v
|
||||
*/
|
||||
private function setPreloadedValue($uid, $cat, $k, $v)
|
||||
{
|
||||
$a = self::getApp();
|
||||
|
||||
// Only arrays are serialized in database, so we have to unserialize sparingly
|
||||
$value = is_string($v) && preg_match("|^a:[0-9]+:{.*}$|s", $v) ? unserialize($v) : $v;
|
||||
|
||||
$a->config[$uid][$cat][$k] = $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a preloaded value from the App user config cache
|
||||
*
|
||||
* @param int $uid
|
||||
* @param string $cat
|
||||
* @param string $k
|
||||
*/
|
||||
private function deletePreloadedValue($uid, $cat, $k)
|
||||
{
|
||||
$a = self::getApp();
|
||||
|
||||
if (isset($a->config[$uid][$cat][$k])) {
|
||||
unset($a->config[$uid][$cat][$k]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue