Changeset 2284 for trunk/include/class_smtp_mail.inc.php

Timestamp:

Mar 18, 2008, 11:02:33 PM (16 years ago)

Author:

rub

Message:

Resolved issue 0000815: Email format standardization

Merge branch-1_7 2282:2283 into BSF

File:

• trunk/include/class_smtp_mail.inc.php (modified) (4 diffs)

trunk/include/class_smtp_mail.inc.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | file          : $Id$
@@ -122 +122 @@
       $this->server_parse('250');
 
-      $to_header = 'To: ';
+      if (preg_match('/^\s*to\s*:.*/mi', $headers) === 0)
+      {
+        $to_header = 'To: '.implode(',', array_map(create_function('$email','return "<".$email.">";'), $recipients));
+      }
+      else
+      {
+        $to_header = '';
+      }
 
       @reset($recipients);
@@ -129 +136 @@
         $this->server_write('RCPT TO: <'.$email.'>'."\r\n");
         $this->server_parse('250');
-
-        $to_header .= '<'.$email.'>, ';
       }
 
@@ -136 +141 @@
       $this->server_parse('354');
 
-      $this->server_write('Subject: '.$subject."\r\n".$to_header."\r\n".$headers."\r\n\r\n".$message."\r\n");
+      $this->server_write('Subject: '.$subject."\r\n".(empty($to_header) ? "" : $to_header."\r\n").$headers."\r\n\r\n".$message."\r\n");
       $this->server_write('.'."\r\n");
       $this->server_parse('250');