X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Faxletter.php;h=a6647056bcc92ab3183be54da059e020539bbcf7;hb=330ffaa012073e66a5c94a6dce3ef5c8e32f67b8;hp=9eb253ad60595960fa24d0c12870ec0f92660ee6;hpb=1dc71da137a384e771723b8a893539a7f5cc9fab;p=platal.git

diff --git a/modules/axletter.php b/modules/axletter.php
index 9eb253a..a664705 100644
--- a/modules/axletter.php
+++ b/modules/axletter.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -180,14 +180,10 @@ class AXLetterModule extends PLModule
                                       . "https://www.polytechnique.org/ax/edit\n"
                                       . "-- \n"
                                       . "Association Polytechnique.org\n");
-                    $res = XDB::iterRow("SELECT IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom,
-                                                u.prenom, a.alias AS bestalias
-                                           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 FIND_IN_SET('bestalias', a.flags))");
-                    while (list($nom, $prenom, $alias) = $res->next()) {
-                        $mailer->addTo("$nom $prenom <$alias@{$globals->mail->domain}>");
+                    $users = User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT  uid
+                                                                            FROM  axletter_rights'));
+                    foreach ($users as $user) {
+                        $mailer->addTo($user);
                     }
                     $mailer->send();
                 }
@@ -278,15 +274,14 @@ class AXLetterModule extends PLModule
 
         try {
             $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::user()->login(), S::user()->bestEmail(),
-                            S::v('prenom'), S::v('nom'),
-                            S::v('femme'), S::v('mail_fmt') != 'texte');
+                $nl->sendTo($user);
             }
         } catch (MailNotFound $e) {
             return PL_NOT_FOUND;
@@ -320,16 +315,13 @@ 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, u.hruid
-                                FROM axletter_rights AS ar
-                          INNER JOIN auth_user_md5   AS u USING(user_id)");
-        $page->assign('admins', $res);
+        $page->assign('admins', User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT  uid
+                                                                               FROM  axletter_rights')));
 
         $importer = new CSVImporter('axletter_ins');
-        $importer->registerFunction('user_id', 'email vers Id X.org', array($this, 'idFromMail'));
+        $importer->registerFunction('uid', 'email vers Id X.org', array($this, 'idFromMail'));
         $importer->forceValue('hash', array($this, 'createHash'));
-        $importer->apply($page, "admin/axletter", array('user_id', 'email', 'prenom', 'nom', 'promo', 'flag', 'hash'));
+        $importer->apply($page, "admin/axletter", array('uid', 'email', 'prenom', 'nom', 'promo', 'flag', 'hash'));
     }
 
     function idFromMail($line, $key, $relation = null)
@@ -345,36 +337,9 @@ class AXLetterModule extends PLModule
                 }
             }
         }
-        $email = $line[$field];
-        if (strpos($email, '@') === false) {
-            $user  = $email;
-            $domain = $globals->mail->domain2;
-        } else {
-            list($user, $domain) = explode('@', $email);
-        }
-        if ($domain != $globals->mail->domain && $domain != $globals->mail->domain2
-                && $domain != $globals->mail->alias_dom && $domain != $globals->mail->alias_dom2) {
-            $res = XDB::query("SELECT uid FROM emails WHERE email = {?}", $email);
-            if ($res->numRows() == 1) {
-                return $res->fetchOneCell();
-            }
-            return '0';
-        }
-        list($user) = explode('+', $user);
-        list($user) = explode('_', $user);
-        if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) {
-            $res = XDB::query("SELECT a.id
-                                 FROM virtual          AS v
-                           INNER JOIN virtual_redirect AS r USING(vid)
-                           INNER JOIN aliases          AS a ON (a.type = 'a_vie'
-                                                            AND r.redirect = CONCAT(a.alias, '@{$globals->mail->domain2}'))
-                                WHERE v.alias = CONCAT({?}, '@{$globals->mail->alias_dom}')", $user);
-            $id = $res->fetchOneCell();
-            return $id ? $id : '0';
-        }
-        $res = XDB::query("SELECT id FROM aliases WHERE alias = {?}", $user);
-        $id = $res->fetchOneCell();
-        return $id ? $id : '0';
+        $uf = new UserFilter(new UFC_Email($line[$field]));
+        $id = $uf->getUIDs();
+        return count($id) == 1 ? $id[0] : 0;
     }
 
     function createHash($line, $key, $relation)