Merge commit 'origin/master' into hruid

[platal.git] / modules / lists.php

diff --git a/modules/lists.php b/modules/lists.php
index 8cb8723..78fba96 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -182,11 +182,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);
             }
@@ -198,19 +197,18 @@ 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);
             }
         }
         if (Post::has('add_member_sub') && isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) {
-            $upload =& PlUpload::get($_FILES['add_member_file'], S::v('forlife'), 'list.addmember', true);
+            $upload =& PlUpload::get($_FILES['add_member_file'], S::user()->login(), 'list.addmember', true);
             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);
                 }
@@ -292,7 +290,7 @@ class ListsModule extends PLModule
         if (!$page->nb_errs()) {
             $page->assign('created', true);
             require_once 'validations.inc.php';
-            $req = new ListeReq(S::v('uid'), $asso, $liste, $domain,
+            $req = new ListeReq(S::user(), $asso, $liste, $domain,
                                 Post::v('desc'), Post::i('advertise'),
                                 Post::i('modlevel'), Post::i('inslevel'),
                                 $owners, $members);
@@ -438,7 +436,7 @@ class ListsModule extends PLModule
                 exit;
             }
             require_once('banana/ml.inc.php');
-            $banana = new MLBanana(S::v('forlife'), Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2'));
+            $banana = new MLBanana(S::user(), Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2'));
             $banana->run();
         }
         exit;
@@ -574,7 +572,7 @@ class ListsModule extends PLModule
         } else {
             list($name, $dom) = @explode('@', $login);
             if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) {
-                _default_user_callback($login);
+                User::_default_user_callback($login);
             }
         }
     }
@@ -626,10 +624,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) {
@@ -641,13 +638,13 @@ class ListsModule extends PLModule
         if (isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) {
             S::assert_xsrf_token();
 
-            $upload =& PlUpload::get($_FILES['add_member_file'], S::v('forlife'), 'list.addmember', true);
+            $upload =& PlUpload::get($_FILES['add_member_file'], S::user()->login(), 'list.addmember', true);
             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) {
@@ -672,12 +669,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.");
                     }
                 }
             }