X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=4e15843025d1b58c2a7f7b44933beca039521e05;hb=ad47a0aa4c6a13b4e4d051f7159641204707d11c;hp=e1315e0e84764c504c9163af0098392942755a6b;hpb=ba6ae0466e1dbc75852f4b8e8bfa8c815e81504a;p=platal.git

diff --git a/modules/lists.php b/modules/lists.php
index e1315e0..4e15843 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2013 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -771,12 +771,8 @@ class ListsModule extends PLModule
         if (Env::has('del_member')) {
             S::assert_xsrf_token();
 
-            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')));
+            if ($del_member = User::getSilent(Env::t('del_member'))) {
+                $mlist->unsubscribeBulk(array($del_member->forlifeEmail()));
             }
             pl_redirect('lists/admin/'.$liste);
         }
@@ -797,12 +793,8 @@ class ListsModule extends PLModule
         if (Env::has('del_owner')) {
             S::assert_xsrf_token();
 
-            if (strpos(Env::v('del_owner'), '@') === false) {
-                if ($del_owner = User::getSilent(Env::t('del_owner'))) {
-                    $mlist->unsubscribeBulk(array($del_owner->forlifeEmail()));
-                }
-            } else {
-                $mlist->removeOwner(Env::v('del_owner'));
+            if ($del_owner = User::getSilent(Env::t('del_owner'))) {
+                $mlist->unsubscribeBulk(array($del_owner->forlifeEmail()));
             }
             pl_redirect('lists/admin/'.$liste);
         }
@@ -1060,5 +1052,5 @@ class ListsModule extends PLModule
     }
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>