Changeset 7907 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

02/22/13 12:37:16 (11 years ago)

Author:

marcosw

Message:

Ticket #3331 - Melhoria inserida no repositório trunk

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (14 diffs)

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

@@ -2174 +2174 @@
         function delete_msgs($params)
         {
-
                 $folder = $params['folder'];
                 $folder =  mb_convert_encoding($folder, "UTF7-IMAP","ISO-8859-1");
+
                 $msgs_number = explode(",",$params['msgs_number']);
+
                 if(array_key_exists('border_ID' ,$params))
                 $border_ID = $params['border_ID'];
@@ -2193 +2194 @@
                 $mbox_stream = @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()))));
 
-                foreach ($msgs_number as $msg_number)
+        
+
+        foreach ($msgs_number as $msg_number)
                 {
                         if (imap_delete($mbox_stream, $msg_number, FT_UID));
@@ -2681 +2684 @@
                 return $return;
         }
-        
+
+    function get_info_msg_archiver($params){
+         $folder = "INBOX/Trash";
+         $mbox_stream = $this->open_mbox($folder);
+
+        foreach($params['idMsgs'] as $i => $id){
+            $name = imap_headerinfo($mbox_stream, imap_msgno($mbox_stream ,$id));
+            $return[] =  array(
+                'uid' => $id,
+                'folder' => "archiver",
+                'type' => "imapMSG",
+                'name' => base64_encode($name->subject.".eml")
+            );
+        }
+        
+        return json_encode($return);
+    }
+
         function send_mail($params) {
             require_once dirname(__FILE__) . '/../../services/class.servicelocator.php';
@@ -2752 +2772 @@
             $encrypt = $params['input_return_cripto'];
             $signed = $params['input_return_digital'];
+
+
+            //$params['attachments'] = $params['attachments']['imap'];
 
                         $params['attachments'] = mb_convert_encoding($params['attachments'], "UTF7-IMAP","UTF-8, ISO-8859-1, UTF7-IMAP");
@@ -2904 +2927 @@
                                         $arr_new_folder['base_path'] = $base_path;
 
-                                        $this->create_mailbox($arr_new_folder);                                 
+                                        $this->create_mailbox($arr_new_folder); 
                                         $has_new_folder = true;
                     $folder = $newfolder;
@@ -2953 +2976 @@
 
             $header = $this->get_header($msg_numb);
+
             $header_ = imap_fetchheader($this->mbox, $msg_numb, FT_UID);
             $pattern = '/^[ \t]*Disposition-Notification-To:.*/mi';
@@ -3055 +3079 @@
             foreach ($attachment as &$value) 
             {
+                /*Volta aqui*/
                 if((int)$value > 0) //BD attachment
                 {
+                    ob_start();
                      $att = Controller::read(array('id'=> $value , 'concept' => 'mailAttachment'));
 
@@ -3072 +3098 @@
                 else //message attachment
                 {
+
                     $value = json_decode($value, true);
+
+                    if($value["folder"] == "archiver"){
+                        $value['folder'] = "INBOX/Trash";
+                    }
 
                     switch ($value['type']) {
@@ -3080 +3111 @@
                                 if(strstr($body,'src="./inc/get_archive.php?msgFolder='.$value['folder'].'&msgNumber='.$value['uid'].'&indexPart='.$value['part'].'"') !== false)//Embeded IMG
                                 {    
-                                    $body = str_ireplace('src="./inc/get_archive.php?msgFolder='.$value['folder'].'&msgNumber='.$value['uid'].'&indexPart='.$value['part'].'"' , 'src="'.$att['name'].'"', $body);
+                                    $body = str_ireplace('src="./inc/get_archive.php?msgFolder='.$value['folder'].  '&msgNumber='.$value['uid'].'&indexPart='.$value['part'].'"' , 'src="'.$att['name'].'"', $body);
                                     $mailService->addStringImage($att['source'], $att['type'],mb_convert_encoding($att['name'], 'ISO-8859-1' , 'UTF-8,ISO-8859-1') );
                                 }
@@ -3091 +3122 @@
                             case 'imapMSG':
                                 $mbox_stream = $this->open_mbox(mb_convert_encoding($value['folder'] , 'ISO-8859-1' , 'UTF7-IMAP'));
+
                                 $rawmsg = $this->getRawHeader($value['uid']) . "\r\n\r\n" . $this->getRawBody($value['uid']);
                                 
                                 $mailService->addStringAttachment($rawmsg, mb_convert_encoding(base64_decode($value['name']), 'ISO-8859-1' , 'UTF-8,ISO-8859-1'), 'message/rfc822', '7bit', 'attachment' );
+                                /*envia o anexo para o email*/
+
                                 $message_size_total += mb_strlen($rawmsg); //Adiciona o tamanho do anexo a variavel que controlao tamanho da msg.
                                 unset($rawmsg);
@@ -3176 +3210 @@
             {
                 $this->rfc2397ToEmbeddedAttachment($mailService , $body);
+                
+
 
                 $defaultStyle = '';
@@ -4863 +4899 @@
         $error = array();
 
+
+
         foreach($sources as $index=>$src)
         {
             if($src!="")
             {
+                    
+                
+
                 //If it is a MailArchiver incomming data
                 if($params['madata'])
@@ -4878 +4919 @@
                                 $insert = $this->insert_email($source,$dest_folder,$timestamps[$index],$flags[$index]);
 
+                //volta aqui
+                $return['idsMsg'] = $insert['msg_no'];
+
                 if($insert['error'])
                 {
@@ -4884 +4928 @@
                 else 
                 {
+                    // volta aqui
                     $archived[] = $ids[$index];
                 }