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

Reverting the multiserver-stuff, we'll do this inside the branch

Browse Source
This commit is contained in:
Florian Aders (EleRas)
2010-10-23 10:20:23 +00:00
parent 99696ff6cb
commit ad31b07a04
32 changed files with 169 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/functions/formfields/function.buildFormEx.php
View File

@@ -15,7 +15,7 @@
* @version $Id $
*/
function buildFormEx($form, $part = '', $server_id = 0)
function buildFormEx($form, $part = '')
{
$fields = '';
@@ -28,7 +28,7 @@ function buildFormEx($form, $part = '', $server_id = 0)
{
if(isset($groupdetails['title']) && $groupdetails['title'] != '')
{
$fields .= getFormOverviewGroupOutput($groupname, $groupdetails, $server_id);
$fields .= getFormOverviewGroupOutput($groupname, $groupdetails);
}
}
// only show one section
@@ -38,7 +38,7 @@ function buildFormEx($form, $part = '', $server_id = 0)
{
$fields .= getFormGroupOutput($groupname, $groupdetails);
}
if(validateFieldDefinition($groupdetails))
{
// Prefetch form fields
@@ -47,7 +47,7 @@ function buildFormEx($form, $part = '', $server_id = 0)
$groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails));
$form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname];
}
// Collect form field output
foreach($groupdetails['fields'] as $fieldname => $fielddetails)
{

26
lib/functions/formfields/function.getFormGroupOutput.php
View File

@@ -24,7 +24,7 @@ function getFormGroupOutput($groupname, $groupdetails)
return $group;
}
function getFormOverviewGroupOutput($groupname, $groupdetails, $server_id = 0)
function getFormOverviewGroupOutput($groupname, $groupdetails)
{
global $lng, $settings, $filename, $s;
@@ -63,34 +63,14 @@ function getFormOverviewGroupOutput($groupname, $groupdetails, $server_id = 0)
}
else
{
if(isset($fielddetails['disabled']) && $fielddetails['disabled'] == true)
{
$d = true;
$option.='<span class="strikethrough">';
} else {
$d = false;
}
$option.= $lng['admin']['activated'].':&nbsp;';
$option.= makeyesno($fieldname, '1', '0', $settings[$fielddetails['settinggroup']][$fielddetails['varname']], $d);
if($d) {
$option.='</span>';
}
$option.= makeyesno($fieldname, '1', '0', $settings[$fielddetails['settinggroup']][$fielddetails['varname']]);
$activated = (int)$settings[$fielddetails['settinggroup']][$fielddetails['varname']];
}
}
}
}
// if the server_id is > 0 then
// this is a client-settings page
// and we need another template
if($server_id > 0)
{
eval("\$group = \"" . getTemplate("froxlorclients/froxlorclient_settingsoverviewgroup") . "\";");
}
else
{
eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";");
}
eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";");
return $group;
}

4
lib/functions/formfields/function.processForm.php
View File

@@ -144,7 +144,7 @@ function processForm(&$form, &$input, $url_params = array())
}
}
function processFormEx(&$form, &$input, $url_params = array(), $part, $settings_all, $settings_part, $only_enabledisable, $server_id = 0)
function processFormEx(&$form, &$input, $url_params = array(), $part, $settings_all, $settings_part, $only_enabledisable)
{
if(validateFormDefinition($form))
{
@@ -287,7 +287,7 @@ function processFormEx(&$form, &$input, $url_params = array(), $part, $settings_
) {
if(isset($changed_fields[$fieldname]))
{
if(($saved_field = saveFormField($fieldname, $fielddetails, manipulateFormFieldData($fieldname, $fielddetails, $changed_fields[$fieldname]), $server_id)) !== false)
if(($saved_field = saveFormField($fieldname, $fielddetails, manipulateFormFieldData($fieldname, $fielddetails, $changed_fields[$fieldname]))) !== false)
{
$saved_fields = array_merge($saved_fields, $saved_field);
}

4
lib/functions/formfields/function.saveFormField.php
View File

@@ -17,12 +17,12 @@
* @version $Id$
*/
function saveFormField($fieldname, $fielddata, $newfieldvalue, $server_id = 0)
function saveFormField($fieldname, $fielddata, $newfieldvalue)
{
$returnvalue = '';
if(is_array($fielddata) && isset($fielddata['save_method']) && $fielddata['save_method'] != '' && function_exists($fielddata['save_method']))
{
$returnvalue = call_user_func($fielddata['save_method'], $fieldname, $fielddata, $newfieldvalue, $server_id);
$returnvalue = call_user_func($fielddata['save_method'], $fieldname, $fielddata, $newfieldvalue);
}
elseif(is_array($fielddata) && !isset($fielddata['save_method']))
{