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

respect possible empty-value when validating string::validate_ip

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-02-12 13:02:50 +01:00
parent df3b97c5dd
commit 37ca78913c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/functions/formfields/string/function.validateFormFieldString.php
View File

@@ -107,8 +107,14 @@ function validateFormFieldString($fieldname, $fielddata, $newfieldvalue)
} }
} }
elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'validate_ip') { elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'validate_ip') {
$newfieldvalue = validate_ip2($newfieldvalue); // check for empty value (it might be allowed)
$returnvalue = ($newfieldvalue !== false ? true : 'invalidip'); if (trim($newfieldvalue) == '') {
$newfieldvalue = '';
$returnvalue = 'stringmustntbeempty';
} else {
$newfieldvalue = validate_ip2($newfieldvalue, true);
$returnvalue = ($newfieldvalue !== false ? true : 'invalidip');
}
} }
elseif (preg_match('/^[^\r\n\t\f\0]*$/D', $newfieldvalue)) { elseif (preg_match('/^[^\r\n\t\f\0]*$/D', $newfieldvalue)) {
$returnvalue = true; $returnvalue = true;