Merge branch 'xorg/maint' into xorg/master

[platal.git] / modules / lists.php

diff --git a/modules/lists.php b/modules/lists.php
index baed14f..8a5ccb9 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -616,7 +616,17 @@ class ListsModule extends PLModule
         }
 
         $domain = $this->prepare_client($page);
-        $this->verify_list_owner($page, $liste);
+        $force_rights = false;
+        if ($GLOBALS['IS_XNET_SITE']) {
+            $perms = S::v('perms');
+            if (is_object($perms) && $perms->hasFlag('groupadmin')) {
+                $force_rights = true;
+            }
+        }
+        $page->assign('group_admin', $force_rights);
+        if (!$force_rights) {
+            $this->verify_list_owner($page, $liste);
+        }
 
         $page->changeTpl('lists/admin.tpl');
 
@@ -653,42 +663,52 @@ class ListsModule extends PLModule
             }
         }
 
-        if (Env::has('add_member')) {
+        if (Env::has('add_member') ||
+            isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) {
             S::assert_xsrf_token();
 
-            $members = User::getBulkForlifeEmails(Env::v('add_member'),
+            if (isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) {
+                $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 {
+                    $logins = $upload->getContents();
+                }
+            } else {
+                $logins = Env::v('add_member');
+            }
+
+            $logins = preg_split("/[; ,\r\n\|]+/", $logins);
+            $members = User::getBulkForlifeEmails($logins,
                                                   true,
                                                   array('ListsModule', 'no_login_callback'));
+            $unfound = array_diff_key($logins, $members);
+
             // Make sure we send a list (array_values) of unique (array_unique)
             // emails.
             $members = array_values(array_unique($members));
 
             $arr = $this->client->mass_subscribe($liste, $members);
+
+            $successes = array();
             if (is_array($arr)) {
                 foreach($arr as $addr) {
+                    $successes[] = $addr[1];
                     $page->trigSuccess("{$addr[0]} inscrit.");
                 }
             }
-        }
 
-        if (isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) {
-            S::assert_xsrf_token();
+            $already = array_diff($members, $successes);
+            if (is_array($already)) {
+                foreach ($already as $item) {
+                    $page->trigWarning($item . ' est déjà inscrit.');
+                }
+            }
 
-            $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 = User::getBulkForlifeEmails($upload->getContents(),
-                                                      true,
-                                                      array('ListsModule', 'no_login_callback'));
-                // Make sure we send a list (array_values) of unique (array_unique)
-                // emails.
-                $members = array_values(array_unique($members));
-
-                $arr = $this->client->mass_subscribe($liste, $members);
-                if (is_array($arr)) {
-                    foreach($arr as $addr) {
-                        $page->trigSuccess("{$addr[0]} inscrit.");
+            if (is_array($unfound)) {
+                foreach ($unfound as $item) {
+                    if (trim($item) != '') {
+                        $page->trigError($item . " ne correspond pas à un compte existant et n'est pas une adresse email.");
                     }
                 }
             }