Changeset 3837 in subversion for trunk/roundcubemail/program/lib/Mail/mime.php

Timestamp:

Jul 29, 2010 2:50:19 AM (3 years ago)

Author:

alec

Message:

• Mail-Mime-1.8.0

File:

• trunk/roundcubemail/program/lib/Mail/mime.php (modified) (4 diffs)

trunk/roundcubemail/program/lib/Mail/mime.php

@@ -843 +843 @@
         if (isset($this->_headers['From'])) {
             // Bug #11381: Illegal characters in domain ID
-            if (preg_match("|(@[0-9a-zA-Z\-\.]+)|", $this->_headers['From'], $matches)) {
+            if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->_headers['From'], $matches)) {
                 $domainID = $matches[1];
             } else {
-                $domainID = "@localhost";
+                $domainID = '@localhost';
             }
             foreach ($this->_html_images as $i => $img) {
-                $cid = $this->_html_images[$i]['cid'];
+                $cid = $this->_html_images[$i]['cid']; 
                 if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
                     $this->_html_images[$i]['cid'] = $cid . $domainID;
@@ -996 +996 @@
             return $ret;
         }
-        
+
         // Use saved boundary
         if (!empty($this->_build_params['boundary'])) {
@@ -1156 +1156 @@
         if (preg_match('/^multipart\//i', $type)) {
             if (empty($this->_build_params['boundary'])) {
-                $this->_build_params['boundary'] = '=_' . md5(rand() . microtime());              
+                $this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
             }
 
@@ -1189 +1189 @@
     {
         $this->_headers['From'] = $email;
+    }
+
+    /**
+     * Add an email to the To header
+     * (multiple calls to this method are allowed)
+     *
+     * @param string $email The email direction to add
+     *
+     * @return void
+     * @access public
+     */
+    function addTo($email)
+    {
+        if (isset($this->_headers['To'])) {
+            $this->_headers['To'] .= ", $email";
+        } else {
+            $this->_headers['To'] = $email;
+        }
     }