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

dont try to send if there is no smtpAccount

Browse Source
This commit is contained in:
Klaus Leithoff 2015-04-21 14:23:59 +00:00
parent 52a0c998ee
commit abd6800a89
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/inc/class.egw_mailer.inc.php
View File

@ -444,6 +444,11 @@ class egw_mailer extends Horde_Mime_Mail
try
{
$smtpAcc = emailadmin_account::get_default(true,false,false);
if (!$smtpAcc)
{
error_log(__METHOD__.__LINE__.'#'." Error: no SMTP Account available for ".__METHOD__);
return false;
}
//error_log(__METHOD__.__LINE__.'#'.array2string($smtpAcc));
$mail = new egw_mailer($smtpAcc);
$method = array();
@ -493,7 +498,7 @@ class egw_mailer extends Horde_Mime_Mail
}
}
$mail->setFrom($from, $FromName);
$mail->setFrom($from, $FromName);
$mail->addHeader('Subject', trim($subject)); // trim the subject to avoid strange wrong encoding problem
if ($sender) $mail->addHeader('Return-Path', '<'.$sender.'>', true);
if ($msgtype) $mail->addHeader('X-eGW-Type',$msgtype);