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

* Notification: instead of overwritting From address use ReplyTo

Browse Source 
as mail provider might not allow to have a From different from envelope sender
This commit is contained in:
Ralf Becker 2019-09-13 14:30:55 +02:00
parent c5ea1618af
commit 5621aeca53
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ class notifications_email implements notifications_iface {
* @param string $_subject * @param string $_subject
* @param array $_links * @param array $_links
* @param array $_attachments * @param array $_attachments
* @param array $_data * @param array $_data value for key "reply_to" to use a custom ReplyTo address
*/ */
public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false, $_data = false) public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false, $_data = false)
{ {
@ -102,10 +102,14 @@ class notifications_email implements notifications_iface {
//$this->mail->AddHeader('X-EGroupware-Tracker', 'notification-mail'); //$this->mail->AddHeader('X-EGroupware-Tracker', 'notification-mail');
//error_log(__METHOD__.__LINE__."preparing notification message via email.".array2string($this->mail)); //error_log(__METHOD__.__LINE__."preparing notification message via email.".array2string($this->mail));
$this->mail->setFrom($this->sender->account_email, $this->sender->account_fullname); if ( $_data && !empty( $_data['reply_to'] ) )
{
if ( $_data && isset( $_data['reply_to'] ) ) { $this->mail->addReplyTo($_data['reply_to']);
$this->mail->addAddress($_data['reply_to'], '', 'replyto'); }
// do NOT set sender as From, as this might not be allowed, set it instead as ReplyTo, if that one it not explicitly set already
elseif ($this->mail->getHeader('From') != Api\Mailer::add_personal($this->sender->account_email, $this->sender->account_fullname))
{
$this->mail->addReplyTo($this->sender->account_email, $this->sender->account_fullname);
} }
$this->mail->addHeader('Subject', trim($_subject)); // trim the subject to avoid strange wrong encoding problem $this->mail->addHeader('Subject', trim($_subject)); // trim the subject to avoid strange wrong encoding problem