extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

only pass account_id of sender, if different from current user, to be able to use current users personal mail account

Browse Source 
(requiring his password!) and not the global SMTP only account
This commit is contained in:
ralf 2024-04-17 15:01:18 +02:00
parent 9d45da268e
commit 54e5365e0b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
notifications/inc/class.notifications_email.inc.php
View File

@ -65,7 +65,8 @@ class notifications_email implements notifications_iface {
* @param object $_config * @param object $_config
* @param object $_preferences * @param object $_preferences
*/ */
public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) { public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
{
if(!is_object($_sender)) { throw new Exception("no sender given."); } if(!is_object($_sender)) { throw new Exception("no sender given."); }
if(!is_object($_recipient)) { throw new Exception("no recipient given."); } if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
$this->sender = $_sender; $this->sender = $_sender;
@ -77,13 +78,19 @@ class notifications_email implements notifications_iface {
unset($this->mail); unset($this->mail);
} }
// only pass account_id of sender, if different from current user, to be able to use current users
// personal mail account (requiring his password!) and not the global SMTP only account
$called_for = null;
if (!empty($_sender->account_id) && $_sender->account_id != $GLOBALS['egw_info']['user']['account_id'])
{
$called_for = $_sender->account_id;
}
// Use configured mail account // Use configured mail account
$ident = null;
if(!empty($this->config->async_identity)) if(!empty($this->config->async_identity))
{ {
$ident = Api\Mail\Account::read($this->config->async_identity, $_sender->account_id ?? null); $ident = Api\Mail\Account::read($this->config->async_identity, $called_for);
} }
$this->mail = new Api\Mailer($ident, $_sender->account_id ?? null); $this->mail = new Api\Mailer($ident ?? null, $called_for);
} }
/** /**
@ -154,7 +161,8 @@ class notifications_email implements notifications_iface {
* @param boolean $_render_external * @param boolean $_render_external
* @return plain or html rendered link(s) as complete string * @return plain or html rendered link(s) as complete string
*/ */
private function render_links($_links = false, $_render_html = false, $_render_external = true) { private function render_links($_links = false, $_render_html = false, $_render_external = true)
{
if(!is_array($_links) || count($_links) == 0) { return false; } if(!is_array($_links) || count($_links) == 0) { return false; }
// provide defaults if given arguments are null // provide defaults if given arguments are null