X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fhomonymes.inc.php;h=13a307609cb50029659c50da0a9988d4795e4c30;hb=08d7cc452e666835373023f2ca8416e75e2cb9c5;hp=2777b2a44e0d4528f1d5c8cfffeddac551c70b76;hpb=08cce2ff528b38bde27cdec6d6bc28d6af4a42d4;p=platal.git

diff --git a/include/homonymes.inc.php b/include/homonymes.inc.php
index 2777b2a..13a3076 100644
--- a/include/homonymes.inc.php
+++ b/include/homonymes.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -20,7 +20,6 @@
  ***************************************************************************/
 
 function select_if_homonyme($uid) {
-    global $globals;
     $res = XDB::query("SELECT  prenom,nom,a.alias AS forlife,h.alias AS loginbis
                                    FROM  auth_user_md5 AS u
                              INNER JOIN  aliases       AS a ON (a.id=u.user_id AND a.type='a_vie')
@@ -30,38 +29,37 @@ function select_if_homonyme($uid) {
 }
 
 function send_warning_homonyme($prenom, $nom, $forlife, $loginbis) {
-    require_once("diogenes/diogenes.hermes.inc.php");
-    $cc = "support+homonyme@polytechnique.org";
+    global $globals;
+    $cc = "support+homonyme@" . $globals->mail->domain;
     $FROM = "\"Support Polytechnique.org\" <$cc>";
-    $mymail = new HermesMailer();
+    $mymail = new PlMailer();
     $mymail->setFrom($FROM);
-    $mymail->setSubject("Dans 2 semaines, suppression de $loginbis@polytechnique.org");
-    $mymail->addTo("$prenom $nom <$forlife@polytechnique.org>");
+    $mymail->setSubject("Dans 2 semaines, suppression de $loginbis@" . $globals->mail->domain);
+    $mymail->addTo("$prenom $nom <$forlife@" . $globals->mail->domain . '>');
     $mymail->addCc($cc);
-    $mymail->setTxtBody(Env::get('mailbody'));
+    $mymail->setTxtBody(Env::v('mailbody'));
     $mymail->send();
 }
 
 function send_robot_homonyme($prenom, $nom, $forlife, $loginbis) {
-    require_once("diogenes/diogenes.hermes.inc.php");
-    $cc = "support+homonyme@polytechnique.org";
+    global $globals;
+    $cc = "support+homonyme@" . $globals->mail->domain;
     $FROM = "\"Support Polytechnique.org\" <$cc>";
-    $mymail = new HermesMailer();
+    $mymail = new PlMailer();
     $mymail->setFrom($FROM);
-    $mymail->setSubject("Mise en place du robot $loginbis@polytechnique.org");
-    $mymail->addTo("$prenom $nom <$forlife@polytechnique.org>");
+    $mymail->setSubject("Mise en place du robot $loginbis@" . $globals->mail->domain);
+    $mymail->addTo("$prenom $nom <$forlife@" . $globals->mail->domain . '>');
     $mymail->addCc($cc);
-    $mymail->setTxtBody(Env::get('mailbody'));
+    $mymail->setTxtBody(Env::v('mailbody'));
     $mymail->send();
 }
 
 function switch_bestalias($uid, $loginbis) {
-    global $globals;
     // check if loginbis was the bestalias
     $res = XDB::query("SELECT alias FROM aliases WHERE id = {?} AND FIND_IN_SET('bestalias', flags)", $uid);
     $bestalias = $res->fetchOneCell();
     if ($bestalias && $bestalias != $loginbis) return false;
-    
+
     // select the shortest alias still alive
     $res = XDB::query("SELECT alias FROM aliases WHERE id = {?} AND alias != {?} AND expire IS NULL ORDER BY LENGTH(alias) LIMIT 1", $uid, $loginbis);
     $newbest = $res->fetchOneCell();
@@ -71,4 +69,5 @@ function switch_bestalias($uid, $loginbis) {
     return $newbest;
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>