Utilisation d'une template pour envoyer les mails de notification d'administration.

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1466 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/configs/mails.conf b/configs/mails.conf
index fb38f72..bb12914 100644 (file)
--- a/configs/mails.conf
+++ b/configs/mails.conf
@@ -23,6 +23,10 @@ from=support@polytechnique.org
 from="Lettre Mensuelle Polytechnique.org" <info_newsletter@polytechnique.org>
 replyto=info+nlp@polytechnique.org
 
+[intervention_admin]
+from=webmaster@polytechnique.org
+to=web@polytechnique.org
+
 [mails_ax]
 from="Association des Anciens élèves de l'X" <info@amicale.polytechnique.org>
 replyto=info@amicale.polytechnique.org

diff --git a/modules/admin.php b/modules/admin.php
index 0f4b1f1..ac905f5 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -489,11 +489,9 @@ class AdminModule extends PLModule
                     if (XDB::execute($query)) {
                             user_reindex($mr['user_id']);
 
-                            $mailer = new PlMailer();
-                            $mailer->setFrom("webmaster@polytechnique.org");
-                            $mailer->addTo("web@polytechnique.org");
-                            $mailer->setSubject("INTERVENTION de ".S::v('forlife'));
-                            $mailer->setTxtBody(preg_replace("/[ \t]+/", ' ', $query));
+                            $mailer = new PlMailer("admin/mail_intervention.tpl");
+                            $mailer->assign("user", S::v('forlife'));
+                            $mailer->assign("query", $query);
                             $mailer->send();
 
                             $page->trig("updaté correctement.");
@@ -515,11 +513,9 @@ class AdminModule extends PLModule
                     case "u_kill":
                         user_clear_all_subs($mr['user_id']);
                         $page->trig("'{$mr['user_id']}' a été désinscrit !");
-                        $mailer = new PlMailer();
-                        $mailer->setFrom("webmaster@polytechnique.org");
-                        $mailer->addTo("web@polytechnique.org");
-                        $mailer->setSubject("INTERVENTION de ".S::v('forlife'));
-                        $mailer->setTxtBody("\nUtilisateur $login désinscrit");
+                        $mailer = new PlMailer("admin/mail_intervention.tpl");
+                        $mailer->assign("user", S::v('forlife'));
+                        $mailer->assign("query", "\nUtilisateur $login désinscrit");
                         $mailer->send();
                         break;
                 }

diff --git a/templates/admin/mail_intervention.tpl b/templates/admin/mail_intervention.tpl
new file mode 100644 (file)
index 0000000..aa5bde4
--- /dev/null
+++ b/templates/admin/mail_intervention.tpl
@@ -0,0 +1,28 @@
+{**************************************************************************}
+{*                                                                        *}
+{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  http://opensource.polytechnique.org/                                  *}
+{*                                                                        *}
+{*  This program is free software; you can redistribute it and/or modify  *}
+{*  it under the terms of the GNU General Public License as published by  *}
+{*  the Free Software Foundation; either version 2 of the License, or     *}
+{*  (at your option) any later version.                                   *}
+{*                                                                        *}
+{*  This program is distributed in the hope that it will be useful,       *}
+{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
+{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
+{*  GNU General Public License for more details.                          *}
+{*                                                                        *}
+{*  You should have received a copy of the GNU General Public License     *}
+{*  along with this program; if not, write to the Free Software           *}
+{*  Foundation, Inc.,                                                     *}
+{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
+{*                                                                        *}
+{**************************************************************************}
+
+{config_load file="mails.conf" section="intervention_admin"}
+{from full=#from#}
+{to addr=#to#}
+{subject text="INTERVENTION de $user"}
+{$query|regex_replace:"/[ \t]+/":" "}
+{* vim:set et sw=2 sts=2 sws=2: *}