X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=8fb6fe0b7ce75ba0cd4f45616f7f66567703516c;hb=9a13e83f4b39c7feaba924b724fd43497109481b;hp=3f0e79248234754dd7e05203903aa3eb60a8e227;hpb=45ea6160465aeba0aa780e49c12272819dedffd1;p=platal.git diff --git a/modules/xnetlists.php b/modules/xnetlists.php index 3f0e792..8fb6fe0 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -28,26 +28,26 @@ class XnetListsModule extends ListsModule 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), @@ -70,7 +70,7 @@ class XnetListsModule extends ListsModule 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'; @@ -102,9 +102,44 @@ class XnetListsModule extends ListsModule } $listes = $this->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('order_by', $order_by); + $page->assign('order', $order); $page->assign('aliases', iterate_list_alias($globals->asso('mail_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… »."); + } if (count($listes) > 0 && !$globals->asso('has_ml')) { XDB::execute("UPDATE groups @@ -215,25 +250,29 @@ class XnetListsModule extends ListsModule require_once 'emails.inc.php'; list($local_part, $domain) = explode('@', $lfull); + if ($globals->asso('mail_domain') != $domain || !preg_match("/^[a-zA-Z0-9\-\.]*$/", $local_part)) { + $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)); @@ -271,7 +310,7 @@ class XnetListsModule extends ListsModule return; } - add_to_list_alias(S::user(), $list, $globals->asso('mail_domain')); + add_to_list_alias(S::i('uid'), $list, $globals->asso('mail_domain')); pl_redirect('alias/admin/' . $list . '@' . $globals->asso('mail_domain')); }