From 7586ae0b2187c222701143b4ac8b74f13282bcba Mon Sep 17 00:00:00 2001
From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Mon, 11 Aug 2008 00:49:52 +0200
Subject: [PATCH] Replaces calls to get_users_forlife_list() by calls to the
 appropriate PlUser methods.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
---
 core                      |  2 +-
 include/user.func.inc.php |  8 --------
 include/userset.inc.php   |  4 ++--
 modules/lists.php         | 28 ++++++++++++----------------
 4 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/core b/core
index f8b161a..40d6b19 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit f8b161ad3b2bd9aa5f176328fe9f2ee1b6ca9ee9
+Subproject commit 40d6b19a2d6233fb1549cfb11693eaba33dd05aa
diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index c3db0f7..93244a4 100644
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -271,14 +271,6 @@ function get_users_login_list($members, $strict = false, $get_forlife = false, $
 }
 
 // }}}
-// {{{ function get_users_forlife_list()
-
-function get_users_forlife_list($members, $strict = false, $callback = '_default_user_callback')
-{
-    return get_users_login_list($members, $strict, true, $callback);
-}
-
-// }}}
 // {{{ function get_user_hruid()
 
 function get_user_hruid($data, $callback = '_default_user_callback')
diff --git a/include/userset.inc.php b/include/userset.inc.php
index f45cf48..038a26c 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -138,7 +138,7 @@ class ArraySet extends UserSet
     {
         $where = $this->getUids($users);
         if ($where) {
-            $where = "a.alias IN ($where)";
+            $where = "u.hruid IN ($where)";
         } else {
             $where = " 0 ";
         }
@@ -147,7 +147,7 @@ class ArraySet extends UserSet
 
     private function getUids(array $users)
     {
-        $users = get_users_forlife_list($users, true, '_silent_user_callback');
+        $users = User::getBulkHruid($users, '_silent_user_callback');
         if (is_null($users)) {
             return '';
         }
diff --git a/modules/lists.php b/modules/lists.php
index a0b68ec..78ad170 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -188,11 +188,10 @@ class ListsModule extends PLModule
 
         // click on validate button 'add_owner_sub' or type <enter>
         if (Post::has('add_owner_sub') && Post::has('add_owner')) {
-            require_once('user.func.inc.php');
             // if we want to add an owner and then type <enter>, then both
             // add_owner_sub and add_owner are filled.
-            $oforlifes = get_users_forlife_list(Post::v('add_owner'), true);
-            $mforlifes = get_users_forlife_list(Post::v('add_member'), true);
+            $oforlifes = User::getBulkForlifeEmails(Post::v('add_owner'), true);
+            $mforlifes = User::getBulkForlifeEmails(Post::v('add_member'), true);
             if (!is_null($oforlifes)) {
                 $owners = array_merge($owners, $oforlifes);
             }
@@ -204,9 +203,8 @@ class ListsModule extends PLModule
         }
 
         // click on validate button 'add_member_sub'
-        require_once('user.func.inc.php');
         if (Post::has('add_member_sub') && Post::has('add_member')) {
-            $forlifes = get_users_forlife_list(Post::v('add_member'), true);
+            $forlifes = User::getBulkForlifeEmails(Post::v('add_member'), true);
             if (!is_null($forlifes)) {
                 $members = array_merge($members, $forlifes);
             }
@@ -216,7 +214,7 @@ class ListsModule extends PLModule
             if (!$upload) {
                 $page->trigError('Une erreur s\'est produite lors du téléchargement du fichier');
             } else {
-                $forlifes = get_users_forlife_list($upload->getContents(), true);
+                $forlifes = User::getBulkForlifeEmails($upload->getContents(), true);
                 if (!is_null($forlifes)) {
                     $members = array_merge($members, $forlifes);
                 }
@@ -632,10 +630,9 @@ class ListsModule extends PLModule
         if (Env::has('add_member')) {
             S::assert_xsrf_token();
 
-            require_once('user.func.inc.php');
-            $members = get_users_forlife_list(Env::v('add_member'),
-                                              false,
-                                              array('ListsModule', 'no_login_callback'));
+            $members = User::getBulkForlifeEmails(Env::v('add_member'),
+                                                  false,
+                                                  array('ListsModule', 'no_login_callback'));
             $arr = $this->client->mass_subscribe($liste, $members);
             if (is_array($arr)) {
                 foreach($arr as $addr) {
@@ -651,9 +648,9 @@ class ListsModule extends PLModule
             if (!$upload) {
                 $page->trigError('Une erreur s\'est produite lors du téléchargement du fichier');
             } else {
-                $members = get_users_forlife_list($upload->getContents(),
-                                                  false,
-                                                  array('ListsModule', 'no_login_callback'));
+                $members = User::getBulkForlifeEmails($upload->getContents(),
+                                                      false,
+                                                      array('ListsModule', 'no_login_callback'));
                 $arr = $this->client->mass_subscribe($liste, $members);
                 if (is_array($arr)) {
                     foreach($arr as $addr) {
@@ -678,12 +675,11 @@ class ListsModule extends PLModule
         if (Env::has('add_owner')) {
             S::assert_xsrf_token();
 
-            require_once('user.func.inc.php');
-            $owners = get_users_forlife_list(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback'));
+            $owners = User::getBulkForlifeEmails(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback'));
             if ($owners) {
                 foreach ($owners as $login) {
                     if ($this->client->add_owner($liste, $login)) {
-                        $page->trigSuccess($alias." ajouté aux modérateurs.");
+                        $page->trigSuccess($login ." ajouté aux modérateurs.");
                     }
                 }
             }
-- 
2.1.4