X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fhomonymes.inc.php;h=881f676df139e8e80f693e3b5f6262ac048ebaaf;hb=2553b7686e0678b8e27858a7c377e73ecb410aec;hp=79c11e415900a149c79e87bc881bd717be765d8a;hpb=0337d704b62718d7c77106c0e4c4e26fb02beacf;p=platal.git

diff --git a/include/homonymes.inc.php b/include/homonymes.inc.php
index 79c11e4..881f676 100644
--- a/include/homonymes.inc.php
+++ b/include/homonymes.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -20,8 +20,7 @@
  ***************************************************************************/
 
 function select_if_homonyme($uid) {
-    global $globals;
-    $res = $globals->xdb->query("SELECT  prenom,nom,a.alias AS forlife,h.alias AS loginbis
+    $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')
                              INNER JOIN  aliases       AS h ON (h.id=u.user_id AND h.expire!='')
@@ -30,45 +29,45 @@ 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 = $globals->xdb->query("SELECT alias FROM aliases WHERE id = {?} AND FIND_IN_SET('bestalias', flags)", $uid);
+    $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 = $globals->xdb->query("SELECT alias FROM aliases WHERE id = {?} AND alias != {?} AND expire IS NULL ORDER BY LENGTH(alias) LIMIT 1", $uid, $loginbis);
+    $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();
     // change the bestalias flag
-    $globals->xdb->execute("UPDATE aliases SET flags = (flags & (255 - 1)) | IF(alias = {?}, 1, 0) WHERE id = {?}", $newbest, $uid);
+    XDB::execute("UPDATE aliases SET flags = (flags & (255 - 1)) | IF(alias = {?}, 1, 0) WHERE id = {?}", $newbest, $uid);
 
     return $newbest;
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>