Changeset 4945


Ignore:
Timestamp:
08/17/11 16:52:32 (10 years ago)
Author:
rafaelraymundo
Message:

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

Location:
branches/2.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.3/expressoMail1_2/inc/class.imap_functions.inc.php

    r4927 r4945  
    13491349                $body = $this-> replace_links($body); 
    13501350 
    1351                 //Remoção de tags <span></span> para correção de erro no firefox  
    1352                 $body = mb_eregi_replace("<span><span>","",$body); 
    1353                 $body = mb_eregi_replace("</span></span>","",$body); 
     1351                //Remoção de tags <span></span> para correção de erro no firefox 
     1352                if($_SESSION['phpgw_session']['phpgw_app_sessions']['phpgwapi']['browser_agent']['content'] != 'IE'){ 
     1353                    $body = mb_eregi_replace("<span><span>","",$body); 
     1354                    $body = mb_eregi_replace("</span></span>","",$body); 
     1355                } 
     1356                 
    13541357                $body = mb_ereg_replace("(<p[^>]*)(text-indent:[^>;]*-[^>;]*;)([^>]*>)","\\1\\3",$body); 
    13551358                $body = mb_ereg_replace("(<p[^>]*)(margin-right:[^>;]*-[^>;]*;)([^>]*>)","\\1\\3",$body); 
     
    13581361                $body = mb_ereg_replace('<!--\[','<!-- [',$body);  
    13591362                $body = mb_ereg_replace('&lt;!\[endif\]--&gt;', '<![endif]-->', $body); 
    1360                 $body = str_replace("\x00", '', $body); 
     1363                $body = str_replace("\x00", '', $body); 
    13611364                 
    13621365                return  "<span>".$body;  
  • branches/2.3/phpgwapi/inc/class.sessions.inc.php

    r4867 r4945  
    575575 
    576576                        $this->appsession('password','phpgwapi',base64_encode($this->passwd)); 
     577                        $this->appsession('browser_agent','phpgwapi',$GLOBALS['browser']->BROWSER_AGENT); 
    577578                        if($this->certificate) $this->appsession('certificate','phpgwapi',$this->certificate); 
    578579                        if ($GLOBALS['phpgw']->acl->check('anonymous',1,'phpgwapi')) 
Note: See TracChangeset for help on using the changeset viewer.