New script for formatting AX education.

[platal.git] / modules / xnetlists.php

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index b4e5987..43f4006 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -119,7 +119,7 @@ class XnetListsModule extends ListsModule
         $page->assign('may_update', may_update());
 
         if (count($listes) > 0 && !$globals->asso('has_ml')) {
-            XDB::execute("UPDATE  #groupex#.asso
+            XDB::execute("UPDATE  groups
                              SET  flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml')
                            WHERE  id = {?}",
                          $globals->asso('id'));
@@ -142,7 +142,7 @@ class XnetListsModule extends ListsModule
             S::assert_xsrf_token();
         }
 
-        if (!Post::has('liste')) {
+        if (!Post::has('liste') || !Post::v('liste')) {
             $page->trigError('Le champs «&nbsp;adresse souhaitée&nbsp;» est vide.');
             return;
         }
@@ -191,7 +191,7 @@ class XnetListsModule extends ListsModule
                                    $red . $mdir . '@listes.polytechnique.org');
         }
 
-        XDB::execute("UPDATE  #groupex#.asso
+        XDB::execute("UPDATE  groups
                          SET  flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml')
                        WHERE  id = {?}",
                      $globals->asso('id'));
@@ -218,13 +218,10 @@ class XnetListsModule extends ListsModule
         $mails = array_map(create_function('$arr', 'return $arr[1];'), $members);
         $subscribers = array_unique($mails);
 
-        $not_in_group_x = array();
-        $not_in_group_ext = array();
-
         $ann = XDB::fetchColumn('SELECT  uid
-                                   FROM  #groupex#.membres
+                                   FROM  group_members
                                   WHERE  asso_id = {?}', $globals->asso('id'));
-        $users = User::getBuildUsersWithUIDs($ann, 'promo,full_name');
+        $users = User::getBulkUsersWithUIDs($ann);
 
         $not_in_list = array();
         foreach ($users as $user) {