Now we can handle nested parenthesis :)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5095 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/mime/Rfc822Header.class.php b/class/mime/Rfc822Header.class.php
index eedcc36749cff700d6eb9cf59d5829af5f3b88a1..4c3015bc31fde354036589466082148246cb16c2 100644 (file)
--- a/class/mime/Rfc822Header.class.php
+++ b/class/mime/Rfc822Header.class.php
@@ -211,10 +211,10 @@ class Rfc822Header {
     function getAddressTokens($address) {
         $aTokens = array();
         $aAddress = array();
-        $iCnt = strlen($address);
         $aSpecials = array('(' ,'<' ,',' ,';' ,':');
         $aReplace =  array(' (',' <',' ,',' ;',' :');
         $address = str_replace($aSpecials,$aReplace,$address);
+        $iCnt = strlen($address);
         $i = 0;
         while ($i < $iCnt) {
             $cChar = $address{$i};
@@ -251,8 +251,31 @@ class Rfc822Header {
                     $sToken = substr($address,$i);
                     $i = $iCnt;
                 } else {
-                    $sToken = substr($address,$i,$iEnd - $i + 1);
-                    $i = $iEnd;
+                    $iDepth = 1;
+                    $iComment = $i;
+                    while (($iDepth > 0) && (++$iComment < $iCnt)) {
+                        $cCharComment = $address{$iComment};
+                        switch($cCharComment) {
+                            case '\\':
+                                ++$iComment;
+                                break;
+                            case '(':
+                                ++$iDepth;
+                                break;
+                            case ')':
+                                --$iDepth;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    if ($iDepth == 0) {
+                        $sToken = substr($address,$i,$iComment - $i +1);
+                        $i = $iComment;
+                    } else {
+                        $sToken = substr($address,$i,$iEnd - $i + 1);
+                        $i = $iEnd;
+                    }
                 }
                 $sToken = str_replace($aReplace, $aSpecials,$sToken);
                 $aTokens[] = $sToken;