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

fix validation of system-hostname setting, thx to lando

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-06-07 15:04:51 +02:00
parent f1eb5420a7
commit 74b71bb926
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/functions/formfields/function.getFormFieldData.php
View File

@@ -39,5 +39,5 @@ function getFormFieldData($fieldname, $fielddata, &$input)
} }
} }
return $newfieldvalue; return trim($newfieldvalue);
} }

5
lib/functions/validate/function.checkHostname.php
View File

@@ -17,8 +17,9 @@
function checkHostname($fieldname, $fielddata, $newfieldvalue, $allnewfieldvalues) function checkHostname($fieldname, $fielddata, $newfieldvalue, $allnewfieldvalues)
{ {
if (0 == strlen(trim($newfieldvalue))) if (0 == strlen(trim($newfieldvalue))
{ || validateDomain($newfieldvalue) === false
) {
return array(FORMFIELDS_PLAUSIBILITY_CHECK_ERROR, 'invalidhostname'); return array(FORMFIELDS_PLAUSIBILITY_CHECK_ERROR, 'invalidhostname');
} else { } else {
return array(FORMFIELDS_PLAUSIBILITY_CHECK_OK); return array(FORMFIELDS_PLAUSIBILITY_CHECK_OK);

2
lib/functions/validate/function.validateDomain.php
View File

@@ -22,7 +22,7 @@
* it consists only of the following characters ([a-z0-9][a-z0-9\-]+\.)+[a-z]{2,4} * it consists only of the following characters ([a-z0-9][a-z0-9\-]+\.)+[a-z]{2,4}
* *
* @param string The domainname which should be checked. * @param string The domainname which should be checked.
* @return boolean True if the domain is valid, false otherwise * @return string|boolean the domain-name if the domain is valid, false otherwise
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org>
* @author Michael Duergner * @author Michael Duergner
* *