X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=4e15843025d1b58c2a7f7b44933beca039521e05;hb=ad47a0aa4c6a13b4e4d051f7159641204707d11c;hp=eec6fa24f52ba86bf8043ffe567caebd08dd642a;hpb=2ed80014aff1d92128b842e6ec806ec31b7dab30;p=platal.git
diff --git a/modules/lists.php b/modules/lists.php
index eec6fa2..4e15843 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -1,6 +1,6 @@
$this->make_hook('lists', AUTH_MDP),
- 'lists/ajax' => $this->make_hook('ajax', AUTH_MDP, 'user', NO_AUTH),
- 'lists/create' => $this->make_hook('create', AUTH_MDP, 'lists'),
-
- 'lists/members' => $this->make_hook('members', AUTH_COOKIE),
- 'lists/csv' => $this->make_hook('csv', AUTH_COOKIE),
- 'lists/annu' => $this->make_hook('annu', AUTH_COOKIE),
- 'lists/archives' => $this->make_hook('archives', AUTH_COOKIE),
+ 'lists' => $this->make_hook('lists', AUTH_PASSWD, 'user'),
+ 'lists/ajax' => $this->make_hook('ajax', AUTH_PASSWD, 'user', NO_AUTH),
+ 'lists/create' => $this->make_hook('create', AUTH_PASSWD, 'lists'),
+
+ 'lists/members' => $this->make_hook('members', AUTH_COOKIE, 'user'),
+ 'lists/csv' => $this->make_hook('csv', AUTH_COOKIE, 'user'),
+ 'lists/annu' => $this->make_hook('annu', AUTH_COOKIE, 'user'),
+ 'lists/archives' => $this->make_hook('archives', AUTH_COOKIE, 'user'),
'lists/archives/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS),
- 'lists/moderate' => $this->make_hook('moderate', AUTH_MDP),
- 'lists/admin' => $this->make_hook('admin', AUTH_MDP),
- 'lists/options' => $this->make_hook('options', AUTH_MDP),
- 'lists/delete' => $this->make_hook('delete', AUTH_MDP),
+ 'lists/moderate' => $this->make_hook('moderate', AUTH_PASSWD, 'user'),
+ 'lists/admin' => $this->make_hook('admin', AUTH_PASSWD, 'user'),
+ 'lists/options' => $this->make_hook('options', AUTH_PASSWD, 'user'),
+ 'lists/delete' => $this->make_hook('delete', AUTH_PASSWD, 'user'),
- 'lists/soptions' => $this->make_hook('soptions', AUTH_MDP),
- 'lists/check' => $this->make_hook('check', AUTH_MDP),
- 'admin/lists' => $this->make_hook('admin_all', AUTH_MDP, 'admin'),
- 'admin/aliases' => $this->make_hook('aaliases', AUTH_MDP, 'admin')
+ 'lists/soptions' => $this->make_hook('soptions', AUTH_PASSWD, 'user'),
+ 'lists/check' => $this->make_hook('check', AUTH_PASSWD, 'user'),
+ 'admin/lists' => $this->make_hook('admin_all', AUTH_PASSWD, 'admin'),
+ 'admin/aliases' => $this->make_hook('aaliases', AUTH_PASSWD, 'admin')
);
}
- function prepare_client($page, $user = null)
+ protected function prepare_client($user = null)
{
- global $globals;
-
- $this->load('lists.inc.php');
if (is_null($user)) {
$user = S::user();
}
- $this->client = new MMList($user);
+ $domain = $this->get_lists_domain();
+
+ return new MMList($user, $domain);
+ }
+
+ protected function get_lists_domain()
+ {
+ global $globals;
return $globals->mail->domain;
}
- function get_pending_ops($domain, $list)
+ /** Prepare a MailingList from its mailbox
+ */
+ protected function prepare_list($mbox)
+ {
+ // Required: modules/xnetlists.php uses it too.
+ Platal::load('lists', 'lists.inc.php');
+
+ return new MailingList($mbox, $this->get_lists_domain());
+ }
+
+ /** Ensure the current user is an administrator of the group.
+ */
+ protected function is_group_admin($page)
+ {
+ $force_rights = false;
+ if ($GLOBALS['IS_XNET_SITE']) {
+ $perms = S::v('perms');
+ if (is_object($perms) && $perms->hasFlag('groupadmin')) {
+ $force_rights = true;
+ }
+ }
+ $page->assign('group_admin', $force_rights);
+
+ return $force_rights;
+ }
+
+ /** Ensure the current user owns the given MailingList.
+ */
+ protected function verify_list_owner($page, $mlist)
{
- list($subs,$mails) = $this->client->get_pending_ops($list);
+ if (list(, , $owners) = $mlist->getMembers()) {
+ if (!(in_array(S::user()->forlifeEmail(), $owners) || S::admin())) {
+ $page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.");
+ }
+ } else {
+ $page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.
"
+ . " Si tu penses qu'il s'agit d'une erreur, "
+ . "contact le support.");
+ }
+ }
+
+ /** Fetch pending operations on a MailingList instance.
+ */
+ protected function get_pending_ops($mlist)
+ {
+ list($subs, $mails) = $mlist->getPendingOps();
$res = XDB::query("SELECT mid
FROM email_list_moderate
WHERE ml = {?} AND domain = {?}",
- $list, $domain);
+ $mlist->mbox, $mlist->domain);
$mids = $res->fetchColumn();
- foreach ($mails as $key=>$mail) {
+ foreach ($mails as $key => $mail) {
if (in_array($mail['id'], $mids)) {
unset($mails[$key]);
}
@@ -79,6 +124,7 @@ class ListsModule extends PLModule
function handler_lists($page)
{
+
function filter_owner($list)
{
return $list['own'];
@@ -89,20 +135,20 @@ class ListsModule extends PLModule
return $list['sub'];
}
- $domain = $this->prepare_client($page);
-
$page->changeTpl('lists/index.tpl');
$page->setTitle('Listes de diffusion');
if (Get::has('del')) {
S::assert_xsrf_token();
- $this->client->unsubscribe(Get::v('del'));
+ $mlist = $this->prepare_list(Get::v('del'));
+ $mlist->unsubscribe();
pl_redirect('lists');
}
if (Get::has('add')) {
S::assert_xsrf_token();
- $this->client->subscribe(Get::v('add'));
+ $mlist = $this->prepare_list(Get::v('add'));
+ $mlist->subscribe();
pl_redirect('lists');
}
if (Post::has('promo_add')) {
@@ -110,19 +156,22 @@ class ListsModule extends PLModule
$promo = Post::i('promo_add');
if ($promo >= 1900 and $promo < 2100) {
- $this->client->subscribe("promo$promo");
+ $mlist = MailingList::promo($promo);
+ $mlist->subscribe();
} else {
$page->trigError("promo incorrecte, il faut une promo sur 4 chiffres.");
}
}
- if (!is_null($listes = $this->client->get_lists())) {
+ $client = $this->prepare_client();
+ if (!is_null($listes = $client->get_lists())) {
$owner = array_filter($listes, 'filter_owner');
$listes = array_diff_key($listes, $owner);
$member = array_filter($listes, 'filter_member');
$listes = array_diff_key($listes, $member);
foreach ($owner as $key => $liste) {
- list($subs, $mails) = $this->get_pending_ops($domain, $liste['list']);
+ $mlist = $this->prepare_list($liste['list']);
+ list($subs, $mails) = $this->get_pending_ops($mlist);
$owner[$key]['subscriptions'] = $subs;
$owner[$key]['mails'] = $mails;
}
@@ -136,26 +185,26 @@ class ListsModule extends PLModule
function handler_ajax($page, $list = null)
{
pl_content_headers("text/html");
- $domain = $this->prepare_client($page);
$page->changeTpl('lists/liste.inc.tpl', NO_SKIN);
S::assert_xsrf_token();
+ $mlist = $this->prepare_list($list);
if (Get::has('unsubscribe')) {
- $this->client->unsubscribe($list);
+ $mlist->unsubscribe();
}
if (Get::has('subscribe')) {
- $this->client->subscribe($list);
+ $mlist->subscribe();
}
- if (Get::has('sadd')) { /* 4 = SUBSCRIBE */
- $this->client->handle_request($list, Get::v('sadd'), 4, '');
+ if (Get::has('sadd')) {
+ $mlist->handleRequest(MailingList::REQ_SUBSCRIBE, Get::v('sadd'));
}
if (Get::has('mid')) {
- $this->moderate_mail($domain, $list, Get::i('mid'));
+ $this->moderate_mail($mlist, Get::i('mid'));
}
- list($liste, $members, $owners) = $this->client->get_members($list);
+ list($liste, $members, $owners) = $mlist->getMembers();
if ($liste['own']) {
- list($subs,$mails) = $this->get_pending_ops($domain, $list);
+ list($subs, $mails) = $this->get_pending_ops($mlist);
$liste['subscriptions'] = $subs;
$liste['mails'] = $mails;
}
@@ -305,23 +354,24 @@ class ListsModule extends PLModule
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
+ $this->is_group_admin($page);
$page->changeTpl('lists/members.tpl');
if (Get::has('del')) {
S::assert_xsrf_token();
- $this->client->unsubscribe($liste);
- pl_redirect('lists/members/'.$liste);
+ $mlist->unsubscribe();
+ pl_redirect('lists/members/' . $liste);
}
if (Get::has('add')) {
S::assert_xsrf_token();
- $this->client->subscribe($liste);
- pl_redirect('lists/members/'.$liste);
+ $mlist->subscribe();
+ pl_redirect('lists/members/' . $liste);
}
- $members = $this->client->get_members($liste);
+ $members = $mlist->getMembers();
$tri_promo = !Env::b('alpha');
@@ -343,14 +393,16 @@ class ListsModule extends PLModule
if (is_null($liste)) {
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
- $members = $this->client->get_members($liste);
+ $this->is_group_admin($page);
+
+ $mlist = $this->prepare_list($liste);
+ $members = $mlist->getMembers();
$list = list_fetch_basic_info(list_extract_members($members[1]));
- pl_cached_content_headers('text/x-csv', 1);
+ pl_cached_content_headers('text/x-csv', 'iso-8859-1', 1);
- echo "email,nom,promo\n";
- echo implode("\n", $list);
- exit;
+ echo utf8_decode("Nom;Prénom;Promotion\n");
+ echo utf8_decode(implode("\n", $list));
+ exit();
}
function handler_annu($page, $liste = null, $action = null, $subaction = null)
@@ -359,47 +411,54 @@ class ListsModule extends PLModule
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
+ $this->is_group_admin($page);
+
+ $mlist = $this->prepare_list($liste);
if (Get::has('del')) {
S::assert_xsrf_token();
- $this->client->unsubscribe($liste);
+ $mlist->unsubscribe();
pl_redirect('lists/annu/'.$liste);
}
if (Get::has('add')) {
S::assert_xsrf_token();
- $this->client->subscribe($liste);
+ $mlist->subscribe();
pl_redirect('lists/annu/'.$liste);
}
- $owners = $this->client->get_owners($liste);
+ $owners = $mlist->getOwners();
if (!is_array($owners)) {
$page->kill("La liste n'existe pas ou tu n'as pas le droit d'en voir les détails.");
}
- global $platal;
- list(,$members) = $this->client->get_members($liste);
- $users = array();
- foreach ($members as $m) {
- $users[] = $m[1];
+ list(,$members) = $mlist->getMembers();
+
+ if ($action == 'moderators') {
+ $users = $owners;
+ $show_moderators = true;
+ $action = $subaction;
+ $subaction = '';
+ } else {
+ $show_moderators = false;
+ $users = array();
+ foreach ($members as $m) {
+ $users[] = $m[1];
+ }
}
+
require_once 'userset.inc.php';
- $view = new ArraySet($users);
- $view->addMod('trombi', 'Trombinoscope', true, array('with_promo' => true));
+ $view = new UserArraySet($users);
+ $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true));
+ $view->addMod('listmember', 'Annuaire', true);
if (empty($GLOBALS['IS_XNET_SITE'])) {
$view->addMod('minifiche', 'Mini-fiches', false);
}
- // TODO: Reactivate when the new map is completed.
- // $view->addMod('geoloc', 'Planisphère');
+ $view->addMod('map', 'Planisphère');
$view->apply("lists/annu/$liste", $page, $action, $subaction);
- if ($action == 'geoloc' && $subaction) {
- return;
- }
$page->changeTpl('lists/annu.tpl');
- $moderos = list_sort_owners($owners[1]);
$page->assign_by_ref('details', $owners[0]);
- $page->assign_by_ref('owners', $moderos);
+ $page->assign('show_moderators', $show_moderators);
}
function handler_archives($page, $liste = null, $action = null, $artid = null)
@@ -410,16 +469,18 @@ class ListsModule extends PLModule
return PL_NOT_FOUND;
}
- $domain = $this->prepare_client($page);
+ $this->is_group_admin($page);
+
+ $mlist = $this->prepare_list($liste);
$page->changeTpl('lists/archives.tpl');
- if (list($det) = $this->client->get_members($liste)) {
+ if (list($det) = $mlist->getMembers()) {
if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv'])
&& !$det['own'] && ($det['sub'] < 2)) {
$page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter.");
}
- $get = Array('listname' => $liste, 'domain' => $domain);
+ $get = Array('listname' => $mlist->mbox, 'domain' => $mlist->domain);
if (Post::has('updateall')) {
$get['updateall'] = Post::v('updateall');
}
@@ -441,20 +502,28 @@ class ListsModule extends PLModule
return PL_FORBIDDEN;
}
- $domain = $this->prepare_client($page, $user);
- if (list($det) = $this->client->get_members($liste)) {
+ $mlist = $this->prepare_list($liste);
+
+ if (list($det) = $mlist->getMembers()) {
if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv'])
&& !$det['own'] && ($det['sub'] < 2)) {
exit;
}
require_once('banana/ml.inc.php');
- $banana = new MLBanana($user, Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2'));
+ $banana = new MLBanana($user, Array(
+ 'listname' => $mlist->mbox,
+ 'domain' => $mlist->domain,
+ 'action' => 'rss2'));
$banana->run();
}
exit;
}
- function moderate_mail($domain, $liste, $mid)
+ /** Register a moderation decision.
+ * @param $mlist MailingList: the mailing list being moderated
+ * @param $mid int: the message being moderated
+ */
+ protected function moderate_mail($mlist, $mid)
{
if (Env::has('mok')) {
$action = 'accept';
@@ -468,7 +537,7 @@ class ListsModule extends PLModule
Get::kill('mid');
return XDB::execute("INSERT IGNORE INTO email_list_moderate
VALUES ({?}, {?}, {?}, {?}, {?}, NOW(), {?}, NULL)",
- $liste, $domain, $mid, S::i('uid'), $action, Post::v('reason'));
+ $mlist->mbox, $mlist->domain, $mid, S::i('uid'), $action, Post::v('reason'));
}
function handler_moderate($page, $liste = null)
@@ -477,7 +546,10 @@ class ListsModule extends PLModule
return PL_NOT_FOUND;
}
- $domain = $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
+ if (!$this->is_group_admin($page)) {
+ $this->verify_list_owner($page, $mlist);
+ }
$page->changeTpl('lists/moderate.tpl');
@@ -486,23 +558,27 @@ class ListsModule extends PLModule
if (Env::has('sadd') || Env::has('sdel')) {
S::assert_xsrf_token();
- if (Env::has('sadd')) { /* 4 = SUBSCRIBE */
- $sub = $this->client->get_pending_sub($liste, Env::v('sadd'));
- $this->client->handle_request($liste,Env::v('sadd'),4,'');
+ if (Env::has('sadd')) {
+ // Ensure the moderated request is still active
+ $sub = $mlist->getPendingSubscription(Env::v('sadd'));
+
+ $mlist->handleRequest(MailingList::REQ_SUBSCRIBE, Env::v('sadd'));
$info = "validée";
}
- if (Post::has('sdel')) { /* 2 = REJECT */
- $sub = $this->client->get_pending_sub($liste, Env::v('sdel'));
- $this->client->handle_request($liste, Post::v('sdel'), 2, utf8_decode(Post::v('reason')));
+ if (Post::has('sdel')) {
+ // Ensure the moderated request is still active
+ $sub = $mlist->getPendingSubscription(Env::v('sdel'));
+
+ $mlist->handleRequest(MailingList::REQ_REJECT, Post::v('sdel'), Post::v('reason'));
$info = "refusée";
}
if ($sub) {
$mailer = new PlMailer();
- $mailer->setFrom("$liste-bounces@{$domain}");
- $mailer->addTo("$liste-owner@{$domain}");
- $mailer->addHeader('Reply-To', "$liste-owner@{$domain}");
+ $mailer->setFrom($mlist->getAddress(MailingList::KIND_BOUNCE));
+ $mailer->addTo($mlist->getAddress(MailingList::KIND_OWNER));
+ $mailer->addHeader('Reply-To', $mlist->getAddress(MailingList::KIND_OWNER));
$mailer->setSubject("L'inscription de {$sub['name']} a été $info");
- $text = "L'inscription de {$sub['name']} à la liste $liste@{$domain} a été $info par " . S::user()->fullName(true) . ".\n";
+ $text = "L'inscription de {$sub['name']} à la liste " . $mlist->address ." a été $info par " . S::user()->fullName(true) . ".\n";
if (trim(Post::v('reason'))) {
$text .= "\nLa raison invoquée est :\n" . Post::v('reason');
}
@@ -519,20 +595,24 @@ class ListsModule extends PLModule
$mails = array_keys(Post::v('select_mails'));
foreach($mails as $mail) {
- $this->moderate_mail($domain, $liste, $mail);
+ $this->moderate_mail($mlist, $mail);
}
} elseif (Env::has('mid')) {
if (Get::has('mid') && !Env::has('mok') && !Env::has('mdel')) {
require_once 'banana/moderate.inc.php';
$page->changeTpl('lists/moderate_mail.tpl');
- $params = array('listname' => $liste, 'domain' => $domain,
- 'artid' => Get::i('mid'), 'part' => Get::v('part'), 'action' => Get::v('action'));
- $params['client'] = $this->client;
+ $params = array(
+ 'listname' => $mlist->mbox,
+ 'domain' => $mlist->domain,
+ 'artid' => Get::i('mid'),
+ 'part' => Get::v('part'),
+ 'action' => Get::v('action'));
+ $params['client'] = $this->prepare_client();
run_banana($page, 'ModerationBanana', $params);
$msg = file_get_contents('/etc/mailman/fr/refuse.txt');
- $msg = str_replace("%(adminaddr)s", "$liste-owner@{$domain}", $msg);
+ $msg = str_replace("%(adminaddr)s", $mlist->getAddress(MailingList::KIND_OWNER), $msg);
$msg = str_replace("%(request)s", "<< SUJET DU MAIL >>", $msg);
$msg = str_replace("%(reason)s", "<< TON EXPLICATION >>", $msg);
$msg = str_replace("%(listname)s", $liste, $msg);
@@ -540,9 +620,9 @@ class ListsModule extends PLModule
return;
}
- $this->moderate_mail($domain, $liste, Env::i('mid'));
+ $this->moderate_mail($mlist, Env::i('mid'));
} elseif (Env::has('sid')) {
- if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) {
+ if (list($subs,$mails) = $this->get_pending_ops($mlist)) {
foreach($subs as $user) {
if ($user['id'] == Env::v('sid')) {
$page->changeTpl('lists/moderate_sub.tpl');
@@ -554,7 +634,7 @@ class ListsModule extends PLModule
}
- if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) {
+ if (list($subs,$mails) = $this->get_pending_ops($mlist)) {
foreach ($mails as $key=>$mail) {
$mails[$key]['stamp'] = strftime("%Y%m%d%H%M%S", $mail['stamp']);
if ($mail['fromx']) {
@@ -596,7 +676,11 @@ class ListsModule extends PLModule
return PL_NOT_FOUND;
}
- $domain = $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
+ $this->is_group_admin($page);
+ if (!$this->is_group_admin($page)) {
+ $this->verify_list_owner($page, $mlist);
+ }
$page->changeTpl('lists/admin.tpl');
@@ -613,12 +697,13 @@ class ListsModule extends PLModule
case 'marketu': case 'markets':
require_once 'emails.inc.php';
+ $user = User::get($uids[$key]);
$mail = valide_email($mails[$key]);
- if (isvalid_email_redirection($mail)) {
+ if (isvalid_email_redirection($mail, $user)) {
$from = ($action == 'marketu') ? 'user' : 'staff';
$market = Marketing::get($uids[$key], $mail);
if (!$market) {
- $market = new Marketing($uids[$key], $mail, 'list', "$liste@$domain", $from, S::v('uid'));
+ $market = new Marketing($uids[$key], $mail, 'list', $mlist->address, $from, S::v('uid'));
$market->add();
break;
}
@@ -627,39 +712,57 @@ class ListsModule extends PLModule
default:
XDB::execute('INSERT IGNORE INTO register_subs (uid, type, sub, domain)
VALUES ({?}, \'list\', {?}, {?})',
- $uids[$key], $liste, $domain);
+ $uids[$key], $mlist->mbox, $mlist->domain);
}
}
}
- if (Env::has('add_member')) {
+ if (Env::has('add_member') ||
+ isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) {
S::assert_xsrf_token();
- $members = User::getBulkForlifeEmails(Env::v('add_member'),
+ if (isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) {
+ $upload =& PlUpload::get($_FILES['add_member_file'], S::user()->login(), 'list.addmember', true);
+ if (!$upload) {
+ $page->trigError("Une erreur s'est produite lors du téléchargement du fichier.");
+ } else {
+ $logins = $upload->getContents();
+ }
+ } else {
+ $logins = Env::v('add_member');
+ }
+
+ $logins = preg_split("/[; ,\r\n\|]+/", $logins);
+ $members = User::getBulkForlifeEmails($logins,
true,
array('ListsModule', 'no_login_callback'));
- $arr = $this->client->mass_subscribe($liste, $members);
+ $unfound = array_diff_key($logins, $members);
+
+ // Make sure we send a list (array_values) of unique (array_unique)
+ // emails.
+ $members = array_values(array_unique($members));
+
+ $arr = $mlist->subscribeBulk($members);
+
+ $successes = array();
if (is_array($arr)) {
foreach($arr as $addr) {
+ $successes[] = $addr[1];
$page->trigSuccess("{$addr[0]} inscrit.");
}
}
- }
- if (isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) {
- S::assert_xsrf_token();
+ $already = array_diff($members, $successes);
+ if (is_array($already)) {
+ foreach ($already as $item) {
+ $page->trigWarning($item . ' est déjà inscrit.');
+ }
+ }
- $upload =& PlUpload::get($_FILES['add_member_file'], S::user()->login(), 'list.addmember', true);
- if (!$upload) {
- $page->trigError('Une erreur s\'est produite lors du téléchargement du fichier');
- } else {
- $members = User::getBulkForlifeEmails($upload->getContents(),
- true,
- array('ListsModule', 'no_login_callback'));
- $arr = $this->client->mass_subscribe($liste, $members);
- if (is_array($arr)) {
- foreach($arr as $addr) {
- $page->trigSuccess("{$addr[0]} inscrit.");
+ if (is_array($unfound)) {
+ foreach ($unfound as $item) {
+ if (trim($item) != '') {
+ $page->trigError($item . " ne correspond pas à un compte existant et n'est pas une adresse email.");
}
}
}
@@ -668,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'))) {
- $this->client->mass_unsubscribe($liste, array($del_member->forlifeEmail()));
- }
- } else {
- $this->client->mass_unsubscribe($liste, 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);
}
@@ -683,8 +782,8 @@ class ListsModule extends PLModule
$owners = User::getBulkForlifeEmails(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback'));
if ($owners) {
- foreach ($owners as $login) {
- if ($this->client->add_owner($liste, $login)) {
+ foreach ($owners as $forlife_email) {
+ if ($mlist->addOwner($forlife_email)) {
$page->trigSuccess($login ." ajouté aux modérateurs.");
}
}
@@ -694,17 +793,13 @@ 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'))) {
- $this->client->mass_unsubscribe($liste, array($del_owner->forlifeEmail()));
- }
- } else {
- $this->client->del_owner($liste, Env::v('del_owner'));
+ if ($del_owner = User::getSilent(Env::t('del_owner'))) {
+ $mlist->unsubscribeBulk(array($del_owner->forlifeEmail()));
}
pl_redirect('lists/admin/'.$liste);
}
- if (list($det,$mem,$own) = $this->client->get_members($liste)) {
+ if (list($det,$mem,$own) = $mlist->getMembers()) {
global $list_unregistered;
if ($list_unregistered) {
$page->assign_by_ref('unregistered', $list_unregistered);
@@ -716,7 +811,6 @@ class ListsModule extends PLModule
$page->assign_by_ref('members', $membres);
$page->assign_by_ref('owners', $moderos);
$page->assign('np_m', count($mem));
-
} else {
$page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.
"
. " Si tu penses qu'il s'agit d'une erreur, "
@@ -730,7 +824,10 @@ class ListsModule extends PLModule
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
+ if (!$this->is_group_admin($page)) {
+ $this->verify_list_owner($page, $mlist);
+ }
$page->changeTpl('lists/options.tpl');
@@ -747,7 +844,7 @@ class ListsModule extends PLModule
if ($spamlevel > 3 || $spamlevel < 0 || $unsurelevel < 0 || $unsurelevel > 1) {
$page->trigError("Réglage de l'antispam non valide");
} else {
- $this->client->set_bogo_level($liste, ($spamlevel << 1) + $unsurelevel);
+ $mlist->setBogoLevel(($spamlevel << 1) + $unsurelevel);
}
switch($values['moderate']) {
case '0':
@@ -770,20 +867,20 @@ class ListsModule extends PLModule
if (isset($values['subject_prefix'])) {
$values['subject_prefix'] = trim($values['subject_prefix']).' ';
}
- $this->client->set_owner_options($liste, $values);
+ $mlist->setOwnerOptions($values);
} elseif (isvalid_email(Post::v('atn_add'))) {
S::assert_xsrf_token();
- $this->client->add_to_wl($liste, Post::v('atn_add'));
+ $mlist->whitelistAdd(Post::v('atn_add'));
} elseif (Get::has('atn_del')) {
S::assert_xsrf_token();
- $this->client->del_from_wl($liste, Get::v('atn_del'));
+ $mlist->whitelistRemove(Post::v('atn_del'));
pl_redirect('lists/options/'.$liste);
}
- if (list($details,$options) = $this->client->get_owner_options($liste)) {
+ if (list($details, $options) = $mlist->getOwnerOptions()) {
$page->assign_by_ref('details', $details);
$page->assign_by_ref('options', $options);
- $bogo_level = intval($this->client->get_bogo_level($liste));
+ $bogo_level = intval($mlist->getBogoLevel());
$page->assign('unsure_level', $bogo_level & 1);
$page->assign('bogo_level', $bogo_level >> 1);
} else {
@@ -798,15 +895,19 @@ class ListsModule extends PLModule
return PL_NOT_FOUND;
}
- $domain = $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
+ if (!$this->is_group_admin($page)) {
+ $this->verify_list_owner($page, $mlist);
+ }
+
$page->changeTpl('lists/delete.tpl');
if (Post::v('valid') == 'OUI') {
S::assert_xsrf_token();
- if ($this->client->delete_list($liste, Post::b('del_archive'))) {
+ if ($mlist->delete(Post::b('del_archive'))) {
require_once 'emails.inc.php';
- delete_list($liste, $domain);
+ delete_list($mlist->mbox, $mlist->domain);
$page->assign('deleted', true);
$page->trigSuccess('La liste a été détruite !');
} else {
@@ -814,13 +915,13 @@ class ListsModule extends PLModule
. 'Contact les administrateurs du site pour régler le problème : '
. 'support@polytechnique.org.');
}
- } elseif (list($details,$options) = $this->client->get_owner_options($liste)) {
+ } elseif (list($details, $options) = $mlist->getOwnerOptions()) {
if (!$details['own']) {
$page->trigWarning('Tu n\'es pas administrateur de la liste, mais du site.');
}
$page->assign_by_ref('details', $details);
$page->assign_by_ref('options', $options);
- $page->assign('bogo_level', $this->client->get_bogo_level($liste));
+ $page->assign('bogo_level', $mlist->getBogoLevel());
} else {
$page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.");
}
@@ -832,7 +933,10 @@ class ListsModule extends PLModule
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
+ if (!$this->is_group_admin($page)) {
+ $this->verify_list_owner($page, $mlist);
+ }
$page->changeTpl('lists/soptions.tpl');
@@ -844,10 +948,10 @@ class ListsModule extends PLModule
unset($values['submit']);
$values['advertised'] = empty($values['advertised']) ? false : true;
$values['archive'] = empty($values['archive']) ? false : true;
- $this->client->set_admin_options($liste, $values);
+ $mlist->setAdminOptions($values);
}
- if (list($details,$options) = $this->client->get_admin_options($liste)) {
+ if (list($details, $options) = $mlist->getAdminOptions()) {
$page->assign_by_ref('details', $details);
$page->assign_by_ref('options', $options);
} else {
@@ -861,16 +965,19 @@ class ListsModule extends PLModule
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
+ if (!$this->is_group_admin($page)) {
+ $this->verify_list_owner($page, $mlist);
+ }
$page->changeTpl('lists/check.tpl');
if (Post::has('correct')) {
S::assert_xsrf_token();
- $this->client->check_options($liste, true);
+ $mlist->checkOptions(true);
}
- if (list($details,$options) = $this->client->check_options($liste)) {
+ if (list($details, $options) = $mlist->checkOptions()) {
$page->assign_by_ref('details', $details);
$page->assign_by_ref('options', $options);
} else {
@@ -883,8 +990,8 @@ class ListsModule extends PLModule
$page->changeTpl('lists/admin_all.tpl');
$page->setTitle('Administration - Mailing lists');
- $this->prepare_client($page);
- $listes = $this->client->get_all_lists();
+ $client = $this->prepare_client();
+ $listes = $client->get_all_lists();
$page->assign_by_ref('listes', $listes);
}
@@ -945,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:
?>