From: x2000habouzit Date: Tue, 16 Nov 2004 20:59:06 +0000 (+0000) Subject: fixes X-Git-Tag: xorg/old~927 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4787686c349f577c5cc63f5c97565488c04fae37;p=platal.git fixes --- diff --git a/configs/mails.conf b/configs/mails.conf index e1b16b0..7ff7679 100644 --- a/configs/mails.conf +++ b/configs/mails.conf @@ -1,30 +1,30 @@ [valid_alias] -from=Equipe Polytechnique.org -cc=Equipe Polytechnique.org +from="Equipe Polytechnique.org" +cc="Equipe Polytechnique.org" [valid_emploi] -from=Equipe Polytechnique.org -cc=Equipe Polytechnique.org +from="Equipe Polytechnique.org" +cc="Equipe Polytechnique.org" [valid_epouses] -from=Equipe Polytechnique.org -cc=Equipe Polytechnique.org +from="Equipe Polytechnique.org" +cc="Equipe Polytechnique.org" [valid_liste] -from=Equipe Polytechnique.org -cc=Equipe Polytechnique.org +from="Equipe Polytechnique.org" +cc="Equipe Polytechnique.org" [valid_photos] -from=Equipe Polytechnique.org -cc=Equipe Polytechnique.org +from="Equipe Polytechnique.org" +cc="Equipe Polytechnique.org" [valid_evts] -from=Equipe Polytechnique.org -cc=Equipe Polytechnique.org +from="Equipe Polytechnique.org" +cc="Equipe Polytechnique.org" [valid_sondages] -from=Equipe Polytechnique.org -cc=Equipe Polytechnique.org +from="Equipe Polytechnique.org" +cc="Equipe Polytechnique.org" [pattecassee_nl] from=Polytechnique.org @@ -33,7 +33,7 @@ from=Polytechnique.org from=Pre-Inscription [marketing_thanks] -from=Marketing Polytechnique.org +from="Marketing Polytechnique.org" [inscrire] from=Pre-Inscription diff --git a/include/tpl.mailer.inc.php b/include/tpl.mailer.inc.php index 83168f1..d00547b 100644 --- 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(); }