Changeset 4800 for trunk/expressoMail1_2/inc
- Timestamp:
- 07/19/11 09:49:59 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r4795 r4800 1524 1524 1525 1525 function replace_links_callback($matches) 1526 { 1526 { 1527 1527 if($matches[3]) 1528 1528 $pref = $matches[3]; … … 2892 2892 $return_files = $params['FILES']; 2893 2893 2894 2894 if(is_array($params['local_attachments'])){ 2895 foreach ($params['local_attachments'] as $key => $local_attach) { 2896 $tmp = unserialize(urldecode($local_attach)); 2897 $attachments[$key]['name'] = $tmp[2]; 2898 $return_files[$key]['name'] = $tmp[2]; 2899 } 2900 } 2901 2902 2895 2903 $folder = $params['folder']; 2896 2904 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1"); … … 2917 2925 $this->add_recipients("to", $toaddress, &$mail); 2918 2926 $this->add_recipients("cc", $ccaddress, &$mail); 2927 $this->add_recipients("cco", $ccoaddress, &$mail); 2928 $mail->AddReplyTo($replytoaddress); 2919 2929 $mail->Subject = $subject; 2920 2930 $mail->IsHTML(true); … … 3004 3014 imagejpeg($image_new,$tmpDir.$_file, 85); 3005 3015 $mail->AddAttachment($tmpDir.$_file, $attach['name'], "base64", $this->get_file_type($tmpDir.$_file)); 3006 } 3007 else 3016 }else{ 3008 3017 $mail->AddAttachment($attach['tmp_name'], $attach['name'], "base64", $this->get_file_type($attach['name'])); 3009 3010 3018 }// optional name 3019 } 3011 3020 } 3012 3021
Note: See TracChangeset
for help on using the changeset viewer.