From: x2000habouzit Date: Tue, 16 Nov 2004 21:02:45 +0000 (+0000) Subject: be more cautious X-Git-Tag: xorg/old~926 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=759939a55eab87c6d0c68935f72e76493864184a;p=platal.git be more cautious --- diff --git a/htdocs/admin/homonymes.php b/htdocs/admin/homonymes.php index 216ecb9..b494746 100644 --- a/htdocs/admin/homonymes.php +++ b/htdocs/admin/homonymes.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: homonymes.php,v 1.7 2004-11-16 20:36:11 x2000habouzit Exp $ + $Id: homonymes.php,v 1.8 2004-11-16 21:02:45 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -53,7 +53,7 @@ $page->assign('baseurl',$baseurl); if ($target) { // from $cc = "support+homonyme@polytechnique.org"; - $FROM = "Support Polytechnique.org <$cc>"; + $FROM = "\"Support Polytechnique.org\" <$cc>"; // on examine l'op a effectuer switch ($op) { diff --git a/htdocs/newsletter/submit.php b/htdocs/newsletter/submit.php index 156b261..34208b4 100644 --- a/htdocs/newsletter/submit.php +++ b/htdocs/newsletter/submit.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: submit.php,v 1.5 2004-11-16 20:36:11 x2000habouzit Exp $ + $Id: submit.php,v 1.6 2004-11-16 21:02:46 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -34,7 +34,7 @@ if(isset($_POST['see'])) { $nl->saveArticle($art); require("diogenes.hermes.inc.php"); - $from = "{$_SESSION['prenom']} {$_SESSION['nom']} ({$_SESSION['promo']}) <{$_SESSION['forlife']}@polytechnique.org>"; + $from = "\"{$_SESSION['prenom']} {$_SESSION['nom']} ({$_SESSION['promo']})\" <{$_SESSION['forlife']}@polytechnique.org>"; $mailer = new HermesMailer(); $mailer->setSubject("proposition d'article dans la NL"); $mailer->setTo('Equipe Newsletter Polytechnique.org '); diff --git a/htdocs/paiement/cyberpaiement_retour.php b/htdocs/paiement/cyberpaiement_retour.php index f202a9f..a5efb45 100644 --- a/htdocs/paiement/cyberpaiement_retour.php +++ b/htdocs/paiement/cyberpaiement_retour.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: cyberpaiement_retour.php,v 1.9 2004-11-16 20:36:12 x2000habouzit Exp $ + $Id: cyberpaiement_retour.php,v 1.10 2004-11-16 21:02:46 x2000habouzit Exp $ ***************************************************************************/ require("config.xorg.inc.php") ; @@ -130,7 +130,7 @@ $conf_text = str_replace("",$femme ? "Ch $mymail = new HermesMailer(); $mymail->setFrom($conf_mail); -$mymail->addTo("$prenom $nom <$forlife@polytechnique.org>"); +$mymail->addTo("\"$prenom $nom\" <$forlife@polytechnique.org>"); $mymail->addCc($conf_mail); $mymail->setSubject($conf_title); $mymail->setTxtBody($conf_text); diff --git a/include/identification.inc.php b/include/identification.inc.php index f7ef789..ab59e2e 100644 --- a/include/identification.inc.php +++ b/include/identification.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: identification.inc.php,v 1.16 2004-11-16 20:43:06 x2000habouzit Exp $ + $Id: identification.inc.php,v 1.17 2004-11-16 21:02:46 x2000habouzit Exp $ ***************************************************************************/ require_once('xorg.misc.inc.php'); @@ -194,10 +194,10 @@ if ( $homonyme ) { $globals->db->query("REPLACE INTO homonymes (homonyme_id,user_id) VALUES ($h_id,$h_id)"); require_once('diogenes.hermes.inc.php'); $mailer = new HermesMailer(); - $mailer->setFrom('Support Polytechnique.org '); + $mailer->setFrom('\"Support Polytechnique.org\" '); $mailer->addTo("$mailorg@polytechnique.org"); $mailer->setSubject("perte de ton alias $mailorg dans un mois !"); - $mailer->addCc('Support Polytechnique.org '); + $mailer->addCc('\"Support Polytechnique.org\" '); $msg = "Un homonyme s'est inscrit, nous ne pouvons donc garder ton alias '$mailorg'.\n\n". "Tu gardes tout de même l'usage de cet alias pour 1 mois encore à compter de ce jour.\n\n". diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index 950c09e..c1741a3 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: newsletter.inc.php,v 1.32 2004-11-16 19:45:59 x2000habouzit Exp $ + $Id: newsletter.inc.php,v 1.33 2004-11-16 21:02:46 x2000habouzit Exp $ ***************************************************************************/ define('FEMME', 1); @@ -259,7 +259,7 @@ EOF; $mailer = new HermesMailer(); $mailer->setFrom("\"Lettre Mensuelle Polytechnique.org\" "); $mailer->setSubject($this->title()); - $mailer->addTo("$prenom $nom <$forlife@polytechnique.org>"); + $mailer->addTo("\"$prenom $nom\" <$forlife@polytechnique.org>"); $mailer->addHeader('Reply-To','info+nlp@polytechnique.org'); $mailer->setTxtBody($this->toText($prenom,$nom,$sex)); if($html) { diff --git a/scripts/cron/send_notifs.php b/scripts/cron/send_notifs.php index ec65f0f..fbd085d 100755 --- a/scripts/cron/send_notifs.php +++ b/scripts/cron/send_notifs.php @@ -19,7 +19,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: send_notifs.php,v 1.2 2004-11-16 20:39:08 x2000habouzit Exp $ + $Id: send_notifs.php,v 1.3 2004-11-16 21:02:47 x2000habouzit Exp $ ***************************************************************************/ require('./connect.db.inc.php'); @@ -54,7 +54,7 @@ foreach($all->_data as $u) { $mailer = new HermesMailer(); $mailer->setFrom("Carnet Polytechnicien "); - $mailer->addTo("{$u['prenom']} {$u['nom']} <{$u['forlife']}@polytechnique.org>"); + $mailer->addTo("\"{$u['prenom']} {$u['nom']}\" <{$u['forlife']}@polytechnique.org>"); $mailer->setSubject("Notifications de la semaine ".date("W - Y")); $mailer->setTxtBody($text); $mailer->send();