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

[platal.git] / modules / lists.php

diff --git a/modules/lists.php b/modules/lists.php
index b11a245..1683913 100644 (file)
--- 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);
         }