lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add oauth2 for swiftmailer

Browse Source
This commit is contained in:
Frédéric FRANCE 2022-08-10 10:09:52 +02:00
parent 32c617b786
commit 4237f902a3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/actions_sendmails.inc.php
View File

@ -427,9 +427,14 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
} else { } else {
$langs->load("other"); $langs->load("other");
$mesg = '<div class="error">'; $mesg = '<div class="error">';
if ($mailfile->error) { if (!empty($mailfile->error) || !empty($mailfile->errors)) {
$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto)); $mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
$mesg .= '<br>'.$mailfile->error; if (!empty($mailfile->error)) {
$mesg .= '<br>'.$mailfile->error;
}
if (!empty($mailfile->errors) && is_array($mailfile->errors)) {
$mesg .= '<br>'.implode('<br>', $mailfile->errors);
}
} else { } else {
$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto)); $mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) { if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {

6
htdocs/core/class/CMailFile.class.php
View File

@ -1008,16 +1008,16 @@ class CMailFile
try { try {
$result = $this->mailer->send($this->message, $failedRecipients); $result = $this->mailer->send($this->message, $failedRecipients);
} catch (Exception $e) { } catch (Exception $e) {
$this->error = $e->getMessage(); $this->errors[] = $e->getMessage();
} }
if (!empty($conf->global->MAIN_MAIL_DEBUG)) { if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
$this->dump_mail(); $this->dump_mail();
} }
$res = true; $res = true;
if (!empty($this->error) || !$result) { if (!empty($this->error) || !empty($this->errors) || !$result) {
if (!empty($failedRecipients)) { if (!empty($failedRecipients)) {
$this->error = 'Transport failed for the following addresses: "' . join('", "', $failedRecipients) . '".'; $this->errors[] = 'Transport failed for the following addresses: "' . join('", "', $failedRecipients) . '".';
} }
dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR); dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
$res = false; $res = false;