extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve error handling on send, when invalid mailaddress is given

Browse Source
This commit is contained in:
Klaus Leithoff 2013-04-23 10:22:16 +00:00
parent 823e4c030e
commit fb0dc8d5be
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
felamimail/inc/class.bocompose.inc.php
View File

@ -989,7 +989,18 @@
} }
catch(phpmailerException $e) { catch(phpmailerException $e) {
$this->errorInfo = $e->getMessage(); $this->errorInfo = $e->getMessage();
#error_log($this->errorInfo); if ($mail->ErrorInfo) // use the complete mailer ErrorInfo, for full Information
{
if (stripos($mail->ErrorInfo, $this->errorInfo)===false)
{
$this->errorInfo = $mail->ErrorInfo.'<br>'.$this->errorInfo;
}
else
{
$this->errorInfo = $mail->ErrorInfo;
}
}
error_log(__METHOD__.__LINE__.array2string($this->errorInfo));
return false; return false;
} }
} else { } else {

2
phpgwapi/inc/class.phpmailer.inc.php
View File

@ -2035,7 +2035,7 @@ class PHPMailer {
$msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n"; $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
} }
} }
$this->ErrorInfo = $msg; if (empty($this->ErrorInfo) || strpos($this->ErrorInfo,$msg)===false) $this->ErrorInfo .= (empty($this->ErrorInfo)?'':'<br>').$msg;
} }
/** /**