Changeset 6882 for trunk/expressoMail1_2/inc
- Timestamp:
- 07/26/12 11:49:17 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r6877 r6882 1355 1355 $reply_to = $header->reply_to; 1356 1356 $return['reply_to'] = ""; 1357 1357 1358 if (is_object($reply_to[0])) 1358 1359 { 1359 1360 if ($return['from']['email'] != ($reply_to[0]->mailbox."@".$reply_to[0]->host)) 1360 1361 { 1361 if (!empty($reply_to[0]->personal))1362 foreach ($reply_to as $tmp_reply_to) 1362 1363 { 1363 $personal_reply_to = $this->formatMailObject($tmp_reply_to); 1364 if(!empty($personal_reply_to[0]->text)) { 1365 $return['reply_to'] .= '"' . $personal_reply_to['name']. '"'; 1364 if (!empty($tmp_reply_to->personal)) 1365 { 1366 $personal_tmp_reply_to = $this->formatMailObject($tmp_reply_to); 1367 $return['reply_to'] .= '"' . $personal_tmp_reply_to['name'] . '"'; 1366 1368 $return['reply_to'] .= " "; 1367 1369 $return['reply_to'] .= "<"; 1368 $return['reply_to'] .= $personal_ reply_to['email'];1370 $return['reply_to'] .= $personal_tmp_reply_to['email']; 1369 1371 $return['reply_to'] .= ">"; 1372 $return['reply_to'] .= ", "; 1370 1373 } 1371 else { 1372 $return['reply_to'] .= $reply_to[0]->mailbox . "@" . $reply_to[0]->host; 1374 else 1375 { 1376 if (isset($tmp_reply_to->host) && $tmp_reply_to->host != 'unspecified-domain') 1377 $return['reply_to'] .= $tmp_reply_to->mailbox . "@" . $tmp_reply_to->host; 1378 else 1379 $return['reply_to'] .= $tmp_reply_to->mailbox; 1380 $return['reply_to'] .= ", "; 1373 1381 } 1374 1382 } 1375 else 1376 { 1377 $return['reply_to'] .= $reply_to[0]->mailbox . "@" . $reply_to[0]->host; 1378 } 1379 } 1380 } 1381 $return['reply_to'] = $this->decode_string($return['reply_to']); 1383 $return['reply_to'] = $this->del_last_two_caracters($return['reply_to']); 1384 } 1385 } 1386 else 1387 { 1388 $return['reply_to'] = ""; 1389 } 1390 1382 1391 $return['subject'] = ( isset($header->subject) && trim($header->subject) !== '' ) ? self::decodeMimeString($header->subject) : $this->functions->getLang('(no subject) '); 1383 1392 … … 1398 1407 } 1399 1408 $return['alarm'] = $alarm; 1400 1409 1401 1410 return $return; 1402 1411 } … … 2593 2602 $ccoaddress = preg_replace('/\s+>/', '>', $ccoaddress); 2594 2603 2595 $replytoaddress = $params['input_reply to'];2604 $replytoaddress = $params['input_reply_to']; 2596 2605 $subject = $params['input_subject']; 2597 2606 $return_receipt = $params['input_return_receipt']; … … 2778 2787 else 2779 2788 $mailService->setFrom('"' . $_SESSION['phpgw_info']['expressomail']['user']['firstname'] . ' ' . $_SESSION['phpgw_info']['expressomail']['user']['lastname'] . '" <' . $_SESSION['phpgw_info']['expressomail']['user']['email'] . '>'); 2789 2790 $mailService->addHeaderField('Reply-To', $replytoaddress); 2780 2791 2781 2792 $bol = $this->add_recipients('to', $toaddress, $mailService);
Note: See TracChangeset
for help on using the changeset viewer.