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

Stop using Google Charts for the 2-Factor-Auth QR-Code (#1044)

Browse source
This commit is contained in:
RainLoop Team 2016-05-26 22:37:02 +03:00
parent 4988b276ad
commit 2fefad437e
15 changed files with 1802 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -6722,7 +6722,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
'IsSet' => false,
'Enable' => false,
'Secret' => '',
'Url' => '',
'UrlTitle' => '',
'BackupCodes' => ''
);
@ -6749,9 +6749,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
$aResult['Enable'] = isset($mData['Enable']) ? !!$mData['Enable'] : false;
$aResult['Secret'] = $mData['Secret'];
$aResult['BackupCodes'] = $mData['BackupCodes'];
$aResult['Url'] = $this->TwoFactorAuthProvider()->GetQRCodeGoogleUrl(
$aResult['User'], $aResult['Secret'], $this->Config()->Get('webmail', 'title', ''));
$aResult['UrlTitle'] = $this->Config()->Get('webmail', 'title', '');
}
if ($bRemoveSecret)
@ -6761,9 +6759,9 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
unset($aResult['Secret']);
}
if (isset($aResult['Url']))
if (isset($aResult['UrlTitle']))
{
unset($aResult['Url']);
unset($aResult['UrlTitle']);
}
if (isset($aResult['BackupCodes']))