Changeset 6839
- Timestamp:
- 07/20/12 15:07:30 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php
r6833 r6839 1256 1256 if (!empty($tmp->personal)) 1257 1257 { 1258 $personal_tmp = imap_mime_header_decode($tmp->personal);1259 $return['toaddress2'] .= '"' . $personal_tmp[0]->text. '"';1258 $personal_tmp = $this->formatMailObject($tmp); 1259 $return['toaddress2'] .= '"' . $personal_tmp['name'] . '"'; 1260 1260 $return['toaddress2'] .= " "; 1261 1261 $return['toaddress2'] .= "<"; 1262 if ($tmp->host != 'unspecified-domain') 1263 $return['toaddress2'] .= $tmp->mailbox . "@" . $tmp->host; 1264 else 1265 $return['toaddress2'] .= $tmp->mailbox; 1262 $return['toaddress2'] .= $personal_tmp['email']; 1266 1263 $return['toaddress2'] .= ">"; 1267 1264 $return['toaddress2'] .= ", "; … … 1291 1288 if (!empty($tmp_cc->personal)) 1292 1289 { 1293 $personal_tmp_cc = imap_mime_header_decode($tmp_cc->personal);1294 $return['cc'] .= '"' . $personal_tmp_cc[0]->text . '"'; 1290 $personal_tmp_cc = $this->formatMailObject($tmp_cc); 1291 $return['cc'] .= '"' . $personal_tmp_cc['name']. '"'; 1295 1292 $return['cc'] .= " "; 1296 1293 $return['cc'] .= "<"; 1297 if ($tmp_cc->host != 'unspecified-domain') 1298 $return['cc'] .= $tmp_cc->mailbox . "@" . $tmp_cc->host; 1299 else 1300 $return['cc'] .= $tmp_cc->mailbox; 1301 //$return['cc'] .= $tmp_cc->mailbox . "@" . $tmp_cc->host; 1294 $return['cc'] .= $personal_tmp_cc['email']; 1302 1295 $return['cc'] .= ">"; 1303 1296 $return['cc'] .= ", "; … … 1335 1328 if (!empty($tmp_bcc->personal)) 1336 1329 { 1337 $personal_tmp_bcc = imap_mime_header_decode($tmp_bcc->personal);1338 $return['bcc'] .= '"' . $personal_tmp_bcc[0]->text. '"';1330 $personal_tmp_bcc = $this->formatMailObject($tmp_bcc); 1331 $return['bcc'] .= '"' . $personal_tmp_bcc['name'] . '"'; 1339 1332 $return['bcc'] .= " "; 1340 1333 $return['bcc'] .= "<"; 1341 if ($tmp_bcc->host != 'unspecified-domain') 1342 $return['bcc'] .= $tmp_bcc->mailbox . "@" . $tmp_bcc->host; 1343 else 1344 $return['bcc'] .= $tmp_bcc->mailbox; 1334 $return['bcc'] .= $personal_tmp_bcc['email']; 1345 1335 $return['bcc'] .= ">"; 1346 1336 $return['bcc'] .= ", "; … … 1371 1361 if (!empty($reply_to[0]->personal)) 1372 1362 { 1373 $personal_reply_to = imap_mime_header_decode($tmp_reply_to->personal);1363 $personal_reply_to = $this->formatMailObject($tmp_reply_to); 1374 1364 if(!empty($personal_reply_to[0]->text)) { 1375 $return['reply_to'] .= '"' . $personal_reply_to[ 0]->text. '"';1365 $return['reply_to'] .= '"' . $personal_reply_to['name']. '"'; 1376 1366 $return['reply_to'] .= " "; 1377 1367 $return['reply_to'] .= "<"; 1378 $return['reply_to'] .= $ reply_to[0]->mailbox . "@" . $reply_to[0]->host;1368 $return['reply_to'] .= $personal_reply_to['email']; 1379 1369 $return['reply_to'] .= ">"; 1380 1370 }
Note: See TracChangeset
for help on using the changeset viewer.