<?php
/***************************************************************************
- * Copyright (C) 2003-2011 Polytechnique.org *
+ * Copyright (C) 2003-2014 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
if (Env::has('sadd')) {
// Ensure the moderated request is still active
- $sub = $mlist->getPendingSub(Env::v('sadd'));
+ $sub = $mlist->getPendingSubscription(Env::v('sadd'));
$mlist->handleRequest(MailingList::REQ_SUBSCRIBE, Env::v('sadd'));
$info = "validée";
}
if (Post::has('sdel')) {
// Ensure the moderated request is still active
- $sub = $mlist->getPendingSub(Env::v('sdel'));
+ $sub = $mlist->getPendingSubscription(Env::v('sdel'));
$mlist->handleRequest(MailingList::REQ_REJECT, Post::v('sdel'), Post::v('reason'));
$info = "refusée";
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);
}
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->removeOwner($del_owner->forlifeEmail());
}
pl_redirect('lists/admin/'.$liste);
}
}
}
-// 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:
?>