Change variable name

This commit is contained in:
slawkens 2023-07-13 15:20:13 +02:00
parent 48ceada956
commit 4af944a00b

View File

@ -12,7 +12,7 @@ class Settings implements ArrayAccess
{ {
static private $instance; static private $instance;
private $settingsArray = []; private $settingsArray = [];
private $settings = []; private $settingsDatabase = [];
private $cache = []; private $cache = [];
private $valuesAsked = []; private $valuesAsked = [];
@ -34,7 +34,7 @@ class Settings implements ArrayAccess
if ($cache->enabled()) { if ($cache->enabled()) {
$tmp = ''; $tmp = '';
if ($cache->fetch('settings', $tmp)) { if ($cache->fetch('settings', $tmp)) {
$this->settings = unserialize($tmp); $this->settingsDatabase = unserialize($tmp);
return; return;
} }
} }
@ -44,12 +44,12 @@ class Settings implements ArrayAccess
if($settings->rowCount() > 0) { if($settings->rowCount() > 0) {
foreach ($settings->fetchAll(PDO::FETCH_ASSOC) as $setting) { foreach ($settings->fetchAll(PDO::FETCH_ASSOC) as $setting) {
$this->settings[$setting['name']][$setting['key']] = $setting['value']; $this->settingsDatabase[$setting['name']][$setting['key']] = $setting['value'];
} }
} }
if ($cache->enabled()) { if ($cache->enabled()) {
$cache->set('settings', serialize($this->settings), 600); $cache->set('settings', serialize($this->settingsDatabase), 600);
} }
} }
@ -316,7 +316,7 @@ class Settings implements ArrayAccess
return; return;
} }
$this->settings[$pluginKeyName][$key] = $value; $this->settingsDatabase[$pluginKeyName][$key] = $value;
$this->updateInDatabase($pluginKeyName, $key, $value); $this->updateInDatabase($pluginKeyName, $key, $value);
} }
@ -330,10 +330,10 @@ class Settings implements ArrayAccess
// remove specified plugin settings (all) // remove specified plugin settings (all)
if(is_null($key)) { if(is_null($key)) {
return isset($this->settings[$offset]); return isset($this->settingsDatabase[$offset]);
} }
return isset($this->settings[$pluginKeyName][$key]); return isset($this->settingsDatabase[$pluginKeyName][$key]);
} }
#[\ReturnTypeWillChange] #[\ReturnTypeWillChange]
@ -351,13 +351,13 @@ class Settings implements ArrayAccess
// remove specified plugin settings (all) // remove specified plugin settings (all)
if(!isset($key)) { if(!isset($key)) {
unset($this->settingsArray[$pluginKeyName]); unset($this->settingsArray[$pluginKeyName]);
unset($this->settings[$pluginKeyName]); unset($this->settingsDatabase[$pluginKeyName]);
$this->deleteFromDatabase($pluginKeyName); $this->deleteFromDatabase($pluginKeyName);
return; return;
} }
unset($this->settingsArray[$pluginKeyName][$key]); unset($this->settingsArray[$pluginKeyName][$key]);
unset($this->settings[$pluginKeyName][$key]); unset($this->settingsDatabase[$pluginKeyName][$key]);
$this->deleteFromDatabase($pluginKeyName, $key); $this->deleteFromDatabase($pluginKeyName, $key);
} }
@ -392,8 +392,8 @@ class Settings implements ArrayAccess
$ret = $this->settingsArray[$pluginKeyName][$key]; $ret = $this->settingsArray[$pluginKeyName][$key];
} }
if(isset($this->settings[$pluginKeyName][$key])) { if(isset($this->settingsDatabase[$pluginKeyName][$key])) {
$value = $this->settings[$pluginKeyName][$key]; $value = $this->settingsDatabase[$pluginKeyName][$key];
$ret['value'] = $value; $ret['value'] = $value;
} }