|
@@ -808,7 +808,7 @@ discard block |
|
|
block discarded – undo |
|
808
|
808
|
unset($localTmp); |
|
809
|
809
|
|
|
810
|
810
|
// https://git.ispconfig.org/ispconfig/ispconfig3/blob/master/interface/lib/classes/functions.inc.php#L305 |
|
811
|
|
- if(defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46') && constant('IDNA_NONTRANSITIONAL_TO_ASCII')) { |
|
|
811
|
+ if (defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46') && constant('IDNA_NONTRANSITIONAL_TO_ASCII')) { |
|
812
|
812
|
$domainTmp = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46); |
|
813
|
813
|
} else { |
|
814
|
814
|
$domainTmp = idn_to_ascii($domain); |
|
@@ -840,10 +840,10 @@ discard block |
|
|
block discarded – undo |
|
840
|
840
|
} |
|
841
|
841
|
|
|
842
|
842
|
if ($quoteHelperForIdn === true) { |
|
843
|
|
- $local = '"' . $local . '"'; |
|
|
843
|
+ $local = '"'.$local.'"'; |
|
844
|
844
|
} |
|
845
|
845
|
|
|
846
|
|
- $email = $local . '@' . $domain; |
|
|
846
|
+ $email = $local.'@'.$domain; |
|
847
|
847
|
|
|
848
|
848
|
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { |
|
849
|
849
|
return false; |
|
@@ -928,7 +928,7 @@ discard block |
|
|
block discarded – undo |
|
928
|
928
|
public static function isDnsError($domain) |
|
929
|
929
|
{ |
|
930
|
930
|
if (function_exists('checkdnsrr')) { |
|
931
|
|
- return !checkdnsrr($domain . '.', 'MX') || !checkdnsrr($domain, 'A'); |
|
|
931
|
+ return !checkdnsrr($domain.'.', 'MX') || !checkdnsrr($domain, 'A'); |
|
932
|
932
|
} |
|
933
|
933
|
|
|
934
|
934
|
throw new \Exception(' Can\'t call checkdnsrr'); |
Please login to merge, or discard this patch.