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

Add logger to dump smtp dialog

Browse Source
This commit is contained in:
frederic34 2016-04-16 22:25:47 +02:00
parent 567dc1734e
commit 8428b791f8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -628,13 +628,20 @@ class CMailFile
// Create the Mailer using your created Transport // Create the Mailer using your created Transport
$this->mailer = Swift_Mailer::newInstance($this->transport); $this->mailer = Swift_Mailer::newInstance($this->transport);
//if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->mailer->setDebug(true); if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
// To use the ArrayLogger
$this->logger = new Swift_Plugins_Loggers_ArrayLogger();
// Or to use the Echo Logger
//$this->logger = new Swift_Plugins_Loggers_EchoLogger();
$this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
}
// send mail
try { try {
$result = $this->mailer->send($this->message); $result = $this->mailer->send($this->message);
} catch (Exception $e) { } catch (Exception $e) {
$this->error = $e->getMessage(); $this->error = $e->getMessage();
} }
//if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail(); if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
$res = true; $res = true;
if (! empty($this->error) && ! $result) { if (! empty($this->error) && ! $result) {
@ -728,6 +735,10 @@ class CMailFile
{ {
fputs($fp, $this->smtps->log); // this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on fputs($fp, $this->smtps->log); // this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
} }
elseif ($conf->global->MAIN_MAIL_SENDMODE == 'swiftmailer')
{
fputs($fp, $this->logger->dump()); // this->logger is filled only if MAIN_MAIL_DEBUG was set to on
}
fclose($fp); fclose($fp);
if (! empty($conf->global->MAIN_UMASK)) if (! empty($conf->global->MAIN_UMASK))