Changeset 398

Timestamp:

08/14/08 11:47:13 (16 years ago)

Author:

niltonneto

Message:

Ver ocorrência 281 do Trac.
Referente a inserção de imagem na mensagem.

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)

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

@@ -1545 +1545 @@
                 
                 //      Build CID for embedded Images!!!
-                $pattern = '/src="([^"]*?show_embedded_attach.php\?msg_folder=(.+)?&msg_num=(.+)?&msg_part=(.+)?)"/isU';
+                $pattern = '/src="([^"]*?show_embedded_attach.php\?msg_folder=(.+)?&(amp;)?msg_num=(.+)?&(amp;)?msg_part=(.+)?)"/isU';
                 $cid_imgs = '';
                 $name_cid_files = array();
                 preg_match_all($pattern,$mail->Body,$cid_imgs,PREG_PATTERN_ORDER);
                 $cid_array = array();
-                foreach($cid_imgs[4] as $j => $val){
-                                if ( !array_key_exists($cid_imgs[3][$j].$val, $cid_array) )
+                foreach($cid_imgs[6] as $j => $val){
+                                if ( !array_key_exists($cid_imgs[4][$j].$val, $cid_array) )
                         {
-                $cid_array[$cid_imgs[3][$j].$val] = base_convert(microtime(), 10, 36);
+                $cid_array[$cid_imgs[4][$j].$val] = base_convert(microtime(), 10, 36);
                         }
-                        $cid = $cid_array[$cid_imgs[3][$j].$val]; 
+                        $cid = $cid_array[$cid_imgs[4][$j].$val]; 
                         $mail->Body = str_replace($cid_imgs[1][$j], "cid:".$cid, $mail->Body);
                         
-                                if ($msg_uid != $cid_imgs[3][$j]) // The image isn't in the same mail?
+                                if ($msg_uid != $cid_imgs[4][$j]) // The image isn't in the same mail?
                                 {
-                                        $fileContent = $this->get_forwarding_attachment($cid_imgs[2][$j], $cid_imgs[3][$j], $cid_imgs[4][$j], 'base64');
+                                        $fileContent = $this->get_forwarding_attachment($cid_imgs[2][$j], $cid_imgs[4][$j], $cid_imgs[6][$j], 'base64');
+                                        //prototype: get_forwarding_attachment ( folder, msg number, part, encoding)
                                         $fileName = "image_".($j).".jpg";
                                         $fileCode = "base64";
                                         $fileType = "image/jpg";
+                                        $file_attached[0] = $cid_imgs[2][$j];
+                                        $file_attached[1] = $cid_imgs[4][$j];
+                                        $file_attached[2] = $fileName;
+                                        $file_attached[3] = $cid_imgs[6][$j];
+                                        $file_attached[4] = 'base64';
+                                        $file_attached[5] = strlen($fileContent); //Size of file
+                                        $return_forward[] = $file_attached;
                                 }
                                 else
                                 {
-                                        $attach_img = $forwarding_attachments[$cid_imgs[4][$j]-2];
+                                        $attach_img = $forwarding_attachments[$cid_imgs[6][$j]-2];
                                         $file_description = unserialize(rawurldecode($attach_img));
                                         foreach($file_description as $i => $descriptor){                                
@@ -1576 +1584 @@
                                         $fileCode = $file_description[4];
                                         $fileType = $this->get_file_type($file_description[2]);
-                                        unset($forwarding_attachments[$cid_imgs[4][$j]-2]);
+                                        unset($forwarding_attachments[$cid_imgs[6][$j]-2]);
                                         if (!empty($file_description))
                                         {