Changeset 2978 for branches

Timestamp:

06/29/10 16:20:56 (14 years ago)

Author:

niltonneto

Message:

Ticket #1123 - Corrigido problema na RegExp? que trata confirmação de leitura.

File:

• branches/2.0/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)

branches/2.0/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -453 +453 @@
             $return['signature']        = $return_get_body['signature'];
         }
-                $pattern = '/^[ \t]*Disposition-Notification-To(^:)*:(.+)*@(.+)*$/isUm';
+                $pattern = '/^[ \t]*Disposition-Notification-To:[ ]*<?[[:alnum:]\._-]+@[[:alnum:]_-]+[\.[:alnum:]]+>?/sm';
                 if (preg_match($pattern, $header_, $fields))
                 {
-                        preg_match('/[[:alnum:]\._\-]+@[[:alnum:]_\-\.]+/',$fields[0], $matches);
-                        $return['DispositionNotificationTo'] = "<".$matches[0].">";
+                        if(preg_match('/[[:alnum:]\._\-]+@[[:alnum:]_\-\.]+/',$fields[0], $matches)){
+                                $return['DispositionNotificationTo'] = "<".$matches[0].">";
+                        }
                 }