From 84d77e72a59ce20615794ad9154e71339014da84 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Sun, 16 Feb 2014 17:55:11 +0100 Subject: [PATCH] Force-normalize user emails for list unsubscribe. --- modules/lists.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) 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); } -- 2.1.4