Changeset 1686 in subversion

Timestamp:

Aug 28, 2008 3:40:35 AM (5 years ago)

Author:

alec

Message:

• Write to log also sent MDN confirmation messages

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/func.inc (modified) (2 diffs)
• program/steps/mail/sendmail.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -6 +6 @@
 - Added options to use syslog instead of log file (#1484850)
 - Added Logging & Debugging section in Installer
+- Write to smtp log also sent MDN confirmations
 
 2008/08/26 (alec)

trunk/roundcubemail/program/steps/mail/func.inc

@@ -1077 +1077 @@
   $msg_body = $message->get();
   $headers = $message->headers();
-  
+
   // send thru SMTP server using custom SMTP library
   if ($CONFIG['smtp_server'])
@@ -1123 +1123 @@
     }
   
-  if ($sent)  // remove MDN headers after sending
+  if ($sent)
+  {
+    // remove MDN headers after sending
     unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);
+    
+    if ($CONFIG['smtp_log'])
+      write_log('sendmail', sprintf("[%s] User: %d on %s; Message for %s; %s",
+                date("d-M-Y H:i:s O", mktime()),
+                $_SESSION['user_id'],
+                $_SERVER['REMOTE_ADDR'],
+                $mailto,
+                !empty($smtp_response) ? join('; ', $smtp_response) : ''));
+  }
   
   $message->_headers = array();

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -419 +419 @@
 else
   {
-  if ($CONFIG['smtp_log'])
-    {
-    write_log('sendmail', sprintf(
-      "[%s] User: %d on %s; Message for %s; %s\n",
-      date("d-M-Y H:i:s O", mktime()),
-      $_SESSION['user_id'],
-      $_SERVER['REMOTE_ADDR'],
-      $mailto,
-      !empty($smtp_response) ? join('; ', $smtp_response) : ''));
-    }
-
   rcmail_compose_cleanup();