X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=1683913827d41ad34020e43b6559a361ac887cdf;hb=60781c8fdd17c0c6b79276ecb77d4c0e21666342;hp=b11a2451a8b883d8b2ab14481520bbdfc47ab0a5;hpb=29315ae07d98f098e569248b5e25c04c74f51201;p=platal.git

diff --git a/modules/lists.php b/modules/lists.php
index b11a245..1683913 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -771,8 +771,12 @@ class ListsModule extends PLModule
         if (Env::has('del_member')) {
             S::assert_xsrf_token();
 
-            if ($del_member = User::getSilent(Env::t('del_member'))) {
-                $mlist->unsubscribeBulk(array($del_member->forlifeEmail()));
+            if (strpos(Env::v('del_member'), '@') === false) {
+                if ($del_member = User::getSilent(Env::t('del_member'))) {
+                    $mlist->unsubscribeBulk(array($del_member->forlifeEmail()));
+                }
+            } else {
+                $mlist->unsubscribeBulk(array(Env::v('del_member')));
             }
             pl_redirect('lists/admin/'.$liste);
         }
@@ -793,8 +797,12 @@ class ListsModule extends PLModule
         if (Env::has('del_owner')) {
             S::assert_xsrf_token();
 
-            if ($del_owner = User::getSilent(Env::t('del_owner'))) {
-                $mlist->removeOwner($del_owner->forlifeEmail());
+            if (strpos(Env::v('del_owner'), '@') === false) {
+                if ($del_owner = User::getSilent(Env::t('del_owner'))) {
+                    $mlist->removeOwner($del_owner->forlifeEmail());
+                }
+            } else {
+                $mlist->removeOwner(Env::v('del_owner'));
             }
             pl_redirect('lists/admin/'.$liste);
         }