Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 10:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Back to old ownCloud package

Browse source 
Fix idn encoder
Small fixes
This commit is contained in:
RainLoop Team 2014-06-03 19:59:00 +04:00
parent 9fed380992
commit be45d989f8
44 changed files with 964 additions and 522 deletions
Download patch file Download diff file Expand all files Collapse all files

31
rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php
View file

@ -1970,7 +1970,7 @@ class Utils
static $oIdn = null;
if (null === $oIdn)
{
include_once MAILSO_LIBRARY_ROOT_PATH.'Vendors/NET/IDNA2.php';
include_once MAILSO_LIBRARY_ROOT_PATH.'Vendors/Net/IDNA2.php';
$oIdn = new \Net_IDNA2();
}
@ -1978,37 +1978,44 @@ class Utils
}
/**
* @param string $sDomain
* @param string $sStr
* @param bool $bLowerIfAscii = false
*
* @return string
*/
public static function IdnToUtf8($sDomain, $bLowerIfAscii = false)
public static function IdnToUtf8($sStr, $bLowerIfAscii = false)
{
if ($sDomain && \preg_match('/(^|\.)xn--/i', $sDomain))
if (0 < \strlen($sStr) && \preg_match('/(^|\.)xn--/i', $sStr))
{
try
{
$sDomain = self::idn()->decode($sDomain);
$sStr = self::idn()->decode($sStr);
}
catch (\Exception $oException) {}
}
$sDomain = $bLowerIfAscii ? \MailSo\Base\Utils::StrToLowerIfAscii($sDomain) : $sDomain;
return $sDomain;
return $bLowerIfAscii ? \MailSo\Base\Utils::StrToLowerIfAscii($sStr) : $sStr;
}
/**
* @param string $sDomain
* @param string $sStr
* @param bool $bLowerIfAscii = false
*
* @return string
*/
public static function IdnToAscii($sDomain, $bLowerIfAscii = false)
public static function IdnToAscii($sStr, $bLowerIfAscii = false)
{
$sDomain = $bLowerIfAscii ? \MailSo\Base\Utils::StrToLowerIfAscii($sDomain) : $sDomain;
$sStr = $bLowerIfAscii ? \MailSo\Base\Utils::StrToLowerIfAscii($sStr) : $sStr;
$sUser = '';
$sDomain = $sStr;
if (false !== \strpos($sStr, '@'))
{
$sUser = \MailSo\Base\Utils::GetAccountNameFromEmail($sStr);
$sDomain = \MailSo\Base\Utils::GetDomainFromEmail($sStr);
}
if ($sDomain && \preg_match('/[^\x20-\x7E]/', $sDomain))
if (0 < \strlen($sDomain) && \preg_match('/[^\x20-\x7E]/', $sDomain))
{
try
{
@ -2017,6 +2024,6 @@ class Utils
catch (\Exception $oException) {}
}
return $sDomain;
return ('' === $sUser ? '' : $sUser.'@').$sDomain;
}
}