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

re-add old IDNA class so we do not have to force the php-5.6 requirement for froxlor

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-06-19 18:59:44 +02:00
parent 6c55a40606
commit 5789e9a8a4
6 changed files with 3489 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3464
lib/classes/idna/class.idna_convert.php Normal file
View File

File diff suppressed because it is too large Load Diff

26
lib/classes/idna/class.idna_convert_wrapper.php
View File

@@ -39,10 +39,12 @@ class idna_convert_wrapper
public function __construct()
{
// Instantiate it
//$this->idna_converter = new idna_convert(array('idn_version' => '2008', 'encode_german_sz' => false));
// use this when using new version of IdnaConverter (which does not work yet)
$this->idna_converter = new Mso\IdnaConvert\IdnaConvert();
if (version_compare("5.6.0", PHP_VERSION, ">=")) {
$this->idna_converter = new idna_convert(array('idn_version' => '2008', 'encode_german_sz' => false));
} else {
// use this when using new version of IdnaConverter (which does not work yet)
$this->idna_converter = new Mso\IdnaConvert\IdnaConvert();
}
}
/**
@@ -57,9 +59,12 @@ class idna_convert_wrapper
public function encode($to_encode)
{
$to_encode = $this->is_utf8($to_encode) ? $to_encode : utf8_encode($to_encode);
return $this->idna_converter->encode($to_encode);
//return $this->_do_action('encode', $to_encode);
if (version_compare("5.6.0", PHP_VERSION, ">=")) {
return $this->_do_action('encode', $to_encode);
} else {
$to_encode = $this->is_utf8($to_encode) ? $to_encode : utf8_encode($to_encode);
return $this->idna_converter->encode($to_encode);
}
}
/**
@@ -74,8 +79,11 @@ class idna_convert_wrapper
public function decode($to_decode)
{
return $this->idna_converter->decode($to_decode);
//return $this->_do_action('decode', $to_decode);
if (version_compare("5.6.0", PHP_VERSION, ">=")) {
return $this->_do_action('decode', $to_decode);
} else {
return $this->idna_converter->decode($to_decode);
}
}
/**