Changeset 3262 for branches/2.0/include

Timestamp:

Apr 26, 2009, 8:36:17 PM (16 years ago)

Author:

rub

Message:

merge -c3261 from trunk to branch 2.0

Resolved issue 0000977: Error on sendmail with smtp

File:

• branches/2.0/include/class_smtp_mail.inc.php (modified) (3 diffs)

branches/2.0/include/class_smtp_mail.inc.php

@@ -74 +74 @@
   }
 
+  function add_recipients(&$recipients, $headers, $type_header)
+  {
+    if (preg_match('/^\s*'.$type_header.'\s*:.*/mi', $headers, $matches) != 0)
+    {
+      $list = explode(',', $matches[0]);
+      foreach ($list as $email)
+      {
+        if (strpos($email, '<') !== false)
+        {
+           $email = preg_replace('/.*<(.*)>.*/i', '$1', $email);
+        }
+        $recipients[] = trim($email);
+      }
+    }
+  }
+
   // Adaptation of pun_mail
   function mail($to, $subject, $message, $headers = '')
   {
     $this->no_error = true;
-
-    $recipients = explode(',', $to);
 
     // Are we using port 25 or a custom port?
@@ -119 +133 @@
       $this->server_parse('250');
 
-      if (preg_match('/^\s*to\s*:.*/mi', $headers) === 0)
+      if ((preg_match('/^\s*to\s*:.*/mi', $headers) === 0) and !empty($to))
       {
-        $to_header = 'To:'.implode(',', array_map(create_function('$email','return "<".$email.">";'), $recipients));
+        $to_header = 'To:'.implode(',', array_map(create_function('$email','return "<".$email.">";'), explode(',', $to)));
       }
       else
@@ -127 +141 @@
         $to_header = '';
       }
+
+      if (!empty($to))
+      {
+        $recipients = explode(',', $to);
+      }
+      else
+      {
+        $recipients = array();
+      }
+
+      $this->add_recipients($recipients, $headers, 'Cc');
+      $this->add_recipients($recipients, $headers, 'Bcc');
 
       @reset($recipients);