Changeset 4800

Timestamp:

07/19/11 09:49:59 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - colocando nomes corretos de arquivos quando uma msg é salva.r4653

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (4 diffs)
• js/main.js (modified) (1 diff)

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

@@ -1524 +1524 @@
 
         function replace_links_callback($matches)  
-        { 
+        {
                 if($matches[3]) 
                         $pref = $matches[3]; 
@@ -2892 +2892 @@
                 $return_files = $params['FILES'];
 
-                 
+                if(is_array($params['local_attachments'])){
+                    foreach ($params['local_attachments'] as $key => $local_attach) {
+                       $tmp = unserialize(urldecode($local_attach));
+                       $attachments[$key]['name'] = $tmp[2];
+                       $return_files[$key]['name'] = $tmp[2];
+                    }
+                }
+
+
                 $folder = $params['folder'];
                 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1");
@@ -2917 +2925 @@
                 $this->add_recipients("to", $toaddress, &$mail);
                 $this->add_recipients("cc", $ccaddress, &$mail);
+                $this->add_recipients("cco", $ccoaddress, &$mail);
+                $mail->AddReplyTo($replytoaddress);
                 $mail->Subject = $subject;
                 $mail->IsHTML(true);
@@ -3004 +3014 @@
                                         imagejpeg($image_new,$tmpDir.$_file, 85);
                                         $mail->AddAttachment($tmpDir.$_file, $attach['name'], "base64", $this->get_file_type($tmpDir.$_file));
-                                }
-                                else
+                                }else{
                                         $mail->AddAttachment($attach['tmp_name'], $attach['name'], "base64", $this->get_file_type($attach['name']));
-                                
-                                }
+                                }// optional name
+                        }
                 }
 

trunk/expressoMail1_2/js/main.js

@@ -1349 +1349 @@
                                         var link_attachment = document.createElement("A");
                                         link_attachment.setAttribute("href", attachments[i].href);
-                                        link_attachment.innerHTML = attachments[i].innerHTML;
+                                        if(attachments[i].innerHTML == "")
+                                            continue;
+                                        else
+                                            link_attachment.innerHTML = attachments[i].innerHTML;
                                         var tmp = link_attachment.href.replace("javascript:download_attachments(", "").replace(")", "");
                                         var a_tmp = tmp.split(',');