Changeset 3394 for branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

10/21/10 15:52:45 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #1265 - Tratamento de mensagens encapsuladas do Outlook.

File:

• branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (10 diffs)

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

@@ -52 +52 @@
         function open_mbox($folder = False,$force_die=true)
         {
+                $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1");
                 if (is_resource($this->mbox))
-                        return $this->mbox;
-                $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1");
-                                if($force_die) 
-                        $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
-                else 
-                        $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password);
-                return $this->mbox;
+                {
+                     if ($force_die)
+                     {
+                        @imap_reopen($this->mbox, "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
+                     }
+                     else
+                        {
+                            @imap_reopen($this->mbox, "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder);
+                        }
+                }
+                else
+                    {
+                        if($force_die)
+                        {
+                            $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
+                        }
+                        else
+                            {
+                                $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password);
+                            }
+                        
+                    }
+                    return $this->mbox;
          }
 
@@ -493 +510 @@
                 if(!$this->mbox || !is_resource($this->mbox))
                         $this->mbox = $this->open_mbox($msg_folder);
-
                 $header = $this->get_header($msg_number);
                 if (!$header) {
@@ -753 +769 @@
                 $return['login'] = $_SESSION['phpgw_info']['expressomail']['user']['account_id'];//$GLOBALS['phpgw_info']['user']['account_id'];
                 $return['reply_toaddress'] = $header->reply_toaddress;
+                
+                if($return_get_body['body']=='isSigned'){
+                    imap_close($this->mbox);
+                    $new_mail = $this->show_decript($return_get_body,$dec = 1);
+                    //$new_mail['signature'] =  $return_get_body['signature'];
+                    $return['body']             = $new_mail['body'];
+                    $return['attachments']      = $new_mail['attachments'];
+                    $return['thumbs']           = $new_mail['thumbs'];
+                    $return['folder'] = $return['msg_folder'];
+                    $return['original_ID'] =  $return['msg_number'];
+                    $return['msg_folder']       = 'INBOX'.$this->imap_delimiter.'decifradas';
+                    $return['msg_number']       = $new_mail['msg_no'];
+                    //$return['signature']      = $return_get_body['signature'];
+                }
                 return $return;
         }
@@ -817 +847 @@
                 if(!$msg->structure[$msg_number]->parts) //Simple message, only 1 piece
                 {
-                        if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){
+                        if((strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime') && (count($return['signature']) == 0 ) ){
                                 $return['body']='isCripted';
                                 return $return;
@@ -824 +854 @@
                         $attachment = array(); //No attachments
 
-                        if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){
-                                $return['body']='isCripted';
-                                return $return;
+                        if (strtolower($msg->structure[$msg_number]->subtype) == "x-pkcs7-mime")
+                        {
+                                $return['body']='isSigned';
+                                $headers = imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number));
+                                $header_body_array = explode('MIME-Version: 1.0', $headers);
+                                $show_pkcs7 = $header_body_array[0] . 'MIME-Version: 1.0' . chr(0x0D) .chr(0x0A). $return['signature'][0];
+                                $return['source']=$show_pkcs7;
+                                array_shift($return['signature']);
+                                $return['signature'];
+                                //$return['signature'] = $this->get_signature($msg,$msg_number,$msg_folder);
+                                imap_close($this->mbox);
+                                return $return;
                         }
 
@@ -860 +899 @@
                         $has_multipart = true;
                         $this->has_cid = false;
-
+                        array_shift($return['signature']);
                         if (strtolower($msg->structure[$msg_number]->subtype) == "related")
                                 $this->has_cid = true;
@@ -1307 +1346 @@
                 if(strtolower($msg->encoding[$msg_number][$index]) == 'base64')
                 {
-                    if ($file_type == 'application/x-pkcs7-signature' || $file_type == 'application/pkcs7-signature')
+                    if ($temp['ContentType'] == 'signature')
                     {
-                        if(!$this->mbox || !is_resource($this->mbox))
-                            $this->mbox = $this->open_mbox($msg_folder);
+                        if(!$this->mbox || !is_resource($this->mbox))
+                        $this->mbox = $this->open_mbox($msg_folder);
 
                         $header = @imap_headerinfo($this->mbox, imap_msgno($this->mbox, $msg_number), 80, 255);
@@ -1319 +1358 @@
                         $certificado = new certificadoB();
                         $validade = $certificado->verificar($imap_msg);
-
+                                        $sign[] = $certificado->msg_sem_assinatura;
                         if ($certificado->apresentado)
                         {
@@ -1584 +1623 @@
      */
     function getMessageType($msg_number, $headers = false){
-
+            include_once(dirname( __FILE__ ) ."/../../security/classes/CertificadoB.php");
             $contentType = "normal";
             if (!$headers){
                 $headers = imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number));
             }
-            //$header2 = imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number));
-            if (preg_match("/Content-Type:.*pkcs7-signature/i", $headers) == 1){
+            
+            if (preg_match("/pkcs7-signature/i", $headers) == 1){
                 $contentType = "signature";
-            } else if (preg_match("/Content-Type:.*x-pkcs7-mime/i", $headers) == 1){
-                $contentType = "cipher";
+            } else if (preg_match("/pkcs7-mime/i", $headers) == 1){
+                $contentType = testa_p7m( imap_body($this->mbox, imap_msgno($this->mbox, $msg_number)) );
             }
 
@@ -3677 +3716 @@
     }
 
-    function show_decript($params){
+    function show_decript($params,$dec=0){
+        
         $source = $params['source'];
         //error_log("source: $source\nversao: " . PHP_VERSION, 3, '/tmp/teste.log');
-        $source = str_replace(" ", "+", $source,$i);
-
-        if (version_compare(PHP_VERSION, '5.2.0', '>=')){
-            if(!$source = base64_decode($source,true))
-                return "error ".$source."Espaços ".$i;
-
+
+        if ($dec == 0)
+        {
+            $source = str_replace(" ", "+", $source,$i);
+            if (version_compare(PHP_VERSION, '5.2.0', '>=')){
+                if(!$source = base64_decode($source,true))
+                    return "error ".$source."Espaços ".$i;
+
+            }
+            else {
+                if(!$source = base64_decode($source))
+                    return "error ".$source."Espaços ".$i;
+            }
         }
-        else {
-            if(!$source = base64_decode($source))
-                return "error ".$source."Espaços ".$i;
-        }
-
         $insert = $this->insert_email($source,'INBOX'.$this->imap_delimiter.'decifradas');