maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

more and more checkstyle fixes

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-24 12:59:40 +01:00
parent 585d42f1b8
commit 35c631946d
48 changed files with 298 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Froxlor/Config/ConfigDaemon.php
View File

@@ -71,7 +71,7 @@ class ConfigDaemon
/**
* cache of sql-data if used
*/
private $_sqldata_cache = null;
private $sqldata_cache = null;
/**
* Human - readable title of this service
@@ -441,15 +441,15 @@ class ConfigDaemon
return '';
}
} elseif (preg_match('/^sql\.(.*)$/', $matches[1], $match)) {
if (is_null($this->_sqldata_cache)) {
if (is_null($this->sqldata_cache)) {
// read in sql-data (if exists)
if (file_exists(\Froxlor\Froxlor::getInstallDir() . "/lib/userdata.inc.php")) {
require \Froxlor\Froxlor::getInstallDir() . "/lib/userdata.inc.php";
unset($sql_root);
$this->_sqldata_cache = $sql;
$this->sqldata_cache = $sql;
}
}
return isset($this->_sqldata_cache[$match[1]]) ? $this->_sqldata_cache[$match[1]] : '';
return isset($this->sqldata_cache[$match[1]]) ? $this->sqldata_cache[$match[1]] : '';
}
}, $content);
return $content;