X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplmailer.php;h=e928a0a56b56006106277a67fa8f497f5cbf4da6;hb=1623168586bac6073585130fc2aa864345463ac6;hp=24479f6550af7c947b72cb88c9fc2fc6a135e46c;hpb=7418556c91a5d8e81e23d9a335fbc3a5623a4079;p=platal.git

diff --git a/classes/plmailer.php b/classes/plmailer.php
index 24479f6..e928a0a 100644
--- a/classes/plmailer.php
+++ b/classes/plmailer.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -50,7 +50,7 @@ class PlMail extends Smarty
         $this->assign_by_ref('globals', $globals);
     }
 
-    public static function &get(&$mailer, $tpl)
+    public static function &get($mailer, $tpl)
     {
         static $plmail;
         if (!isset($plmail) || $plmail->tpl != $tpl) {
@@ -71,7 +71,7 @@ class PlMail extends Smarty
     }
 
     /** used to remove the empty lines due to {from ...}, {to ...} ... functions */
-    static public function mail_format($output, &$smarty)
+    static public function mail_format($output, $smarty)
     {
         return "\n".trim($output)."\n";
     }
@@ -91,7 +91,7 @@ class PlMail extends Smarty
      * {from full=...} for an already formatted address
      * {from addr=... [text=...]} else
      */
-    public function setFrom($params, &$smarty)
+    public function setFrom($params, $smarty)
     {
         $smarty->mailer->setFrom(PlMail::format_addr($params));
     }
@@ -100,7 +100,7 @@ class PlMail extends Smarty
      * {to full=...} for an already formatted address
      * {to addr=... [text=...]} else
      */
-    public function addTo($params, &$smarty)
+    public function addTo($params, $smarty)
     {
         $smarty->mailer->addTo(PlMail::format_addr($params));
     }
@@ -109,7 +109,7 @@ class PlMail extends Smarty
      * {cc full=...} for an already formatted address
      * {cc addr=... [text=...]} else
      */
-    public function addCc($params, &$smarty)
+    public function addCc($params, $smarty)
     {
         $smarty->mailer->addCc(PlMail::format_addr($params));
     }
@@ -118,7 +118,7 @@ class PlMail extends Smarty
      * {bcc full=...} for an already formatted address
      * {bcc addr=... [text=...]} else
      */
-    public function addBcc($params, &$smarty)
+    public function addBcc($params, $smarty)
     {
         $smarty->mailer->addBcc(PlMail::format_addr($params));
     }
@@ -126,7 +126,7 @@ class PlMail extends Smarty
     /** template function : subject.
      * {subject text=...}
      */
-    public function setSubject($params, &$smarty)
+    public function setSubject($params, $smarty)
     {
         $smarty->mailer->setSubject($params['text']);
     }
@@ -134,7 +134,7 @@ class PlMail extends Smarty
     /** template function : add_header.
      * {add_header name=... value=...}
      */
-    public function addHeader($params, &$smarty)
+    public function addHeader($params, $smarty)
     {
         $smarty->mailer->addHeader($params['name'], $params['value']);
     }
@@ -176,7 +176,7 @@ class PlMailer extends Mail_Mime {
         if ($email instanceof PlUser) {
             $email = self::formatUser($email);
         }
-        $email = preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!ue',
+        $email = preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!u',
                               '\1 "\2" \3', $email);
         return preg_replace('/"([^<]+)"/e',
                             '"\\"" . PlMailer::encodeStringQP("\1") . "\\""',
@@ -261,7 +261,7 @@ class PlMailer extends Mail_Mime {
         }
     }
 
-    public function addUploadAttachment(PlUpload &$upload, $name)
+    public function addUploadAttachment(PlUpload $upload, $name)
     {
         $encoding = $upload->isType('text') ? 'quoted-printable' : 'base64';
         $this->addAttachment($upload->getContents(), $upload->contentType(), $name, false, $encoding);
@@ -331,7 +331,7 @@ class PlMailer extends Mail_Mime {
         }
     }
 
-    public function sendTo(PlUser &$user)
+    public function sendTo(PlUser $user)
     {
         $this->setTo($user);
         $this->assign_by_ref('user', $user);