From: Stéphane Jacob <sj@m4x.org>
Date: Wed, 23 Jun 2010 09:35:06 +0000 (+0200)
Subject: Fixes email sent from xnet.
X-Git-Tag: xorg/1.0.0~73
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b41fa03aca6a3fb760e7bad8949f20fef3382bb8;p=platal.git

Fixes email sent from xnet.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/modules/xnetgrp/mail.inc.php b/modules/xnetgrp/mail.inc.php
index a38aa53..891146a 100644
--- a/modules/xnetgrp/mail.inc.php
+++ b/modules/xnetgrp/mail.inc.php
@@ -56,17 +56,17 @@ function get_all_redirects($membres, $mls, &$client)
 function _send_xnet_mail($user, $body, $wiki, $mailer, $replyto = null)
 {
     if ($user instanceof PlUser) {
-        $cher = $user->isFemale() ? 'Chère' : 'Cher';
-        $nom  = $user->displayName();
-        $pnom = '';
+        $dear      = $user->isFemale() ? 'Chère' : 'Cher';
+        $lastname  = $user->lastName();
+        $firstname = $user->firstName();
     } else {
-        $cher = 'Cher(e)';
-        $nom  = $user;
-        $pnom = '';
+        $dear      = 'Cher(e)';
+        $lastname  = '';
+        $firstname = $user;
     }
 
     $text = str_ireplace(array('<cher>', '<nom>', '<prenom>'),
-                         array($cher, $nom, $pnom), $body);
+                         array($dear, $lastname, $firstname), $body);
     $mailer->addTo($user);
     if ($replyto) {
         $mailer->addHeader('Reply-To', $replyto);