Merge pull request #8 from czPechy/master

Added Contact class, getSender function

Author: greeny

MailLibrary/Contact.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * @author Martin Pecha
+ */
+
+namespace greeny\MailLibrary;
+
+/**
+ * Class Contact
+ * @package greeny\MailLibrary
+ */
+class Contact {
+
+	/** @var  string */
+	private $mailbox;
+	/** @var  string */
+	private $host;
+	/** @var  string */
+	private $personal;
+	/** @var  string */
+	private $adl;
+
+	/**
+	 * @param $mailbox
+	 * @param $host
+	 * @param $personal
+	 * @param $adl
+	 */
+	public function __construct($mailbox=NULL, $host=NULL, $personal=NULL, $adl=NULL) {
+		$this->mailbox = $mailbox;
+		$this->host = $host;
+		$this->personal = $personal;
+		$this->adl = $adl;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString() {
+		$address = $this->getName() ? "\"" . $this->getName(). "\" " : "";
+		$address .= $this->getAdl() ? $this->getAdl().":" : "";
+		$address .= "<".$this->getEmail().">";
+		return $address;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getEmail() {
+		return $this->mailbox."@".$this->host;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName() {
+		return $this->personal;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getAdl() {
+		return $this->adl;
+	}
+
+}

MailLibrary/ContactList.php

@@ -15,22 +15,15 @@ class ContactList implements Iterator, Countable{
 
 	public function addContact($mailbox = NULL, $host = NULL, $personal = NULL, $adl = NULL)
 	{
-		$this->contacts[] = array(
-			'mailbox' => $mailbox,
-			'host' => $host,
-			'personal' => $personal,
-			'adl' => $adl,
-		);
+		$this->contacts[] = new Contact($mailbox,$host,$personal,$adl);
 	}
 
 	public function build()
 	{
 		$return = array();
+		/** @var Contact $contact */
 		foreach($this->contacts as $contact) {
-			$address = $contact['personal'] ? "\"" . $contact['personal']. "\" " : "";
-			$address .= $contact['adl'] ? $contact['adl'].":" : "";
-			$address .= "<".$contact['mailbox']."@".$contact['host'].">";
-			$return[] = $address;
+			$return[] = $contact->__toString();
 		}
 		$this->builtContacts = $return;
 	}
@@ -40,6 +33,14 @@ public function getContacts()
 		return $this->builtContacts;
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getContactsObjects()
+	{
+		return $this->contacts;
+	}
+
 	public function __toString()
 	{
 		return implode(', ', $this->builtContacts);

MailLibrary/Mail.php

@@ -203,6 +203,14 @@ public function delete()
 		$this->connection->getDriver()->deleteMail($this->id);
 	}
 
+	/**
+	 * @return Contact|null
+	 */
+	public function getSender() {
+		$contacts = $this->from->getContactsObjects();
+		return (!empty($contacts[0]) ? $contacts[0] : null);
+	}
+
 	/**
 	 * Initializes headers
 	 */