From cbd5e1806ff24637a42de1c8c435b5a4783b8a75 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Sun, 13 Nov 2005 18:36:46 +0000
Subject: [PATCH] closes FS#369

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@153 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 htdocs/listes/admin.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/htdocs/listes/admin.php b/htdocs/listes/admin.php
index c792808..150068d 100644
--- a/htdocs/listes/admin.php
+++ b/htdocs/listes/admin.php
@@ -50,7 +50,11 @@ if (Env::has('add_member')) {
 }
 
 if (Env::has('del_member')) {
-    $client->mass_unsubscribe($liste, Array(Env::get('del_member').'@'.$globals->mail->domain));
+    if (strstr('@', Env::get('del_member')) === false) {
+        $client->mass_unsubscribe($liste, Array(Env::get('del_member').'@'.$globals->mail->domain));
+    } else {
+        $client->mass_unsubscribe($liste, Array(Env::get('del_member')));
+    }
     header("Location: {$_SERVER['PHP_SELF']}?liste=$liste");
 }
 
@@ -60,18 +64,22 @@ if (Env::has('add_owner')) {
     $owners = explode(' ', Env::get('add_owner'));
 
     if ($owners) foreach ($owners as $alias) {
-    	if (($login = get_user_forlife($alias)) === false) {;
-        	$login = $alias;
-    	}
+        if (($login = get_user_forlife($alias)) === false) {;
+            $login = $alias;
+        }
 
-    	if($client->add_owner($liste, $login)) {
-        	$page->trig($alias." ajouté aux modérateurs.");
-    	}
+        if($client->add_owner($liste, $login)) {
+            $page->trig($alias." ajouté aux modérateurs.");
+        }
     }
 }
 
 if (Env::has('del_owner')) {
-    $client->del_owner($liste, Env::get('del_owner').'@'.$globals->mail->domain);
+    if (strstr('@', Env::get('del_owner')) === false) {
+        $client->del_owner($liste, Env::get('del_owner').'@'.$globals->mail->domain);
+    } else {
+        $client->del_owner($liste, Env::get('del_owner'));
+    }
     header("Location: {$_SERVER['PHP_SELF']}?liste=$liste");
 }
 
-- 
2.1.4