X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplmailer.php;h=24479f6550af7c947b72cb88c9fc2fc6a135e46c;hb=4d1c62e006bc896e9ddb59d15dc7a7e30f9eb48e;hp=2106d5024b91098f057d2d2c9523ea74f2fcb4c9;hpb=ba63661ce2f38974002c7e4113320e9d06010853;p=platal.git

diff --git a/classes/plmailer.php b/classes/plmailer.php
index 2106d50..24479f6 100644
--- a/classes/plmailer.php
+++ b/classes/plmailer.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -163,12 +163,24 @@ class PlMailer extends Mail_Mime {
         }
     }
 
+    static private function 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)
     {
-        return preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!u', '\1"\2" \3', $email);
+        if ($email instanceof PlUser) {
+            $email = self::formatUser($email);
+        }
+        $email = preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!ue',
+                              '\1 "\2" \3', $email);
+        return preg_replace('/"([^<]+)"/e',
+                            '"\\"" . PlMailer::encodeStringQP("\1") . "\\""',
+                            $email);
     }
 
     public function addTo($email)
@@ -181,6 +193,12 @@ class PlMailer extends Mail_Mime {
         }
     }
 
+    public function setTo($email)
+    {
+        $email = $this->correct_emails($email);
+        $this->_headers['To'] = $email;
+    }
+
     public function addCc($email)
     {
         return parent::addCc($this->correct_emails($email));
@@ -196,6 +214,26 @@ class PlMailer extends Mail_Mime {
         return parent::setFrom($this->correct_emails($email));
     }
 
+    static function encodeStringQP($string)
+    {
+        if (!preg_match('/^[\x20-\x7e]*$/', $string)) {
+            $string = '=?UTF-8?Q?' . preg_replace('/[^\x21-\x3C\x3e\x40-\x7e]/e', 'PlMailer::encodeQP("\0")', $string)
+                     . '?=';
+        }
+        return $string;
+    }
+
+
+    static function encodeQP($char)
+    {
+        return sprintf('=%02X', ord($char));
+    }
+
+    public function setSubject($subject)
+    {
+        return parent::setSubject(self::encodeStringQP($subject));
+    }
+
     public function addHeader($hdr,$val)
     {
         switch($hdr) {
@@ -269,6 +307,7 @@ class PlMailer extends Mail_Mime {
             if (!($globals->debug & DEBUG_SMARTY)) {
                 $level = error_reporting(0);
             }
+            $this->page->assign_by_ref('globals', $globals);
             $this->page->run('head'); // process page headers
             $this->wiki = trim($this->page->run('wiki')); // get wiki
             if (!$this->wiki) {
@@ -292,16 +331,22 @@ class PlMailer extends Mail_Mime {
         }
     }
 
+    public function sendTo(PlUser &$user)
+    {
+        $this->setTo($user);
+        $this->assign_by_ref('user', $user);
+        return $this->send($user->isEmailFormatHtml());
+    }
+
     public function send($with_html = true)
     {
         $this->processPage($with_html);
-        if (S::v('forlife')) {
-            global $globals;
-            $this->addHeader('X-Org-Mail', S::v('forlife') . '@' . $globals->mail->domain);
+        if (S::user()) {
+            $this->addHeader('X-Org-Mail', S::user()->forlifeEmail());
         }
         $addrs = Array();
-        foreach(Array('To', 'Cc', 'Bcc') as $hdr) {
-            if(isset($this->_headers[$hdr])) {
+        foreach (Array('To', 'Cc', 'Bcc') as $hdr) {
+            if (isset($this->_headers[$hdr])) {
                 require_once 'Mail/RFC822.php';
                 $parsed = @Mail_RFC822::parseAddressList($this->_headers[$hdr]);
                 if (is_array($parsed)) {
@@ -309,15 +354,26 @@ class PlMailer extends Mail_Mime {
                 }
             }
         }
-        if(empty($addrs)) {
+        if (empty($addrs)) {
             return false;
         }
 
         $dests = Array();
-        foreach($addrs as $a) {
+        foreach ($addrs as $a) {
             $dests[] = "{$a->mailbox}@{$a->host}";
         }
 
+        // Support for a "catch-all" email address, to be used by developers.
+        // This mode can only be activated when the working copy is in restricted
+        // mode, to ensure that production plat/al copies are never affected.
+        global $globals;
+        if ($globals->email_catchall && $globals->core->restricted_platal) {
+            require_once 'Mail/RFC822.php';
+            if (@Mail_RFC822::isValidInetAddress($globals->email_catchall)) {
+                $dests = array($globals->email_catchall);
+            }
+        }
+
         // very important to do it in THIS order very precisely.
         $body = $this->get(array('text_charset' => $this->charset,
                                  'text_encoding' => '8bit',