From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Sun, 16 Feb 2014 16:55:11 +0000 (+0100)
Subject: Force-normalize user emails for list unsubscribe.
X-Git-Tag: xorg/1.1.12~30
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=84d77e72a59ce20615794ad9154e71339014da84;p=platal.git

Force-normalize user emails for list unsubscribe.
---

diff --git a/modules/lists.php b/modules/lists.php
index 8dab38c..4e15843 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -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);
         }