#384: name substitution in mails to non-X

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

diff --git a/ChangeLog b/ChangeLog
index 7820d53..b7ced6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,7 @@ Bug/Wish:
 
     * Xnet:
         - #426: Add an identification header in mails.                     -FRU
+        - #384: substitution of non-X's names in mail from web interface   -FRU
 
 From 0.9.10 Branch:
 

diff --git a/include/xnet/mail.inc.php b/include/xnet/mail.inc.php
index ec86c95..cb196cc 100644 (file)
--- a/include/xnet/mail.inc.php
+++ b/include/xnet/mail.inc.php
@@ -48,15 +48,15 @@ function get_all_redirects($membres, $mls, &$client)
                 list($m, $dom) = explode('@',$mem[1]);
                 if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) {
                     $res = XDB::query('SELECT  prenom, nom, FIND_IN_SET("femme", u.flags) AS sexe
-                                                   FROM  auth_user_md5 AS u
-                                             INNER JOIN  aliases AS a ON u.user_id = a.id
-                                                  WHERE  a.alias = {?}', $m);
+                                         FROM  auth_user_md5 AS u
+                                   INNER JOIN  aliases       AS a ON u.user_id = a.id
+                                        WHERE  a.alias = {?}', $m);
                     if ($person = $res->fetchOneAssoc()) {
                         $person['email'] = $mem[1];
                         $tos[] = $person;
                     }
                 } else {
-                    $res = XDB::query('SELECT prenom, nom FROM groupex.membres WHERE email={?}', $mem);
+                    $res = XDB::query('SELECT prenom, nom FROM groupex.membres WHERE email={?}', $mem[1]);
                     if ($person = $res->fetchOneAssoc()) {
                         $person['email'] = $mem[1];
                         $tos[] = $person;