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

don't rely on defined settings, just read in what's in the database, refs #1325

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-15 19:43:15 +01:00
parent 2f707974e2
commit f12428f80d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/180.dkim.php
View File

@@ -81,7 +81,7 @@ return array(
'dkim_keylength' => array(
'label' => array(
'title' => $lng['dkim']['dkim_keylength']['title'],
'description' => $lng['dkim']['dkim_keylength']['description']
'description' => sprintf($lng['dkim_keylength']['label']['description'], Settings::Get('dkim.dkim_prefix'))
),
'settinggroup' => 'dkim',
'varname' => 'dkim_keylength',

10
lib/classes/settings/class.Settings.php
View File

@@ -78,8 +78,14 @@ class Settings {
* and set the internal $_data array
*/
private function _readSettings() {
$settings_data = loadConfigArrayDir('actions/admin/settings/');
self::$_data = loadSettings($settings_data);
$result_stmt = Database::query("
SELECT `settingid`, `settinggroup`, `varname`, `value`
FROM `" . TABLE_PANEL_SETTINGS . "`
");
self::$_data = array();
while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
self::$_data[$row['settinggroup']][$row['varname']] = $row['value'];
}
}
/**