Changeset 7294 for branches/2.4/expressoMail1_2
- Timestamp:
- 09/25/12 09:30:25 (12 years ago)
- Location:
- branches/2.4/expressoMail1_2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php
r7292 r7294 2895 2895 } 2896 2896 2897 2898 if ($fromaddress) 2899 $mailService->setFrom('"' . $fromaddress[0] . '" <' . $fromaddress[1] . '>'); 2900 else 2901 $mailService->setFrom('"' . $_SESSION['phpgw_info']['expressomail']['user']['firstname'] . ' ' . $_SESSION['phpgw_info']['expressomail']['user']['lastname'] . '" <' . $_SESSION['phpgw_info']['expressomail']['user']['email'] . '>'); 2902 2903 $mailService->addHeaderField('Reply-To', $replytoaddress); 2897 $from = $fromaddress ? ('"' . $fromaddress[0] . '" <' . $fromaddress[1] . '>') : ('"' . $_SESSION['phpgw_info']['expressomail']['user']['firstname'] . ' ' . $_SESSION['phpgw_info']['expressomail']['user']['lastname'] . '" <' . $_SESSION['phpgw_info']['expressomail']['user']['email'] . '>'); 2898 $mailService->setFrom($from); 2899 2900 $mailService->addHeaderField('Reply-To', !!$replytoaddress ? $replytoaddress : $from); 2904 2901 2905 2902 $bol = $this->add_recipients('to', $toaddress, $mailService); -
branches/2.4/expressoMail1_2/js/main.js
r7292 r7294 2933 2933 mailData.msg_forward_from = $(content).find('[name="msg_forward_from"]').val(); 2934 2934 mailData.msg_reply_from = $(content).find('[name="msg_reply_from"]').val(); 2935 2936 if ($(content).find('select[name="input_from"]').val()) 2937 mailData.input_from = $(content).find('select[name="input_from"]').val(); 2935 2938 2936 2939
Note: See TracChangeset
for help on using the changeset viewer.