Changeset 6719

Timestamp:

07/05/12 15:34:52 (11 years ago)

Author:

eduardow

Message:

Ticket #2929 - Alterado condicionais para converter tipo de anexo.

Location:

branches/2.4

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)
• prototype/services/ImapServiceAdapter.php (modified) (1 diff)

branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -2916 +2916 @@
                      $att = Controller::read(array('id'=> $value , 'concept' => 'mailAttachment'));
 
-                     if($att['disposition'] == 'embedded')
+                     if($att['disposition'] == 'embedded' && $isHTML) //Caso mensagem em texto simples converter os embedded para attachments
                      {
                          $body = str_replace('"../prototype/getArchive.php?mailAttachment='.$att['id'].'"', $att['name'], $body);

branches/2.4/prototype/services/ImapServiceAdapter.php

@@ -630 +630 @@
                                                 $att = Controller::read(array('id'=> $value , 'concept' => 'mailAttachment'));
 
-                                                if($att['disposition'] == 'embedded')
+                                                if($att['disposition'] == 'embedded' && $isHTML) //Caso mensagem em texto simples converter os embedded para attachments
                                                 {
                                                         $body = str_replace('"../prototype/getArchive.php?mailAttachment='.$att['id'].'"', '"'.mb_convert_encoding($att['name'], 'ISO-8859-1' , 'UTF-8,ISO-8859-1').'"', $body);