Changeset 6265

Timestamp:

05/22/12 14:45:02 (12 years ago)

Author:

cristiano

Message:

Ticket #2773 - Caracteres indevidos na identificação de nome de mensagens em anexo

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)
• expressoMail1_2/js/draw_api.js (modified) (6 diffs)
• prototype/services/ImapServiceAdapter.php (modified) (2 diffs)

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

@@ -2998 +2998 @@
                 {
                     $value = json_decode($value, true);
-
+                                    
                     switch ($value['type']) {
                         case 'imapPart':
@@ -3014 +3014 @@
                             break;
                             case 'imapMSG':
-                                $sub =  $value['name'] ? $value['name'].'.eml' :'no title.eml';
                                 $mbox_stream = $this->open_mbox($value['folder']);
                                 $rawmsg = $this->getRawHeader($value['uid']) . "\r\n\r\n" . $this->getRawBody($value['uid']);
-                                $mailService->addStringAttachment($rawmsg, $sub, 'message/rfc822', '7bit', 'attachment' );
+                                $mailService->addStringAttachment($rawmsg, base64_decode($value['name']), 'message/rfc822', '7bit', 'attachment' );
                                 $message_size_total += mb_strlen($rawmsg); //Adiciona o tamanho do anexo a variavel que controlao tamanho da msg.
                                 unset($rawmsg);
@@ -3027 +3026 @@
                 }
             }
-        
+            
             $message_size_total += strlen($params['body']);   /* Tamanho do corpo da mensagem. */        
 

trunk/expressoMail1_2/js/draw_api.js

@@ -1329 +1329 @@
                                 iframeFix: true,
                                 delay: 150,
-                                cursorAt: { top: 5, left: 56},
+                                cursorAt: {top: 5, left: 56},
                                 refreshPositions: true,
                                 containment: "#divAppbox"
@@ -1582 +1582 @@
                                 var spanSender = document.createElement("SPAN");
                                 spanSender.setAttribute('class','span-sender');
-                                spanSender.onmouseover = function (event) {/*this.style.textDecoration = "underline";*/ try {InfoContact.begin(this,headers_msgs.reply_toaddress)} catch(e){};};
-                                spanSender.onmouseout = function (){try {/*this.style.textDecoration = "none";*/ clearTimeout(InfoContact.timeout);} catch(e){}};
+                                spanSender.onmouseover = function (event) {/*this.style.textDecoration = "underline";*/try {InfoContact.begin(this,headers_msgs.reply_toaddress)} catch(e){};};
+                                spanSender.onmouseout = function (){try {/*this.style.textDecoration = "none";*/clearTimeout(InfoContact.timeout);} catch(e){}};
                                 folder = special_folders['Sent'];
                                 current = get_current_folder();
@@ -3023 +3023 @@
                                                         delegatedFrom: '0',
                                                         status: '4'
-                                                }, !!user.id ? {id : DataLayer.put('participant', {user: user.id, isExternal: user.isExternal}) } : {id: DataLayer.put('participant', {user: user})}); 
+                                                }, !!user.id ? {id : DataLayer.put('participant', {user: user.id, isExternal: user.isExternal})} : {id: DataLayer.put('participant', {user: user})}); 
                                 
                                         })      
@@ -3795 +3795 @@
                         modal: true,
                         closeOnEscape:true,
-                        close:function(event, ui) {event.stopPropagation(); },
+                        close:function(event, ui) {event.stopPropagation();},
                         autoOpen:false
                 });
@@ -3811 +3811 @@
                                                         att.uid = message_number;
                                                         att.type = 'imapMSG';
-                                                        att.name = onceOpenedMessages[folder_name][message_number].subject + '.eml';
+                                                        att.name = Base64.encode(onceOpenedMessages[folder_name][message_number].subject + '.eml');
                                                         var idATT = JSON.stringify(att);
                                                         addAttachment( ID , idATT);                        
                                                         var attach = {};
-                                                        attach.fileName = att.name
+                                                        attach.fileName = onceOpenedMessages[folder_name][message_number].subject + '.eml';
                                                         if(attach.fileName.length > 45)
                                                                         attach.fileName = attach.fileName.substr(0, 32) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length);
@@ -4274 +4274 @@
         var dn_em       = document.createElement("SPAN");
                 dn_em.id = "tt_d";
-                dn_em.onclick = function(){ block_user_email(email); /*filter.new_rule(email);*/ };
+                dn_em.onclick = function(){block_user_email(email); /*filter.new_rule(email);*/};
                 dn_em.setAttribute("title",get_lang("Block Sender"));
                 dn_em.style.cursor = "pointer";

trunk/prototype/services/ImapServiceAdapter.php

@@ -635 +635 @@
                                         {
                                                 $value = json_decode($value, true);
-
+                                                
                                                 switch ($value['type']) {
                                                         case 'imapPart':
@@ -649 +649 @@
                                                                 break;
                                                         case 'imapMSG':
-                                                                $sub =  $value['name'] ? $value['name'].'.eml' :'no title.eml';
                                                                 $mbox_stream = $this->open_mbox($value['folder']);
                                                                 $rawmsg = $this->getRawHeader($value['uid']) . "\r\n\r\n" . $this->getRawBody($value['uid']);
-                                                                $mailService->addStringAttachment($rawmsg, $sub, 'message/rfc822', '7bit', 'attachment' );
+                                                                $mailService->addStringAttachment($rawmsg, base64_decode($value['name']), 'message/rfc822', '7bit', 'attachment' );
                                                                 unset($rawmsg);
                                                                 break;