Changeset 7286


Ignore:
Timestamp:
09/24/12 14:55:43 (7 years ago)
Author:
douglasz
Message:

Ticket #3127 - Mensagens criadas pelo Expresso com inconsistência no Outlook.

Location:
trunk/expressoMail1_2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/inc/class.imap_functions.inc.php

    r7276 r7286  
    26582658            $fromaddress = $params['input_from'] ? explode(';', $params['input_from']) : ""; 
    26592659            $message_attachments_contents = (isset($params['message_attachments_content'])) ? $params['message_attachments_content'] : false; 
    2660  
     2660                         
    26612661            ## 
    26622662            # @AUTHOR Rodrigo Souza dos Santos 
     
    26732673                    return "The server denied your request to send a mail, you cannot use this mail address."; 
    26742674            } 
    2675  
    26762675 
    26772676            if (substr($params['input_to'], -1) == ',') 
     
    28872886            } 
    28882887 
    2889  
    2890             if ($fromaddress) 
    2891                 $mailService->setFrom('"' . $fromaddress[0] . '" <' . $fromaddress[1] . '>'); 
    2892             else 
    2893                 $mailService->setFrom('"' . $_SESSION['phpgw_info']['expressomail']['user']['firstname'] . ' ' . $_SESSION['phpgw_info']['expressomail']['user']['lastname'] . '" <' . $_SESSION['phpgw_info']['expressomail']['user']['email'] . '>'); 
    2894              
    2895             $mailService->addHeaderField('Reply-To', $replytoaddress); 
     2888                        $from = $fromaddress ?  ('"' . $fromaddress[0] . '" <' . $fromaddress[1] . '>') : ('"' . $_SESSION['phpgw_info']['expressomail']['user']['firstname'] . ' ' . $_SESSION['phpgw_info']['expressomail']['user']['lastname'] . '" <' . $_SESSION['phpgw_info']['expressomail']['user']['email'] . '>'); 
     2889                        $mailService->setFrom($from);                            
     2890         
     2891                        $mailService->addHeaderField('Reply-To', !!$replytoaddress ? $replytoaddress : $from); 
    28962892 
    28972893            $bol = $this->add_recipients('to', $toaddress, $mailService); 
  • trunk/expressoMail1_2/js/main.js

    r7276 r7286  
    28782878    $.each(array, function(index, value){ 
    28792879        stringReply += $(value).find("input").val() + ","; 
    2880     }); 
     2880    });  
    28812881    var stringToEmail = ""; 
    28822882    draw_email_box(content.find(".to-tr").find("textarea:first").val() || content.find(".to-tr").find("input:visible").val(), content.find(".to-tr").find("textarea:first")); 
     
    29342934    mailData.msg_forward_from = $(content).find('[name="msg_forward_from"]').val(); 
    29352935    mailData.msg_reply_from = $(content).find('[name="msg_reply_from"]').val(); 
     2936         
     2937        if ($(content).find('select[name="input_from"]').val()) 
     2938                mailData.input_from = $(content).find('select[name="input_from"]').val(); 
    29362939 
    29372940 
Note: See TracChangeset for help on using the changeset viewer.