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

Merge remote-tracking branch 'origin/master' into dns-editor

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2016-05-18 10:31:05 +02:00
parent 1ce5cf6c00 eb70e619c9
commit 477c99b4de
5 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
admin_domains.php
View File

@@ -282,10 +282,23 @@ if ($page == 'domains' || $page == 'overview') {
standard_error('admin_domain_emailsystemhostname');
}
if (strpos($_POST['domain'], '--') !== false) {
standard_error('domain_nopunycode');
}
$domain = $idna_convert->encode(preg_replace(array(
'/\:(\d)+$/',
'/^https?\:\/\//'
), '', validate($_POST['domain'], 'domain')));
// Check whether domain validation is enabled and if, validate the domain
if (Settings::Get('system.validate_domain') && ! validateDomain($domain)) {
standard_error(array(
'stringiswrong',
'mydomain'
));
}
$subcanemaildomain = intval($_POST['subcanemaildomain']);
$isemaildomain = 0;
@@ -679,12 +692,6 @@ if ($page == 'domains' || $page == 'overview') {
'stringisempty',
'mydomain'
));
} // Check whether domain validation is enabled and if, validate the domain
elseif (Settings::Get('system.validate_domain') && ! validateDomain($domain)) {
standard_error(array(
'stringiswrong',
'mydomain'
));
} elseif ($documentroot == '') {
standard_error(array(
'stringisempty',