Changeset 4653
- Timestamp:
- 07/02/11 16:36:45 (13 years ago)
- Location:
- branches/2.2.0.1/expressoMail1_2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/expressoMail1_2/inc/class.imap_functions.inc.php
r4649 r4653 2764 2764 $return_files = $params['FILES']; 2765 2765 2766 if(is_array($params['local_attachments'])){ 2767 foreach ($params['local_attachments'] as $key => $local_attach) { 2768 $tmp = unserialize(urldecode($local_attach)); 2769 $attachments[$key]['name'] = $tmp[2]; 2770 $return_files[$key]['name'] = $tmp[2]; 2771 } 2772 } 2773 2774 2766 2775 $folder = $params['folder']; 2767 2776 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1"); … … 2789 2798 $this->add_recipients("to", $toaddress, &$mail); 2790 2799 $this->add_recipients("cc", $ccaddress, &$mail); 2791 $this->add_recipients("cco", $ccoaddress, &$mail);2800 $this->add_recipients("cco", $ccoaddress, &$mail); 2792 2801 $mail->AddReplyTo($replytoaddress); 2793 2802 $mail->Subject = $subject; … … 2873 2882 imagejpeg($image_new,$tmpDir.$_file, 85); 2874 2883 $mail->AddAttachment($tmpDir.$_file, $attach['name'], "base64", $this->get_file_type($tmpDir.$_file)); 2875 } 2876 else 2884 }else{ 2877 2885 $mail->AddAttachment($attach['tmp_name'], $attach['name'], "base64", $this->get_file_type($attach['name'])); 2878 2879 2886 }// optional name 2887 } 2880 2888 2881 2889 -
branches/2.2.0.1/expressoMail1_2/js/main.js
r4611 r4653 1343 1343 var link_attachment = document.createElement("A"); 1344 1344 link_attachment.setAttribute("href", attachments[i].href); 1345 link_attachment.innerHTML = attachments[i].innerHTML; 1345 if(attachments[i].innerHTML == "") 1346 continue; 1347 else 1348 link_attachment.innerHTML = attachments[i].innerHTML; 1346 1349 var tmp = link_attachment.href.replace("javascript:download_attachments(", "").replace(")", ""); 1347 1350 var a_tmp = tmp.split(',');
Note: See TracChangeset
for help on using the changeset viewer.