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

allow private networks in AXFR server list

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-02-27 20:02:46 +01:00
parent b05105bfdf
commit b67749bcdc
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/160.nameserver.php
View File

@@ -73,7 +73,7 @@ return array(
'settinggroup' => 'system', 'settinggroup' => 'system',
'varname' => 'axfrservers', 'varname' => 'axfrservers',
'type' => 'string', 'type' => 'string',
'string_type' => 'validate_ip', 'string_type' => 'validate_ip_incl_private',
'string_delimiter' => ',', 'string_delimiter' => ',',
'string_emptyallowed' => true, 'string_emptyallowed' => true,
'default' => '', 'default' => '',

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

@@ -116,6 +116,17 @@ function validateFormFieldString($fieldname, $fielddata, $newfieldvalue)
$returnvalue = ($newfieldvalue !== false ? true : 'invalidip'); $returnvalue = ($newfieldvalue !== false ? true : 'invalidip');
} }
} }
elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'validate_ip_incl_private') {
// check for empty value (it might be allowed)
if (trim($newfieldvalue) == '') {
$newfieldvalue = '';
$returnvalue = 'stringmustntbeempty';
} else {
$newfieldvalue = validate_ip2($newfieldvalue, true, true, 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;
} }