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

allow more complex access-log formats to be displayed correctly on the UI, fixes #1139

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-06-12 10:39:04 +02:00
parent eda8700217
commit 257ef4c059
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actions/admin/settings/130.webserver.php
View File

@@ -181,7 +181,8 @@ return [
'label' => lng('serversettings.logfiles_format'), 'label' => lng('serversettings.logfiles_format'),
'settinggroup' => 'system', 'settinggroup' => 'system',
'varname' => 'logfiles_format', 'varname' => 'logfiles_format',
'type' => 'text', 'type' => (strpos(Settings::Get('system.logfiles_format'), '"') !== false ? 'textarea' : 'text'),
'string_regexp' => '/^[^\0\r\n<>]*$/i',
'default' => '', 'default' => '',
'string_emptyallowed' => true, 'string_emptyallowed' => true,
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',

2
lib/Froxlor/UI/Form.php
View File

@@ -232,7 +232,7 @@ class Form
if (((isset($fielddetails['visible']) && $fielddetails['visible']) || !isset($fielddetails['visible'])) && (!$only_enabledisable || ($only_enabledisable && isset($fielddetails['overview_option'])))) { if (((isset($fielddetails['visible']) && $fielddetails['visible']) || !isset($fielddetails['visible'])) && (!$only_enabledisable || ($only_enabledisable && isset($fielddetails['overview_option'])))) {
$newfieldvalue = self::getFormFieldData($fieldname, $fielddetails, $input); $newfieldvalue = self::getFormFieldData($fieldname, $fielddetails, $input);
if ($newfieldvalue != $fielddetails['value']) { if ($newfieldvalue != $fielddetails['value']) {
if (($error = \Froxlor\Validate\Form::validateFormField($fieldname, $fielddetails, $newfieldvalue)) != true) { if (($error = \Froxlor\Validate\Form::validateFormField($fieldname, $fielddetails, $newfieldvalue)) !== true) {
Response::standardError($error, $fieldname); Response::standardError($error, $fieldname);
} else { } else {
$changed_fields[$fieldname] = $newfieldvalue; $changed_fields[$fieldname] = $newfieldvalue;

6
lib/Froxlor/Validate/Form/Data.php
View File

@@ -319,7 +319,11 @@ class Data
{ {
$returnvalue = 'stringformaterror'; $returnvalue = 'stringformaterror';
if (preg_match('/^[^\0]*$/', $newfieldvalue)) { if (isset($fielddata['string_regexp']) && $fielddata['string_regexp'] != '') {
if (preg_match($fielddata['string_regexp'], $newfieldvalue)) {
$returnvalue = true;
}
} else if (preg_match('/^[^\0]*$/', $newfieldvalue)) {
$returnvalue = true; $returnvalue = true;
} }