From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 21 Jan 2009 12:34:55 +0000 (+0100)
Subject: Can use a User object in addTo, setFrom...
X-Git-Tag: core/1.0.1~27
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e25ddad9784ef9e8e4de1847b50207f88622a165;p=platal.git

Can use a User object in addTo, setFrom...

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/classes/plmailer.php b/classes/plmailer.php
index 8561346..ef51503 100644
--- a/classes/plmailer.php
+++ b/classes/plmailer.php
@@ -163,11 +163,19 @@ class PlMailer extends Mail_Mime {
         }
     }
 
+    static private formatUser(PlUser $user)
+    {
+        return '"' . $user->fullName() . '" <' . $user->bestEmail() . '>';
+    }
+
     /**
      * converts all : Foo Bar Baz <quux@foobar.org> into "Foo Bar Baz" <quux@foobar.org> which is RFC compliant
      */
     private function correct_emails($email)
     {
+        if ($email instanceof PlUser) {
+            $email = self::formatUser($email);
+        }
         return preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!u', '\1"\2" \3', $email);
     }
 
@@ -309,7 +317,7 @@ class PlMailer extends Mail_Mime {
 
     public function sendTo(PlUser &$user)
     {
-        $this->addTo('"' . $user->fullName() . '" <' . $user->bestEmail() . '>');
+        $this->addTo($user);
         $this->assign_by_ref('user', $user);
         return $this->send($user->isEmailFormatHtml());
     }