X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=2db6c734942765e89080844f0496e0e2c0b5484a;hb=22c5024fa1ae6ca6462890e2da38921e76096a80;hp=3f0e79248234754dd7e05203903aa3eb60a8e227;hpb=d82359a556779137f8a90d0312b3098a2db6f482;p=platal.git diff --git a/modules/xnetlists.php b/modules/xnetlists.php index 3f0e792..2db6c73 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -23,72 +23,60 @@ Platal::load('lists'); class XnetListsModule extends ListsModule { - var $client; - function handlers() { return array( - '%grp/lists' => $this->make_hook('lists', AUTH_MDP, 'groupmember'), - '%grp/lists/create' => $this->make_hook('create', AUTH_MDP, 'groupmember'), + '%grp/lists' => $this->make_hook('lists', AUTH_PASSWD, 'groupmember'), + '%grp/lists/create' => $this->make_hook('create', AUTH_PASSWD, 'groupmember'), - '%grp/lists/members' => $this->make_hook('members', AUTH_COOKIE), - '%grp/lists/csv' => $this->make_hook('csv', AUTH_COOKIE), - '%grp/lists/annu' => $this->make_hook('annu', AUTH_COOKIE), - '%grp/lists/archives' => $this->make_hook('archives', AUTH_COOKIE), + '%grp/lists/members' => $this->make_hook('members', AUTH_COOKIE, 'groups'), + '%grp/lists/csv' => $this->make_hook('csv', AUTH_COOKIE, 'groups'), + '%grp/lists/annu' => $this->make_hook('annu', AUTH_COOKIE, 'groups'), + '%grp/lists/archives' => $this->make_hook('archives', AUTH_COOKIE, 'groups'), '%grp/lists/archives/rss' => $this->make_hook('rss', AUTH_PUBLIC), - '%grp/lists/moderate' => $this->make_hook('moderate', AUTH_MDP), - '%grp/lists/admin' => $this->make_hook('admin', AUTH_MDP), - '%grp/lists/options' => $this->make_hook('options', AUTH_MDP), - '%grp/lists/delete' => $this->make_hook('delete', AUTH_MDP), + '%grp/lists/moderate' => $this->make_hook('moderate', AUTH_PASSWD, 'groups'), + '%grp/lists/admin' => $this->make_hook('admin', AUTH_PASSWD, 'groups'), + '%grp/lists/options' => $this->make_hook('options', AUTH_PASSWD, 'groups'), + '%grp/lists/delete' => $this->make_hook('delete', AUTH_PASSWD, 'groups'), - '%grp/lists/soptions' => $this->make_hook('soptions', AUTH_MDP), - '%grp/lists/check' => $this->make_hook('check', AUTH_MDP), - '%grp/lists/sync' => $this->make_hook('sync', AUTH_MDP), + '%grp/lists/soptions' => $this->make_hook('soptions', AUTH_PASSWD, 'groups'), + '%grp/lists/check' => $this->make_hook('check', AUTH_PASSWD, 'groups'), + '%grp/lists/sync' => $this->make_hook('sync', AUTH_PASSWD, 'groups'), - '%grp/alias/admin' => $this->make_hook('aadmin', AUTH_MDP, 'groupadmin'), - '%grp/alias/create' => $this->make_hook('acreate', AUTH_MDP, 'groupadmin'), + '%grp/alias/admin' => $this->make_hook('aadmin', AUTH_PASSWD, 'groupadmin'), + '%grp/alias/create' => $this->make_hook('acreate', AUTH_PASSWD, 'groupadmin'), /* hack: lists uses that */ 'profile' => $this->make_hook('profile', AUTH_PUBLIC), ); } - function prepare_client($page, $user = null) + protected function get_lists_domain() { global $globals; - Platal::load('lists', 'lists.inc.php'); - - if (is_null($user)) { - $user =& S::user(); - } - $this->client = new MMList($user, $globals->asso('mail_domain')); - - $page->assign('asso', $globals->asso()); - $page->setType($globals->asso('cat')); - return $globals->asso('mail_domain'); } - function handler_lists($page) + function handler_lists($page, $order_by = null, $order = null) { - global $globals; require_once 'emails.inc.php'; - if (!$globals->asso('mail_domain')) { + if (!$this->get_lists_domain()) { return PL_NOT_FOUND; } - $this->prepare_client($page); $page->changeTpl('xnetlists/index.tpl'); 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'); } @@ -97,15 +85,52 @@ class XnetListsModule extends ListsModule $alias = Post::t('del_alias'); list($local_part, ) = explode('@', $alias); - delete_list_alias($local_part, $globals->asso('mail_domain')); + delete_list_alias($local_part, $this->get_lists_domain()); $page->trigSuccess($alias . ' supprimé !'); } - $listes = $this->client->get_lists(); + $client = $this->prepare_client(); + $listes = $client->get_lists(); + // Default ordering is by ascending names. + if (is_null($order_by) || is_null($order) + || !in_array($order_by, array('list', 'desc', 'nbsub')) + || !in_array($order, array('asc', 'desc'))) { + $order_by = 'list'; + $order = 'asc'; + } + + $compare = function ($a, $b) use ($order_by, $order) + { + switch ($order_by) { + case 'desc': + $a[$order_by] = replace_accent($a[$order_by]); + $b[$order_by] = replace_accent($b[$order_by]); + case 'list': + $res = strcasecmp($a[$order_by], $b[$order_by]); + break; + case 'nbsub': + $res = $a[$order_by] - $b[$order_by]; + break; + default: + $res = 0; + } + + if ($order == 'asc') { + return $res; + } + return $res * -1; + }; + usort($listes, $compare); $page->assign('listes', $listes); - $page->assign('aliases', iterate_list_alias($globals->asso('mail_domain'))); + $page->assign('order_by', $order_by); + $page->assign('order', $order); + $page->assign('aliases', iterate_list_alias($this->get_lists_domain())); $page->assign('may_update', may_update()); + if (S::suid()) { + $page->trigWarning("Attention : l'affichage des listes de diffusion ne tient pas compte de l'option « Voir le site comme… »."); + } + global $globals; if (count($listes) > 0 && !$globals->asso('has_ml')) { XDB::execute("UPDATE groups SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml') @@ -116,12 +141,9 @@ class XnetListsModule extends ListsModule function handler_create($page) { - global $globals; - - if (!$globals->asso('mail_domain')) { + if (!$this->get_lists_domain()) { return PL_NOT_FOUND; } - $this->prepare_client($page); $page->changeTpl('xnetlists/create.tpl'); if (!Post::has('submit')) { @@ -142,7 +164,7 @@ class XnetListsModule extends ListsModule } require_once 'emails.inc.php'; - if (list_exist($list, $globals->asso('mail_domain'))) { + if (list_exist($list, $this->get_lists_domain())) { $page->trigError('Cet alias est déjà pris.'); return; } @@ -151,17 +173,19 @@ class XnetListsModule extends ListsModule return; } - $success = $this->client->create_list($list, utf8_decode(Post::t('desc')), Post::t('advertise'), - Post::t('modlevel'), Post::t('inslevel'), - array(S::user()->forlifeEmail()), array(S::user()->forlifeEmail())); + $mlist = $this->prepare_list($list); + $success = $mlist->create(Post::t('desc'), + Post::t('advertise'), Post::t('modlevel'), Post::t('inslevel'), + array(S::user()->forlifeEmail()), array(S::user()->forlifeEmail())); if (!$success) { $page->kill("Un problème est survenu, contacter " ."support@m4x.org"); return; } - create_list($list, $globals->asso('mail_domain')); + create_list($mlist->mbox, $mlist->domain); + global $globals; XDB::execute("UPDATE groups SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml') WHERE id = {?}", @@ -172,23 +196,27 @@ class XnetListsModule extends ListsModule function handler_sync($page, $liste = null) { - global $globals; - - if (!$globals->asso('mail_domain')) { + if (!$this->get_lists_domain()) { + return PL_NOT_FOUND; + } + if (!$liste) { return PL_NOT_FOUND; } - $this->prepare_client($page); + $page->changeTpl('xnetlists/sync.tpl'); + $mlist = $this->prepare_list($liste); + if (Env::has('add')) { S::assert_xsrf_token(); - $this->client->mass_subscribe($liste, array_keys(Env::v('add'))); + $mlist->subscribeBulk(array_keys(Env::v('add'))); } - list(,$members) = $this->client->get_members($liste); + list(,$members) = $mlist->getMembers(); $mails = array_map(create_function('$arr', 'return $arr[1];'), $members); $subscribers = array_unique($mails); + global $globals; $ann = XDB::fetchColumn('SELECT uid FROM group_members WHERE asso_id = {?}', $globals->asso('id')); @@ -206,34 +234,37 @@ class XnetListsModule extends ListsModule function handler_aadmin($page, $lfull = null) { - global $globals; - - if (!$globals->asso('mail_domain') || is_null($lfull)) { + if (!$this->get_lists_domain() || is_null($lfull)) { return PL_NOT_FOUND; } $page->changeTpl('xnetlists/alias-admin.tpl'); require_once 'emails.inc.php'; list($local_part, $domain) = explode('@', $lfull); + if ($this->get_lists_domain() != $domain || !preg_match("/^[a-zA-Z0-9\-\.]*$/", $local_part)) { + global $globals; + $page->trigErrorRedirect('Le nom de l\'alias est erroné.', $globals->asso('diminutif') . '/lists'); + } + + if (Env::has('add_member')) { S::assert_xsrf_token(); - $email = Env::t('add_member'); - $user = User::getSilent($email); - if ($user) { - add_to_list_alias($user, $local_part, $domain); - $page->trigSuccess($email . ' ajouté.'); + if (add_to_list_alias(Env::t('add_member'), $local_part, $domain)) { + $page->trigSuccess('Ajout réussi.'); } else { - $page->trigError($email . " n'existe pas."); + $page->trigError('Ajout infructueux.'); } } if (Env::has('del_member')) { S::assert_xsrf_token(); - $user = User::getSilent(Env::t('del_member')); - delete_from_list_alias($user, $local_part, $domain); - $page->trigSuccess($user->fullName() . ' supprimé.'); + if (delete_from_list_alias(Env::t('del_member'), $local_part, $domain)) { + $page->trigSuccess('Suppression réussie.'); + } else { + $page->trigError('Suppression infructueuse.'); + } } $page->assign('members', list_alias_members($local_part, $domain)); @@ -241,9 +272,7 @@ class XnetListsModule extends ListsModule function handler_acreate($page) { - global $globals; - - if (!$globals->asso('mail_domain')) { + if (!$this->get_lists_domain()) { return PL_NOT_FOUND; } $page->changeTpl('xnetlists/alias-create.tpl'); @@ -266,13 +295,14 @@ class XnetListsModule extends ListsModule } require_once 'emails.inc.php'; - if (list_exist($list, $globals->asso('mail_domain'))) { + $lists_domain = $this->get_lists_domain(); + if (list_exist($list, $lists_domain)) { $page->trigError('Cet alias est déjà pris.'); return; } - add_to_list_alias(S::user(), $list, $globals->asso('mail_domain')); - pl_redirect('alias/admin/' . $list . '@' . $globals->asso('mail_domain')); + add_to_list_alias(S::i('uid'), $list, $lists_domain); + pl_redirect('alias/admin/' . $list . '@' . $lists_domain); } function handler_profile($page, $user = null)