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

- fix two TODO's where a second field has to be stuck next to the previous

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2011-02-24 10:07:38 +01:00
parent 6837852f52
commit ca9128bdbf
3 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/classes/output/class.htmlform.php
View File

@@ -48,22 +48,42 @@ class htmlform
}
eval("self::\$_form .= \"" . getTemplate("misc/form/table_section", "1") . "\";");
$nexto = false;
foreach($section['fields'] as $fieldname => $fielddata)
{
if(isset($fielddata['visible']) && $fielddata['visible'] === false)
{
continue;
}
$label = $fielddata['label'];
$desc = (isset($fielddata['desc']) ? $fielddata['desc'] : '');
$style = (isset($fielddata['style']) ? ' style="'.$fielddata['style'].'"' : '');
$mandatory = self::_getMandatoryFlag($fielddata);
$data_field = self::_parseDataField($fieldname, $fielddata);
$data_field = str_replace("\n", "", $data_field);
$data_field = str_replace("\t", "", $data_field);
eval("self::\$_form .= \"" . getTemplate("misc/form/table_row", "1") . "\";");
if ($nexto === false || (isset($fielddata['next_to']) && $nexto['field'] != $fielddata['next_to'])) {
$label = $fielddata['label'];
$desc = (isset($fielddata['desc']) ? $fielddata['desc'] : '');
$style = (isset($fielddata['style']) ? ' style="'.$fielddata['style'].'"' : '');
$mandatory = self::_getMandatoryFlag($fielddata);
$data_field = self::_parseDataField($fieldname, $fielddata);
$data_field = str_replace("\n", "", $data_field);
$data_field = str_replace("\t", "", $data_field);
if (isset($fielddata['has_nextto'])) {
$nexto = array('field' => $fieldname);
$data_field.='{NEXTTOFIELD_'.$fieldname.'}';
} else {
$nexto = false;
}
eval("self::\$_form .= \"" . getTemplate("misc/form/table_row", "1") . "\";");
} else {
$data_field = self::_parseDataField($fieldname, $fielddata);
$data_field = str_replace("\n", "", $data_field);
$data_field = str_replace("\t", "", $data_field);
$data_field = $fielddata['next_to_prefix'].$data_field;
self::$_form = str_replace(
'{NEXTTOFIELD_'.$fielddata['next_to'].'}',
$data_field,
self::$_form
);
$nexto = false;
}
}
}
}