Imported Upstream version 0.2.1

[roundcube.git] / program / include / rcube_smtp.inc

diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc
index 309d420c2c166639928ff748214fe641e8c5164a..f4995d8959dbe77fa37c52646ef3ba2fe1727722 100644 (file)
--- a/program/include/rcube_smtp.inc
+++ b/program/include/rcube_smtp.inc
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: rcube_smtp.inc 2155 2008-12-16 13:00:55Z alec $
+ $Id: rcube_smtp.inc 2291 2009-02-13 10:44:49Z alec $
 
 */
 
@@ -327,7 +327,7 @@ function smtp_parse_rfc822($recipients)
     $recipients = implode(', ', $recipients);
     
   $addresses = array();
-  $recipients = smtp_explode_quoted_str(",", $recipients);
+  $recipients = rcube_explode_quoted_string(',', $recipients);
   
   reset($recipients);
   while (list($k, $recipient) = each($recipients))
@@ -346,24 +346,4 @@ function smtp_parse_rfc822($recipients)
   return $addresses;
   }
 
-
-/**
- * @access private
- */
-function smtp_explode_quoted_str($delimiter, $string)
-  {
-  $quotes=explode("\"", $string);
-  while ( list($key, $val) = each($quotes))
-    if (($key % 2) == 1) 
-      $quotes[$key] = str_replace($delimiter, "_!@!_", $quotes[$key]);
-    $string=implode("\"", $quotes);
-  
-    $result=explode($delimiter, $string);
-    while (list($key, $val) = each($result))
-      $result[$key] = str_replace("_!@!_", $delimiter, $result[$key]);
-
-  return $result;
-  } 
-
-
 ?>