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

complete migration to new Settings class, fixes #1325

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-19 07:56:58 +01:00
parent ec59d3a8e8
commit 0fee9a3480
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cron_init.php
View File

@@ -128,18 +128,6 @@ try {
fwrite($debugHandler, 'Database-connection established' . "\n"); fwrite($debugHandler, 'Database-connection established' . "\n");
// TODO remove when fully migrated to new Settings class
$result_stmt = Database::query("
SELECT `settingid`, `settinggroup`, `varname`, `value`
FROM `" . TABLE_PANEL_SETTINGS . "`
");
while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
$settings[$row['settinggroup']][$row['varname']] = $row['value'];
}
unset($row);
fwrite($debugHandler, 'Froxlor settings have been loaded from the database' . "\n");
/** /**
* if using fcgid or fpm for froxlor-vhost itself, we have to check * if using fcgid or fpm for froxlor-vhost itself, we have to check
* whether the permission of the files are still correct * whether the permission of the files are still correct

7
lib/init.php
View File

@@ -144,13 +144,6 @@ if (get_magic_quotes_gpc()) {
unset($in); unset($in);
} }
/**
* Selects settings from MySQL-Table
* TODO remove when completely migrated to new Settings class
*/
$settings_data = loadConfigArrayDir('actions/admin/settings/');
$settings = loadSettings($settings_data);
/** /**
* SESSION MANAGEMENT * SESSION MANAGEMENT
*/ */