holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail/OAuth: fix mail account creation failed for regular EGroupware users / non-admins

Browse Source
This commit is contained in:
ralf 2023-02-20 15:36:52 +01:00
parent 188334d647
commit 178047d8d6
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
admin/inc/class.admin_mail.inc.php
View File

@ -1570,9 +1570,16 @@ class admin_mail
}
$content['acc_oauth_access_token'] = $oidc->getAccessToken();
$GLOBALS['egw_info']['flags']['currentapp'] = 'admin';
$obj = new self;
if (empty($GLOBALS['egw_info']['user']['apps']['admin']))
{
$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';
$obj = new mail_wizard();
}
else
{
$GLOBALS['egw_info']['flags']['currentapp'] = 'admin';
$obj = new self;
}
unset($content['oauth_failure']);
if (!empty($content['acc_id']))
{
@ -1593,9 +1600,16 @@ class admin_mail
*/
public static function oauthFailure(Throwable $exception=null, array $content)
{
$GLOBALS['egw_info']['flags']['currentapp'] = 'admin';
$obj = new self;
if (empty($GLOBALS['egw_info']['user']['apps']['admin']))
{
$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';
$obj = new mail_wizard();
}
else
{
$GLOBALS['egw_info']['flags']['currentapp'] = 'admin';
$obj = new self;
}
$content['oauth_failure'] = $exception ?: true;
if (!empty($content['acc_id']))
{