User can have several nicknames.

[platal.git] / modules / axletter.php

diff --git a/modules/axletter.php b/modules/axletter.php
index 0839734..ed601e2 100644 (file)
--- a/modules/axletter.php
+++ b/modules/axletter.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -269,15 +269,14 @@ class AXLetterModule extends PLModule
         $page->changeTpl('axletter/show.tpl');
 
         $nl  = new AXLetter($nid);
+        $user =& S::user();
         if (Get::has('text')) {
-            $nl->toText($page, S::v('prenom'), S::v('nom'), S::v('femme'));
+            $nl->toText($page, $user);
         } else {
-            $nl->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme'));
+            $nl->toHtml($page, $user);
         }
         if (Post::has('send')) {
-            $nl->sendTo(S::v('prenom'), S::v('nom'),
-                        S::v('bestalias'), S::v('femme'),
-                        S::v('mail_fmt') != 'texte');
+            $nl->sendTo($user);
         }
     }
 
@@ -309,10 +308,9 @@ class AXLetterModule extends PLModule
 
         $page->changeTpl('axletter/admin.tpl');
         $res = XDB::iterator("SELECT IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom,
-                                     u.prenom, u.promo, a.alias AS forlife
+                                     u.prenom, u.promo, u.hruid
                                 FROM axletter_rights AS ar
-                          INNER JOIN auth_user_md5   AS u USING(user_id)
-                          INNER JOIN aliases         AS a ON (u.user_id = a.id AND a.type = 'a_vie')");
+                          INNER JOIN auth_user_md5   AS u USING(user_id)");
         $page->assign('admins', $res);
 
         $importer = new CSVImporter('axletter_ins');