Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-10 06:58:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix idn decoding (#1175)

Browse source
This commit is contained in:
RainLoop Team 2016-09-13 20:02:51 +03:00
parent e5af98b04b
commit 1e287f486d
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2428,6 +2428,7 @@ END;
{
include_once MAILSO_LIBRARY_ROOT_PATH.'Vendors/Net/IDNA2.php';
$oIdn = new \Net_IDNA2();
$oIdn->setParams('utf8', true);
}
return $oIdn;
@ -2441,7 +2442,7 @@ END;
*/
public static function IdnToUtf8($sStr, $bLowerIfAscii = false)
{
if (0 < \strlen($sStr) && \preg_match('/(^|\.)xn--/i', $sStr))
if (0 < \strlen($sStr) && \preg_match('/(^|\.|@)xn--/i', $sStr))
{
try
{