Skip to content
Snippets Groups Projects
Commit 0e3cf6f5 authored by Marius Burkard's avatar Marius Burkard
Browse files

- use idn constants only if defined, fixes #4237

parent 7000d9bb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
interface/lib/classes/functions.inc.php
+ 10
− 2
View file @ 0e3cf6f5
...@@ -302,7 +302,11 @@ class functions { ...@@ -302,7 +302,11 @@ class functions {
if($encode == true) { if($encode == true) {
if(function_exists('idn_to_ascii')) { if(function_exists('idn_to_ascii')) {
$domain = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46); if(defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46') && constant('IDNA_NONTRANSITIONAL_TO_ASCII')) {
$domain = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
} else {
$domain = idn_to_ascii($domain);
}
} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) { } elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
/* use idna class: /* use idna class:
* @author Matthias Sommerfeld <mso@phlylabs.de> * @author Matthias Sommerfeld <mso@phlylabs.de>
...@@ -319,7 +323,11 @@ class functions { ...@@ -319,7 +323,11 @@ class functions {
} }
} else { } else {
if(function_exists('idn_to_utf8')) { if(function_exists('idn_to_utf8')) {
$domain = idn_to_utf8($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46); if(defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46') && constant('IDNA_NONTRANSITIONAL_TO_ASCII')) {
$domain = idn_to_utf8($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
} else {
$domain = idn_to_utf8($domain);
}
} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) { } elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
/* use idna class: /* use idna class:
* @author Matthias Sommerfeld <mso@phlylabs.de> * @author Matthias Sommerfeld <mso@phlylabs.de>
......
server/lib/classes/functions.inc.php
+ 10
− 2
View file @ 0e3cf6f5
...@@ -354,7 +354,11 @@ class functions { ...@@ -354,7 +354,11 @@ class functions {
if($encode == true) { if($encode == true) {
if(function_exists('idn_to_ascii')) { if(function_exists('idn_to_ascii')) {
$domain = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46); if(defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46') && constant('IDNA_NONTRANSITIONAL_TO_ASCII')) {
$domain = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
} else {
$domain = idn_to_ascii($domain);
}
} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) { } elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
/* use idna class: /* use idna class:
* @author Matthias Sommerfeld <mso@phlylabs.de> * @author Matthias Sommerfeld <mso@phlylabs.de>
...@@ -371,7 +375,11 @@ class functions { ...@@ -371,7 +375,11 @@ class functions {
} }
} else { } else {
if(function_exists('idn_to_utf8')) { if(function_exists('idn_to_utf8')) {
$domain = idn_to_utf8($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46); if(defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46') && constant('IDNA_NONTRANSITIONAL_TO_ASCII')) {
$domain = idn_to_utf8($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
} else {
$domain = idn_to_utf8($domain);
}
} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) { } elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
/* use idna class: /* use idna class:
* @author Matthias Sommerfeld <mso@phlylabs.de> * @author Matthias Sommerfeld <mso@phlylabs.de>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment