X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fhomonymes.inc.php;h=93406c0a9770d39675cf164a47a6695536c06a86;hb=145006c0ff77fa8a329616c2c8859191b2b236f7;hp=12cf9c27e54c4a3a2e7f351920932f911c5ef48f;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git diff --git a/include/homonymes.inc.php b/include/homonymes.inc.php index 12cf9c2..93406c0 100644 --- a/include/homonymes.inc.php +++ b/include/homonymes.inc.php @@ -29,24 +29,24 @@ function select_if_homonyme($uid) { } function send_warning_homonyme($prenom, $nom, $forlife, $loginbis) { - $cc = "support+homonyme@polytechnique.org"; + $cc = "support+homonyme@" . $globals->mail->domain; $FROM = "\"Support Polytechnique.org\" <$cc>"; $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::v('mailbody')); $mymail->send(); } function send_robot_homonyme($prenom, $nom, $forlife, $loginbis) { - $cc = "support+homonyme@polytechnique.org"; + $cc = "support+homonyme@" . $globals->mail->domain; $FROM = "\"Support Polytechnique.org\" <$cc>"; $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::v('mailbody')); $mymail->send(); @@ -57,7 +57,7 @@ function switch_bestalias($uid, $loginbis) { $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();