mirror/postfixadmin
0
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2024-09-19 19:22:14 +02:00
Code

revert "support unicode domain names - see #47"

Browse Source 
Unicode support is a much bigger can of worms (see the discussion in #47),
and having just a little part of unicode support in is a bad idea.

You can of course use the xn--whatever notation for unicode domains ;-)
This commit is contained in:
Christian Boltz 2017-06-22 20:48:07 +02:00
parent d2d066d13a
commit 64f1593818
No known key found for this signature in database
GPG Key ID: C6A682EA63C82F1C
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
functions.inc.php
View File

@ -199,13 +199,6 @@ function language_selector() {
* TODO: skip DNS check if the domain exists in PostfixAdmin?
*/
function check_domain ($domain) {
$orig = $domain;
if(function_exists('idn_to_ascii')) {
$domain = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
}
if (!preg_match ('/^([-0-9A-Z]+\.)+' . '([-0-9A-Z]){2,13}$/i', ($domain))) {
return sprintf(Config::lang('pInvalidDomainRegex'), htmlentities($domain));
}

9
setup.php
View File

@ -52,7 +52,6 @@ $f_session_start = function_exists ("session_start");
$f_preg_match = function_exists ("preg_match");
$f_mb_encode_mimeheader = function_exists ("mb_encode_mimeheader");
$f_imap_open = function_exists ("imap_open");
$f_intl_exists = function_exists('idn_to_ascii');
$file_config = file_exists (realpath ("./config.inc.php"));
@ -222,7 +221,6 @@ if ($f_sqlite_open == 1)
print "</li>";
}
//
// Database connection
//
@ -305,13 +303,6 @@ else
}
if($f_intl_exists == 1) {
print "<li>Optional: Unicode domain name support - OK</li>";
}
else {
// see inc.functions.php -> check_domain()
print "<li><b>Notice: php intl module - NOT FOUND</b><br/>Optional, to support unicode domain names, install php$phpversion-intl </li>";
}