the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-02-22 13:53:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix UrlSafeBase64Encode function

Browse source
This commit is contained in:
RainLoop Team 2016-08-31 22:00:48 +03:00
parent 6b1fd1239f
commit 969f15dd6b
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1721,7 +1721,7 @@ END;
*/
public static function UrlSafeBase64Encode($sValue)
{
return \str_replace(array('+', '/', '='), array('-', '_', '.'), \base64_encode($sValue));
return \rtrim(\strtr(\base64_encode(\trim($sValue)), '+/', '-_'), '=');
}
/**
@ -1731,14 +1731,8 @@ END;
*/
public static function UrlSafeBase64Decode($sValue)
{
$sData = \str_replace(array('-', '_', '.'), array('+', '/', '='), $sValue);
$sMode = \strlen($sData) % 4;
if ($sMode)
{
$sData .= \substr('====', $sMode);
}
return \MailSo\Base\Utils::Base64Decode($sData);
$sValue = \rtrim(\strtr($sValue, '-_.', '+/='), '=');
return \MailSo\Base\Utils::Base64Decode(\str_pad($sValue, \strlen($sValue) % 4, '=', STR_PAD_RIGHT));
}
/**