Changeset 4945

Timestamp:

08/17/11 16:52:32 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #2224 - Caracteres estranhos em e-mail originado do Outlook

Location:

branches/2.3

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)
• phpgwapi/inc/class.sessions.inc.php (modified) (1 diff)

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

@@ -1349 +1349 @@
                 $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);
+                //Remoção de tags <span></span> para correção de erro no firefox
+                if($_SESSION['phpgw_session']['phpgw_app_sessions']['phpgwapi']['browser_agent']['content'] != 'IE'){
+                    $body = mb_eregi_replace("<span><span>","",$body);
+                    $body = mb_eregi_replace("</span></span>","",$body);
+                }
+                
                 $body = mb_ereg_replace("(<p[^>]*)(text-indent:[^>;]*-[^>;]*;)([^>]*>)","\\1\\3",$body);
                 $body = mb_ereg_replace("(<p[^>]*)(margin-right:[^>;]*-[^>;]*;)([^>]*>)","\\1\\3",$body);
@@ -1358 +1361 @@
                 $body = mb_ereg_replace('<!--\[','<!-- [',$body); 
                 $body = mb_ereg_replace('&lt;!\[endif\]--&gt;', '<![endif]-->', $body);
-                $body = str_replace("\x00", '', $body);
+                $body = str_replace("\x00", '', $body);
                 
                 return  "<span>".$body; 

branches/2.3/phpgwapi/inc/class.sessions.inc.php

@@ -575 +575 @@
 
                         $this->appsession('password','phpgwapi',base64_encode($this->passwd));
+                        $this->appsession('browser_agent','phpgwapi',$GLOBALS['browser']->BROWSER_AGENT);
                         if($this->certificate) $this->appsession('certificate','phpgwapi',$this->certificate);
                         if ($GLOBALS['phpgw']->acl->check('anonymous',1,'phpgwapi'))