Changeset 5134 for trunk/expressoMail1_2/inc/class.attachment.inc.php

Timestamp:

11/03/11 13:24:28 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoMail?.

File:

• trunk/expressoMail1_2/inc/class.attachment.inc.php (modified) (15 diffs)

trunk/expressoMail1_2/inc/class.attachment.inc.php

@@ -32 +32 @@
      * @param integer $msgNumber Imap menssagem number
      */
-    function attachment($rootPath = false)
+    function attachment()
     {
         /*
          * Requires
          */
-        if($rootPath)
-        {
-            require_once $rootPath.'/library/mime/mimePart.php';
-            require_once $rootPath.'/library/mime/mimeDecode.php';
-        }
-        else
-        {
             require_once $_SESSION['rootPath'].'/library/mime/mimePart.php';
             require_once $_SESSION['rootPath'].'/library/mime/mimeDecode.php';
-        }
         //----------------------------------------------------------//
 
@@ -52 +44 @@
         $this->decodeConf['decode_bodies']  = true;
         $this->decodeConf['decode_headers'] = true;
+        
+        if( array_key_exists('nested_messages_are_shown', $_SESSION['phpgw_info']['user']['preferences']['expressoMail']) && ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['nested_messages_are_shown'] == '1'))
+            $this->decodeConf['rfc_822bodies']  = true;
     }
     //----------------------------------------------------------------------------//
@@ -86 +81 @@
         $this->structure = $decoder->decode($this->decodeConf);
 
+                //TODO: Descartar código após atualização do módulo de segurança da SERPRO 
+                if($this->isSignedMenssage()) 
+                        $this->convertSignedMenssage($rawMessageData); 
+                //////////////////////////////////////////////////////
+                        
+                        
         /*
          * Clean memory and close imap connection
@@ -95 +96 @@
     }
 
+        //TODO: Descartar código após atualização do módulo de segurança da SERPRO 
+        private function isSignedMenssage() 
+        { 
+                if(strtolower($this->structure->ctype_primary) == 'application' && strtolower($this->structure->ctype_secondary) == 'x-pkcs7-mime' ) 
+                        return true; 
+                else 
+                        return false;      
+        } 
+    //////////////////////////////////////////////////////////////////////////
+
+   //TODO: Descartar código após atualização do módulo de segurança da SERPRO 
+   private function convertSignedMenssage($rawMessageData) 
+        { 
+                $decoder = new Mail_mimeDecode($this->extractSignedContents($rawMessageData)); 
+                $this->structure = $decoder->decode($this->decodeConf);          
+        } 
+        ///////////////////////////////////////////////////////////////////////////
+        
+        //TODO: Descartar código após atualização do módulo de segurança da SERPRO 
+        private function extractSignedContents( $data ) 
+                    { 
+                        $pipes_desc = array( 
+                            0 => array('pipe', 'r'), 
+                            1 => array('pipe', 'w') 
+                        ); 
+                 
+                        $fp = proc_open( 'openssl smime -verify -noverify -nochain', $pipes_desc, $pipes); 
+                        if (!is_resource($fp)) { 
+                           return false; 
+                        } 
+                 
+                        $output = ''; 
+                 
+                        /* $pipes[0] => writeable handle connected to child stdin 
+                           $pipes[1] => readable handle connected to child stdout */ 
+                        fwrite($pipes[0], $data); 
+                        fclose($pipes[0]); 
+                 
+                        while (!feof($pipes[1])) { 
+                            $output .= fgets($pipes[1], 1024); 
+                        } 
+                        fclose($pipes[1]); 
+                        proc_close($fp); 
+                 
+                        return $output; 
+                    } 
+        /////////////////////////////////////////////////////////////////////////////////////
+        
     /**
      * Set Stucture from Mail_mimeDecode Structure
@@ -116 +165 @@
         $decoder = new Mail_mimeDecode($rawMail);
         $this->structure = $decoder->decode($this->decodeConf);
+                
+                //TODO: Descartar código após atualização do módulo de segurança da SERPRO 
+                if($this->isSignedMenssage()) 
+                        $this->convertSignedMenssage($rawMessageData);  
+                //////////////////////////////////////////////////////////////////////////
     }
 
@@ -169 +223 @@
         $attachment = array();
         $this->_getPartInfo($this->structure,$partNumber,$attachment);
-        return $attachment;
+        return $attachment[0];
     }
 
@@ -180 +234 @@
     private function _getRaw()
     {
-        return imap_fetchheader($this->mbox, $this->msgNumber, FT_UID).imap_body($this->mbox, $this->msgNumber, FT_UID);
+                        /* 
+                 * Chamada original imap_fetchheader($this->mbox, $this->msgNumber, FT_UID)."\r\n".imap_body($this->mbox, $this->msgNumber, FT_UID); 
+                 * Inserido replace para corrigir um bug que acontece raramente em mensagens vindas do outlook com muitos destinatarios 
+                 */ 
+                return str_replace("\r\n\t", '', imap_fetchheader($this->mbox, $this->msgNumber, FT_UID))."\r\n".imap_body($this->mbox, $this->msgNumber, FT_UID);
     }
 
