Updates class PlMailer to use the new User object.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

diff --git a/classes/plmailer.php b/classes/plmailer.php
index 2106d50..95e5a5c 100644 (file)
--- a/classes/plmailer.php
+++ b/classes/plmailer.php
@@ -295,7 +295,10 @@ class PlMailer extends Mail_Mime {
     public function send($with_html = true)
     {
         $this->processPage($with_html);
-        if (S::v('forlife')) {
+        if (S::user()) {
+            $this->addHeader('X-Org-Mail', S::user()->forlifeEmail());
+        } else if (S::v('forlife')) {
+            // TODO(vzanotti): trash this code when hruid will be part of master.
             global $globals;
             $this->addHeader('X-Org-Mail', S::v('forlife') . '@' . $globals->mail->domain);
         }