Ticket #783: r5-r6-#2_#783.diff

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -428 +428 @@
                 $return_get_body = $this->get_body_msg($msg_number, $msg_folder);
                 
                 $body = $return_get_body['body'];
-                //Remoção de tags <span></span> para correção de erro no firefox
-                $body = mb_eregi_replace("<span><span>","",$body);
-                $body = mb_eregi_replace("</span></span>","",$body);
                 
                 if($return_get_body['body']=='isCripted'){
                         $exporteml = new ExportEml();
@@ -1075 +1072 @@
                 $tag_list = Array('head','blink','object','frame',
                         'iframe','layer','ilayer','plaintext','script',
                         'applet','embed','frameset','xml','xmp','style');
-
+                
                 $blocked_tags = array();
                 foreach($tag_list as $index => $tag) {
                         $new_body = @mb_eregi_replace("<$tag", "<!--$tag", $body);
@@ -1084 +1081 @@
                         }
                         $body = @mb_eregi_replace("</$tag>", "</$tag-->", $new_body);
                 }
+
                 // Malicious Code Remove
                 $dirtyCodePattern = "/(<([\w]+[\w0-9]*)(.*)on(mouse(move|over|down|up)|load|blur|change|error|click|dblclick|focus|key(down|up|press)|select)([\n\ ]*)=([\n\ ]*)[\"'][^>\"']*[\"']([^>]*)>)(.*)(<\/\\2>)?/misU";
                 preg_match_all($dirtyCodePattern,$body,$rest,PREG_PATTERN_ORDER);
                 foreach($rest[0] as $i => $val)
                         if (!(preg_match("/javascript:window\.open\(\"([^'\"]*)\/index\.php\?menuaction=calendar\.uicalendar\.set_action\&cal_id=([^;'\"]+);?['\"]/i",$rest[1][$i]) && strtoupper($rest[4][$i]) == "CLICK" )) //Calendar events
-                        $body = str_replace($rest[1][$i],"<".$rest[2][$i].$rest[3][$i].$rest[7][$i].">",$body);
+                                $body = str_replace($rest[1][$i],"<".$rest[2][$i].$rest[3][$i].$rest[7][$i].">",$body);
 
-                return  "<span>".$this-> replace_links($body);
+                $body = $this-> replace_links($body);
+                
+                //Remoção de tags <span></span> para correção de erro no firefox
+                $body = mb_eregi_replace("<span><span>","",$body);
+                $body = mb_eregi_replace("</span></span>","",$body);
+                //Correção para compatibilização com Outlook, ao visualizar a mensagem
+                $body = mb_ereg_replace('<!--\[','<!-- [',$body);
+                $body = mb_ereg_replace('&lt;!\[endif\]--&gt;', '<![endif]-->', $body);
+                        
+                return  "<span>".$body;
         }
 
         function replace_links($body)
@@ -1772 +1779 @@
         else
         {
             $body = $params['body'];
+                        //Compatibilização com Outlook, ao encaminhar a mensagem
+            $body = mb_ereg_replace('<!--\[','<!-- [',$body);
         }
                 //echo "<script language=\"javascript\">javascript:alert('".$body."');</script>";
                 $attachments = $params['FILES'];