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

- first commit for upcoming multiserver-support :)

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-10-16 20:00:24 +00:00
parent 9fe6db8cd9
commit 3aff47d983
20 changed files with 401 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/functions/settings/function.loadSettings.php
View File

@@ -19,6 +19,11 @@
function loadSettings(&$settings_data, $db)
{
global $version;
// multi-server-support, get the destination server id (master = 0)
$server_id = getServerId();
$settings = array();
if(is_array($settings_data) && isset($settings_data['groups']) && is_array($settings_data['groups']))
@@ -31,11 +36,49 @@ function loadSettings(&$settings_data, $db)
{
if(isset($field_details['settinggroup']) && isset($field_details['varname']) && isset($field_details['default']))
{
$row = $db->query_first('SELECT `settinggroup`, `varname`, `value` FROM `' . TABLE_PANEL_SETTINGS . '` WHERE `settinggroup` = \'' . $db->escape($field_details['settinggroup']) . '\' AND `varname` = \'' . $db->escape($field_details['varname']) . '\' ');
$sql_query = 'SELECT
`settinggroup`, `varname`, `value`
FROM
`' . TABLE_PANEL_SETTINGS . '`
WHERE
`settinggroup` = \'' . $db->escape($field_details['settinggroup']) . '\'
AND
`varname` = \'' . $db->escape($field_details['varname']) . '\' ';
// since 0.9.14-svn7 we have $server_id for multi-server-support
// but versions before 0.9.14-svn7 don't have the `sid` field
// in panel_settings, so only append the condition if we're on
// 0.9.14-svn7 or higher
if(compareFroxlorVersion('0.9.14-svn7', $version))
{
$sql_query_sid = 'AND `sid` = \''. (int)$server_id . '\' ';
} else {
$sql_query_sid = '';
}
$row = $db->query_first($sql_query.$sql_query_sid);
if(!empty($row))
{
$varvalue = $row['value'];
}
elseif($server_id > 0)
{
// if we're a client (server_id > 0)
// and a setting is not found or not
// needed for clients, we get it from
// the master (server_id = 0)
$sql_query_sid = 'AND `sid` = \'0\' ';
$row = $db->query_first($sql_query.$sql_query_sid);
if(!empty($row))
{
$varvalue = $row['value'];
}
else
{
// default to array-default-value
$varvalue = $field_details['default'];
}
}
else
{
$varvalue = $field_details['default'];