Changeset 7273 for sandbox/2.4.3-expresso-rest/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

09/21/12 16:02:43 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #3093 - Merge do trunk( expresso 2.4 ) para o sandbox( expresso 2.4.3)

Location:

sandbox/2.4.3-expresso-rest

Files:

• . (modified) (1 prop)
• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)

sandbox/2.4.3-expresso-rest/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -2834 +2834 @@
             } else {
                 //Compatibilização com Outlook, ao encaminhar a mensagem
-                $body = mb_ereg_replace('<!--\[', '<!-- [', $params['body']);
+                $body = mb_ereg_replace('<!--\[', '<!-- [', $params['body']);                           
+                                $body = str_replace("&lt;","&yzwkx;",$body); //Alterar as Entities padrão das tags < > para compatibilizar com o Expresso
+                                $body = str_replace("&gt;","&xzwky;",$body);
                 $body = str_replace("%nbsp;","&nbsp;",$body);
                 //$body = preg_replace("/\n/"," ",$body);
                 //$body = preg_replace("/\r/","" ,$body);
                 $body = html_entity_decode ( $body, ENT_QUOTES , 'ISO-8859-1' );        
+                                $body = str_replace("&yzwkx;","&lt;",$body);
+                                $body = str_replace("&xzwky;","&gt;",$body);
             }
 
@@ -3641 +3645 @@
         return $returns;
 }
+    function verify_disposition_notification($msg){
+        $header = imap_fetchheader($this->mbox, $msg, FT_UID);
+        $pattern = '/^[ \t]*Disposition-Notification-To:.*/mi';
+        if (preg_match($pattern, $header, $fields))
+            return true;
+        else
+            return false;
+    }
+
         function set_messages_flag($params)
         {               
@@ -3667 +3680 @@
                         $msgs = explode(",",$msgs_to_set);
                         foreach($msgs as $men){
-                                if (imap_setflag_full($this->mbox, $men, "\\Seen", ST_UID))
-                                        $return["msgs_to_set"] .= $men.",";
-                                else
-                                        $return["msgs_not_to_set"] .= $men.",";
+
+                if($this->verify_disposition_notification($men)){
+
+                    if(!array_key_exists('disposition_notification_to', $return))
+                        $return['disposition_notification_to'] = array();
+
+                    $return["disposition_notification_to"][] = $men;
+                }else{
+                    if (imap_setflag_full($this->mbox, $men, "\\Seen", ST_UID))
+                        $return["msgs_to_set"] .= $men.",";
+                    else
+                        $return["msgs_not_to_set"] .= $men.",";
+                }
                         }
                         $return["status"] = true;