fixes

diff --git a/configs/mails.conf b/configs/mails.conf
index e1b16b0..7ff7679 100644 (file)
--- a/configs/mails.conf
+++ b/configs/mails.conf
@@ -1,30 +1,30 @@
 [valid_alias]
-from=Equipe Polytechnique.org <validation+melix@polytechnique.org>
-cc=Equipe Polytechnique.org <validation+melix@polytechnique.org>
+from="Equipe Polytechnique.org" <validation+melix@polytechnique.org>
+cc="Equipe Polytechnique.org" <validation+melix@polytechnique.org>
 
 [valid_emploi]
-from=Equipe Polytechnique.org <validation+emploi@polytechnique.org>
-cc=Equipe Polytechnique.org <validation+emploi@polytechnique.org>
+from="Equipe Polytechnique.org" <validation+emploi@polytechnique.org>
+cc="Equipe Polytechnique.org" <validation+emploi@polytechnique.org>
 
 [valid_epouses]
-from=Equipe Polytechnique.org <validation+epouse@polytechnique.org>
-cc=Equipe Polytechnique.org <validation+epouse@polytechnique.org>
+from="Equipe Polytechnique.org" <validation+epouse@polytechnique.org>
+cc="Equipe Polytechnique.org" <validation+epouse@polytechnique.org>
 
 [valid_liste]
-from=Equipe Polytechnique.org <validation+listes@polytechnique.org>
-cc=Equipe Polytechnique.org <validation+listes@polytechnique.org>
+from="Equipe Polytechnique.org" <validation+listes@polytechnique.org>
+cc="Equipe Polytechnique.org" <validation+listes@polytechnique.org>
 
 [valid_photos]
-from=Equipe Polytechnique.org <validation+trombino@polytechnique.org>
-cc=Equipe Polytechnique.org <validation+trombino@polytechnique.org>
+from="Equipe Polytechnique.org" <validation+trombino@polytechnique.org>
+cc="Equipe Polytechnique.org" <validation+trombino@polytechnique.org>
 
 [valid_evts]
-from=Equipe Polytechnique.org <validation+evts@polytechnique.org>
-cc=Equipe Polytechnique.org <validation+evts@polytechnique.org>
+from="Equipe Polytechnique.org" <validation+evts@polytechnique.org>
+cc="Equipe Polytechnique.org" <validation+evts@polytechnique.org>
 
 [valid_sondages]
-from=Equipe Polytechnique.org <validation+sondages@polytechnique.org>
-cc=Equipe Polytechnique.org <validation+sondages@polytechnique.org>
+from="Equipe Polytechnique.org" <validation+sondages@polytechnique.org>
+cc="Equipe Polytechnique.org" <validation+sondages@polytechnique.org>
 
 [pattecassee_nl]
 from=Polytechnique.org <support@polytechnique.org>
@@ -33,7 +33,7 @@ from=Polytechnique.org <support@polytechnique.org>
 from=Pre-Inscription <register@polytechnique.org>
 
 [marketing_thanks]
-from=Marketing Polytechnique.org <register@polytechnique.org>
+from="Marketing Polytechnique.org" <register@polytechnique.org>
 
 [inscrire]
 from=Pre-Inscription <register@polytechnique.org>

diff --git a/include/tpl.mailer.inc.php b/include/tpl.mailer.inc.php
index 83168f1..d00547b 100644 (file)
--- a/include/tpl.mailer.inc.php
+++ b/include/tpl.mailer.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: tpl.mailer.inc.php,v 1.4 2004-11-16 20:45:09 x2000habouzit Exp $
+        $Id: tpl.mailer.inc.php,v 1.5 2004-11-16 20:59:06 x2000habouzit Exp $
  ***************************************************************************/
 
 require_once("diogenes.hermes.inc.php");
@@ -68,12 +68,12 @@ class TplMailer extends Smarty {
         // do not try to optimize, in the templates, some function can modify our object, then we
         // have to fetch in the first time, and only then send the mail.
         $body = $this->fetch($this->mail_dir."/".$this->_tpl);
-        $mailer = new HermesMailer()
+        $mailer = new HermesMailer();
        $mailer->setFrom($this->_from);
        $mailer->addTo(implode(',',$this->_to));
        $mailer->setSubject($this->_subject);
        if (!empty($this->_cc)) $mailer->addCc(implode(',',$this->_cc));
-       if (!empty($this->_cc)) $mailer->addBcc(implode(',',$this->_bcc));
+       if (!empty($this->_bcc)) $mailer->addBcc(implode(',',$this->_bcc));
         $mailer->setTxtBody($body);
         $mailer->send();
     }