- added 'smtp_debug' option

git-svn-id: https://svn.roundcube.net/trunk@2754 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 9 insertions, 0 deletions

diff --git a/roundcubemail/program/include/rcube_smtp.inc b/roundcubemail/program/include/rcube_smtp.inc
index db681af05..9e1e66426 100644
--- a/roundcubemail/program/include/rcube_smtp.inc
+++ b/roundcubemail/program/include/rcube_smtp.inc
@@ -92,6 +92,9 @@ function smtp_mail($from, $recipients, &$headers, &$body, &$response, &$error)
 
     $SMTP_CONN = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
 
+    if($RCMAIL->config->get('smtp_debug'))
+      $SMTP_CONN->setDebug(true, 'smtp_debug_handler');
+
     // try to connect to server and exit on failure
     $result = $SMTP_CONN->connect($smtp_timeout);
     if (PEAR::isError($result))
@@ -247,6 +250,12 @@ function smtp_disconnect()
     }
   }
 
+/* this is our own debug handler for the SMTP connection */
+function smtp_debug_handler(&$smtp, $message)
+  {
+  write_log('smtp', preg_replace('/\r\n$/', '', $message));
+  }
+
 
 /**
  * Take an array of mail headers and return a string containing