RetailCRM-Mirror/Fetch
1
0
Fork 0
mirror of https://github.com/retailcrm/Fetch.git synced 2024-11-25 12:36:01 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63 from AaronVanGeffen/master

Browse Source 
Making the sender address easily accessibly through Message::getAddresses
This commit is contained in:
Robert Hafner 2014-12-01 21:21:22 -08:00
commit 933cf095b8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Fetch/Message.php
View File

@ -121,6 +121,13 @@ class Message
*/ */
protected $from; protected $from;
/**
* This is an array containing information about the address the email was sent from.
*
* @var string
*/
protected $sender;
/** /**
* This is an array of arrays that contains information about the addresses the email was sent to. * This is an array of arrays that contains information about the addresses the email was sent to.
* *
@ -240,6 +247,9 @@ class Message
if (isset($headers->bcc)) if (isset($headers->bcc))
$this->bcc = $this->processAddressObject($headers->bcc); $this->bcc = $this->processAddressObject($headers->bcc);
if (isset($headers->sender))
$this->sender = $this->processAddressObject($headers->sender);
$this->from = isset($headers->from) ? $this->processAddressObject($headers->from) : array(''); $this->from = isset($headers->from) ? $this->processAddressObject($headers->from) : array('');
$this->replyTo = isset($headers->reply_to) ? $this->processAddressObject($headers->reply_to) : $this->from; $this->replyTo = isset($headers->reply_to) ? $this->processAddressObject($headers->reply_to) : $this->from;
@ -367,14 +377,14 @@ class Message
* This function returns either an array of email addresses and names or, optionally, a string that can be used in * This function returns either an array of email addresses and names or, optionally, a string that can be used in
* mail headers. * mail headers.
* *
* @param string $type Should be 'to', 'cc', 'bcc', 'from', or 'reply-to'. * @param string $type Should be 'to', 'cc', 'bcc', 'from', 'sender', or 'reply-to'.
* @param bool $asString * @param bool $asString
* @return array|string|bool * @return array|string|bool
*/ */
public function getAddresses($type, $asString = false) public function getAddresses($type, $asString = false)
{ {
$type = ( $type == 'reply-to' ) ? 'replyTo' : $type; $type = ( $type == 'reply-to' ) ? 'replyTo' : $type;
$addressTypes = array('to', 'cc', 'bcc', 'from', 'replyTo'); $addressTypes = array('to', 'cc', 'bcc', 'from', 'sender', 'replyTo');
if (!in_array($type, $addressTypes) || !isset($this->$type) || count($this->$type) < 1) if (!in_array($type, $addressTypes) || !isset($this->$type) || count($this->$type) < 1)
return false; return false;
@ -382,6 +392,8 @@ class Message
if (!$asString) { if (!$asString) {
if ($type == 'from') if ($type == 'from')
return $this->from[0]; return $this->from[0];
elseif ($type == 'sender')
return $this->sender[0];
return $this->$type; return $this->$type;
} else { } else {