Changeset 7908 for trunk

Timestamp:

02/22/13 13:47:56 (11 years ago)

Author:

marcosw

Message:

Ticket #3331 - Correções para inconsistencia de anexar mensagem por aba e por janela

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (12 diffs)
• expressoMail1_2/js/abas.js (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (3 diffs)
• prototype/modules/attach_message/attach_message.js (modified) (3 diffs)

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

@@ -2176 +2176 @@
                 $folder = $params['folder'];
                 $folder =  mb_convert_encoding($folder, "UTF7-IMAP","ISO-8859-1");
-
                 $msgs_number = explode(",",$params['msgs_number']);
 
@@ -2193 +2192 @@
                 //$mbox_stream = $this->open_mbox($folder);
                 $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)
@@ -2772 +2769 @@
             $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");
@@ -2976 +2970 @@
 
             $header = $this->get_header($msg_numb);
-
             $header_ = imap_fetchheader($this->mbox, $msg_numb, FT_UID);
             $pattern = '/^[ \t]*Disposition-Notification-To:.*/mi';
@@ -2998 +2991 @@
             $isHTML = ( isset($params['type']) && $params['type'] == 'html' )?  true : false;
 
-
-    //  TODO - tratar mensagem criptografada e remover o AND false abaixo
+                //      TODO - tratar mensagem criptografada e remover o AND false abaixo
             if (($encrypt && $signed && $params['smime']) || ($encrypt && !$signed) AND false) { // a msg deve ser enviada cifrada...
                 $email = $this->add_recipients_cert($toaddress . ',' . $ccaddress . ',' . $ccoaddress);
@@ -3079 +3071 @@
             foreach ($attachment as &$value) 
             {
-                /*Volta aqui*/
                 if((int)$value > 0) //BD attachment
                 {
-                    ob_start();
                      $att = Controller::read(array('id'=> $value , 'concept' => 'mailAttachment'));
 
@@ -3098 +3088 @@
                 else //message attachment
                 {
-
                     $value = json_decode($value, true);
-
                     if($value["folder"] == "archiver"){
                         $value['folder'] = "INBOX/Trash";
@@ -3122 +3110 @@
                             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);
@@ -3210 +3196 @@
             {
                 $this->rfc2397ToEmbeddedAttachment($mailService , $body);
-                
-
 
                 $defaultStyle = '';
@@ -4899 +4883 @@
         $error = array();
 
-
-
         foreach($sources as $index=>$src)
         {
             if($src!="")
             {
-                    
-                
-
                 //If it is a MailArchiver incomming data
                 if($params['madata'])
@@ -4919 +4898 @@
                                 $insert = $this->insert_email($source,$dest_folder,$timestamps[$index],$flags[$index]);
 
-                //volta aqui
                 $return['idsMsg'] = $insert['msg_no'];
-
                 if($insert['error'])
                 {
@@ -4928 +4905 @@
                 else 
                 {
-                    // volta aqui
                     $archived[] = $ids[$index];
                 }

trunk/expressoMail1_2/js/abas.js

@@ -303 +303 @@
                                                         var id_msg = border_id.split("_")[0]; 
                                                         var folder = $("#input_folder_"+border_id+"_r")[0] ? $("#input_folder_"+border_id+"_r").val() : (openTab.imapBox[border_id] ? openTab.imapBox[border_id]:get_current_folder()); 
-                                                        attach_message(folder, id_msg); /* Anexa a mensagem especificada (por folder e id_msg) 
+                                                        attach_message(folder, id_msg, onceOpenedHeadersMessages); /* Anexa a mensagem especificada (por folder e id_msg) 
                                                                                                                            na mensagem sendo criada.*/ 
                                                 } 

trunk/expressoMail1_2/js/draw_api.js

@@ -4757 +4757 @@
                 message_number: id da mensagem sendo anexada. 
 */ 
-function attach_message (folder_name, message_number) { 
+function attach_message (folder_name, message_number, message_cache) { 
     var ID = currentTab; 
     var fileUploadMSG = $('#fileupload_msg'+ID); 
@@ -4765 +4765 @@
     att.uid = message_number; 
     att.type = 'imapMSG'; 
-    att.name = Base64.encode(onceOpenedMessages[folder_name][message_number].subject + '.eml'); 
+    att.name = Base64.encode(message_cache[folder_name][message_number].subject + '.eml'); 
     var idATT = JSON.stringify(att); 
     addAttachment(ID, idATT); 
     var attach = {}; 
-    attach.fileName = onceOpenedMessages[folder_name][message_number].subject + '.eml'; 
-    attach.fullFileName = onceOpenedMessages[folder_name][message_number].subject + '.eml'; 
-    if(attach.fileName.length > 20)  
-    { 
+    attach.fileName = message_cache[folder_name][message_number].subject + '.eml'; 
+    attach.fullFileName = message_cache[folder_name][message_number].subject + '.eml'; 
+    if(attach.fileName.length > 20){ 
         attach.fileName = attach.fileName.substr(0, 17) + "... " + attach.fileName.substr(attach.fileName.length - 9, attach.fileName.length); 
     } 
- 
     attach.error = false; 
-    attach.OK = true; 
-    attach.fileSize = formatBytes(onceOpenedMessages[folder_name][message_number].size); 
+    attach.OK = true;
+    if (folder_name.indexOf('local_messages_') == 0){
+        attach.fileSize = formatBytes(message_cache[folder_name][message_number].size);
+    } else {
+        attach.fileSize = formatBytes(message_cache[folder_name][message_number].Size); 
+    }
     var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", { 
         file: attach 
@@ -5240 +5242 @@
                                                 /* Anexa a mensagem especificada (por folder e id_msg) 
                                                    na mensagem sendo criada.*/ 
-                                                attach_message(folder_name, message_number);
+                                                attach_message(folder_name, message_number, onceOpenedMessages);
                                         }
                                 });

trunk/prototype/modules/attach_message/attach_message.js

@@ -602 +602 @@
                                                         dataType: 'json',
                                                         success: function( mail_preview ){              
-                                                                //selectedMessagesCount();
                                                                 if (!onceOpenedMessages[selectedFolder.id])
                                                                         onceOpenedMessages[selectedFolder.id] = {};
@@ -615 +614 @@
                                                                 
                                                                 if (!$('#' + tabPanelTemplateId).length) {      
-                                       
-
-                                    //tabPanelTemplateId - mailpreview_tab_INBOX_1110
-                                    //tabPanelTemplateLabel - Re: asduiahdih
-
                                                                         $mailpreview_tabs.tabs("add", '#' + tabPanelTemplateId, tabPanelTemplateLabel)
                                                                         .find('.message.empty-container').hide().end()
@@ -644 +638 @@
                                          * 
                                          */
-                                        /*
-                                        if ($('#' + tabPanelTemplateId).length) {
-                                                $mailpreview_tabs.tabs('remove', '#' + tabPanelTemplateId);
-                                        }
-                                         */
                                         selectedMessages[selectedFolder.id][message.msg_number] = false;
                                         $mailpreview_tabs.find('#' + tabPanelTemplateId + ', [href="#' + tabPanelTemplateId + '"]').addClass('preview-message-unselected');