Simplifies some of the GoogleApps hooks by using new "account" idioms.

[platal.git] / modules / axletter.php

diff --git a/modules/axletter.php b/modules/axletter.php
index ed601e2..91d96f0 100644 (file)
--- a/modules/axletter.php
+++ b/modules/axletter.php
@@ -175,14 +175,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  user_id
+                                                                            FROM  axletter_rights'));
+                    foreach ($users as $user) {
+                        $mailer->addTo($user);
                     }
                     $mailer->send();
                 }
@@ -240,7 +236,7 @@ class AXLetterModule extends PLModule
             return;
         }
 
-        $page->kill("L'envoi de l'annonce {$al->title()} est annulé");
+        $page->killSuccess("L'envoi de l'annonce {$al->title()} est annulé.");
     }
 
     function handler_valid(&$page, $force = null)
@@ -260,7 +256,7 @@ class AXLetterModule extends PLModule
             return;
         }
 
-        $page->kill("L'envoi de l'annonce aura lieu dans l'heure qui vient.");
+        $page->killSuccess("L'envoi de l'annonce aura lieu dans l'heure qui vient.");
     }
 
     function handler_show(&$page, $nid = 'last')
@@ -268,15 +264,19 @@ class AXLetterModule extends PLModule
         $this->load('axletter.inc.php');
         $page->changeTpl('axletter/show.tpl');
 
-        $nl  = new AXLetter($nid);
-        $user =& S::user();
-        if (Get::has('text')) {
-            $nl->toText($page, $user);
-        } else {
-            $nl->toHtml($page, $user);
-        }
-        if (Post::has('send')) {
-            $nl->sendTo($user);
+        try {
+            $nl = new AXLetter($nid);
+            $user =& S::user();
+            if (Get::has('text')) {
+                $nl->toText($page, $user);
+            } else {
+                $nl->toHtml($page, $user);
+            }
+            if (Post::has('send')) {
+                $nl->sendTo($user);
+            }
+        } catch (MailNotFound $e) {
+            return PL_NOT_FOUND;
         }
     }
 
@@ -307,11 +307,8 @@ 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  user_id
+                                                                               FROM  axletter_rights')));
 
         $importer = new CSVImporter('axletter_ins');
         $importer->registerFunction('user_id', 'email vers Id X.org', array($this, 'idFromMail'));
@@ -332,39 +329,12 @@ 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)
+    function createHash($line, $partial_result, $key)
     {
         $hash = implode(time(), $line) . rand();
         $hash = md5($hash);