Changeset 5620 for trunk/prototype

Timestamp:

03/05/12 03:05:00 (12 years ago)

Author:

cristiano

Message:

Ticket #2497 - Nova estrategia para o salvamento automatico de rascunhos

File:

• trunk/prototype/services/ImapServiceAdapter.php (modified) (4 diffs)

trunk/prototype/services/ImapServiceAdapter.php

@@ -411 +411 @@
                                          $att = Controller::read(array('id'=> $value , 'concept' => 'mailAttachment'));
                                          
+                                         
                                          if($att['disposition'] == 'embedded')
                                          {
@@ -421 +422 @@
                                          unset($att);
                                     }
-                                    else //message attachment
+                                    else
                                     {
                                         $value = json_decode($value, true);
-                                        $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' );
-                                        unset($rawmsg);
+                                        
+                                        switch ($value['type']) {
+                                            case 'imapPart':
+                                                    $att = $this->getForwardingAttachment($value['folder'],$value['uid'], $value['part']);
+                                                    if(strstr($body,'<img src="./inc/get_archive.php?msgFolder='.$value['folder'].'&msgNumber='.$value['uid'].'&indexPart='.$value['part'].'" />') !== false)//Embeded IMG
+                                                    {    
+                                                        $body = str_ireplace('<img src="./inc/get_archive.php?msgFolder='.$value['folder'].'&msgNumber='.$value['uid'].'&indexPart='.$value['part'].'" />' , '<img src="'.$att['name'].'" />', $body);
+                                                        $mailService->addStringImage($att['source'], $att['type'], $att['name']);
+                                                    }
+                                                    else
+                                                        $mailService->addStringAttachment($att['source'], $att['name'], $att['type'], 'base64', isset($att['disposition']) ? $att['disposition'] :'attachment' );
+                                                    unset($att);
+                                                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' );
+                                                    unset($rawmsg);
+                                                break;
+
+                                            default:
+                                                break;
+                                        }
                                     }
 
@@ -434 +454 @@
                                 
                                 if($isHTML) $mailService->setBodyHtml($body); else $mailService->setBodyText($body);
-                                                         
+  
                                 if(imap_append($mbox_stream, "{".$this->imap_server.":".$this->imap_port."}".$folder, $mailService->getMessage(), "\\Seen \\Draft"))
                                 {
@@ -446 +466 @@
                  
                                 if($mbox_stream) imap_close($mbox_stream);
-                                
-                                
-                                
+
                                 return $return;
                         }