@@ -202 +260 @@
                 else
                 {
-                    if(strtolower($part->ctype_primary) == 'message' && is_array($part->parts))
+                    if(strtolower($part->ctype_primary) == 'message' && is_array($part->parts) && $this->decodeConf['rfc_822bodies'] !== true )
                             $this->_getPartContent($part,$soughtIndex,$body,$pIndex.'.'.$index);
                     else
                     {
                         $currentIndex = $pIndex.'.'.$index;
-                        if($currentIndex == $soughtIndex)
+                        if($currentIndex === $soughtIndex)
                         {
                             $body = $part->body;
@@ -235 +293 @@
                 else
                 {
-                    if(strtolower($part->ctype_primary) == 'message' && is_array($part->parts))
+                    if(strtolower($part->ctype_primary) == 'message' && is_array($part->parts) && $this->decodeConf['rfc_822bodies'] !== true)
                          $this->_getPartInfo($part,$soughtIndex,$info,$pIndex.'.'.$index);
                     else
                     {
                         $currentIndex = $pIndex.'.'.$index;
-                        if($currentIndex == $soughtIndex)
+                        if($currentIndex === $soughtIndex)
                         {
                                                         $this->_pushAttachmentsInfo($part,$info,$currentIndex);
@@ -262 +320 @@
     {
 
-        if($structure->parts)
+        if(isset($structure->parts))
         {
             foreach ($structure->parts  as $index => $part)
@@ -270 +328 @@
                 else
                 {
-                    if(strtolower($part->ctype_primary) == 'message' && is_array($part->parts))
+                    if(strtolower($part->ctype_primary) == 'message' && is_array($part->parts) && $this->decodeConf['rfc_822bodies'] !== true)
                        $this->_getAttachmentsInfo($part,$attachments,$pIndex.'.'.$index);
                     else
@@ -293 +351 @@
         /**
         * Write in $$attachments, array with the information of attachment 
-        *
-        * @license    http://www.gnu.org/copyleft/gpl.html GPL
-        * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
-        * @sponsor    Caixa Econômica Federal
-        * @param      $structure
-        * @param      $attachments
-        * @param      $pIndex
+        * @param <type> $structure 
+        * @param <type> $attachments 
+        * @param <type> $pIndex 
         */      
         private function _pushAttachmentsInfo(&$structure, &$attachments, $pIndex = '0') 
         { 
-                        $name = false; 
-                        if($structure->d_parameters['filename']) $name = $structure->d_parameters['filename']; 
-                        else if($structure->ctype_parameters['name']) $name = $structure->ctype_parameters['name']; 
+                        $name = '';                                
+                        if((isset($structure->d_parameters['filename']))&& ($structure->d_parameters['filename'])) $name = $structure->d_parameters['filename']; 
+                        else if((isset($structure->ctype_parameters['name']))&&($structure->ctype_parameters['name'])) $name = $structure->ctype_parameters['name'];
                         else if(strtolower($structure->ctype_primary) == 'text' &&  strtolower($structure->ctype_secondary) == 'calendar') $name = 'calendar.ics'; 
                  
+                            //Attachments com nomes grandes são quebrados em varias partes VER RFC2231
+                            if( !$name && isset($structure->disposition) && (strtolower($structure->disposition) === 'attachment' || strtolower($structure->ctype_primary) == 'image'))
+                                        foreach ($structure->d_parameters as $i => $v)
+                                                if(strpos($i , 'filename') !== false)
+                                                        $name .= urldecode(str_ireplace(array('ISO-8859-1','UTF-8','US-ASCII'),'',$v));
+                             if( !$name && isset($structure->disposition) && (strtolower($structure->disposition) === 'attachment' || strtolower($structure->ctype_primary) == 'image') )
+                                        foreach ($structure->ctype_parameters as $i => $v)
+                                                if(strpos($i , 'name') !== false)
+                                                        $name .= urldecode(str_ireplace(array('ISO-8859-1','UTF-8','US-ASCII'),'',$v));         
+                           ////////////////////////////////////////////////////////////////////////////////////
+                                                
+
+                        if($structure->ctype_primary == 'message') {
+                                $attach = new attachment();
+                                $attach->setStructureFromRawMail($structure->body);
+
+                                if (!$name)
+                                        $name = ($attach->structure->headers['subject']) ? $attach->structure->headers['subject'] : 'no title';
+
+                                if (!preg_match("/\.eml$/", $name))
+                                        $name .= '.eml';
+                        }                                              
+
+                        if(!$name && strtolower($structure->ctype_primary) == 'image')
+                        {
+                            if(strlen($structure->ctype_secondary) === 3)
+                                $ext = strtolower($structure->ctype_secondary);
+
+                            $name = 'Embedded-Image.'.$ext;
+                        }
+                                
                         if($name) 
                         { 
@@ -316 +401 @@
                             $definition['name'] = addslashes(mb_convert_encoding($name, "ISO-8859-1")); 
                             $definition['encoding'] = $structure->headers['content-transfer-encoding']; 
+                            $definition['type'] = strtolower($structure->ctype_primary).'/'.strtolower($structure->ctype_secondary);                                       
                             $definition['fsize'] = mb_strlen($structure->body, $structure->headers['content-transfer-encoding']); 
                  
@@ -334 +420 @@
      private function _getEmbeddedImagesInfo($structure, &$images, $pIndex = '0')
      {
+                if(isset($structure->parts))
         foreach ($structure->parts  as $index => $part)
         {
@@ -340 +427 @@
             else
             {
-                if(strtolower($part->ctype_primary) == 'message' && is_array($part->parts))
+                if(strtolower($part->ctype_primary) == 'message' && is_array($part->parts) && $this->decodeConf['rfc_822bodies'] !== true)
                         $this->_getEmbeddedImagesInfo($part,$images,$pIndex.'.'.$index);
                 else
                 {
-                    if(!$part->ctype_parameters['name'])
+                    if(is_array($part->ctype_parameters) && !array_key_exists('name', $part->ctype_parameters))
+                        if(isset($part->d_parameters['filename']))
                          $name = $part->d_parameters['filename'];
                     else
+                          $name = null;
+                    else
                          $name = $part->ctype_parameters['name'];
 
-                    $type =  strtolower(substr($name, -4));
+                    if($name && (strlen($name) - (strrpos($name, '.')+1) === 3 )) 
+                        $ext = strtolower(substr ( $name , (strrpos($name, '.')+1) ));          
+                    else if(strlen($structure->ctype_secondary) === 3)
+                        $ext = strtolower($structure->ctype_secondary);
+                    
+                    if(!$name && strtolower($structure->ctype_primary) == 'image') $name = 'Embedded-Image.'.$ext;
+                                        
                     $ctype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary);
-                    if(strtolower($part->ctype_primary) == 'image' ||  ($ctype == 'application/octet-stream' && ($type == '.png' || $type == '.jpg' || $type == '.gif')))
+        
+                    if(strtolower($part->ctype_primary) == 'image' ||  ($ctype == 'application/octet-stream' && ($ext == 'png' || $ext == 'jpg' || $ext == 'gif' || $ext == 'bmp' || $ext == 'tif')))
                     {
                         $definition['pid'] = $pIndex.'.'.$index;
                         $definition['name'] = addslashes($name);
-                        $definition['type'] = 'image/'.strtolower($part->ctype_secondary);
+                        $definition['type'] = $ctype;
                         $definition['encoding'] = $part->headers['content-transfer-encoding'];
                         $definition['cid'] = $part->headers['content-id'];