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

fix broken tracker mailhandling caused by protected constructor

Browse Source 
also disable reading from DB, in case no (numeric) acc_id given, like from tracker mailhandling
This commit is contained in:
ralf 2022-03-30 10:57:41 +03:00
parent e7dc51ad14
commit 790f9b2ff9
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
api/src/Mail/Account.php
View File

@ -249,23 +249,27 @@ class Account implements \ArrayAccess
* @param int $called_for=null if set access to given user (without smtp credentials!), * @param int $called_for=null if set access to given user (without smtp credentials!),
* default current user AND read username/password from current users session * default current user AND read username/password from current users session
*/ */
protected function __construct(array $params, $called_for=null) public function __construct(array $params, $called_for=null)
{ {
// read credentials from database // tracker_mailhandling instantiates class without our database (acc_id==="tracker*")
$params += Credentials::read($params['acc_id'], null, $called_for ? array(0, $called_for) : $called_for, $this->on_login); if ((int)$params['acc_id'] > 0)
{
// read credentials from database
$params += Credentials::read($params['acc_id'], null, $called_for ? array(0, $called_for) : $called_for, $this->on_login);
if (!isset($params['notify_folders'])) if (!isset($params['notify_folders']))
{ {
$params += Notifications::read($params['acc_id'], $called_for ? array(0, $called_for) : $called_for); $params += Notifications::read($params['acc_id'], $called_for ? array(0, $called_for) : $called_for);
} }
if (!empty($params['acc_imap_logintype']) && empty($params['acc_imap_username']) && if (!empty($params['acc_imap_logintype']) && empty($params['acc_imap_username']) &&
$GLOBALS['egw_info']['user']['account_id'] && $GLOBALS['egw_info']['user']['account_id'] &&
(!isset($called_for) || $called_for == $GLOBALS['egw_info']['user']['account_id'])) (!isset($called_for) || $called_for == $GLOBALS['egw_info']['user']['account_id']))
{ {
// get usename/password from current user, let it overwrite credentials for all/no session // get usename/password from current user, let it overwrite credentials for all/no session
$params = Credentials::from_session( $params = Credentials::from_session(
(!isset($called_for) ? array() : array('acc_smtp_auth_session' => false)) + $params, !isset($called_for) (!isset($called_for) ? array() : array('acc_smtp_auth_session' => false)) + $params, !isset($called_for)
) + $params; ) + $params;
}
} }
$this->params = $params; $this->params = $params;
unset($this->imapServer); unset($this->imapServer);