<?php
/***************************************************************************
- * Copyright (C) 2003-2006 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
-require_once dirname(__FILE__).'/lists.php';
+Platal::load('lists');
class XnetListsModule extends ListsModule
{
function handlers()
{
return array(
- 'grp/lists' => $this->make_hook('lists', AUTH_MDP),
- 'grp/lists/create' => $this->make_hook('create', AUTH_MDP),
+ '%grp/lists' => $this->make_hook('lists', AUTH_MDP, 'groupmember'),
+ '%grp/lists/create' => $this->make_hook('create', AUTH_MDP, 'groupmember'),
- 'grp/lists/members' => $this->make_hook('members', 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_MDP, 'groups'),
+ '%grp/lists/admin' => $this->make_hook('admin', AUTH_MDP, 'groups'),
+ '%grp/lists/options' => $this->make_hook('options', AUTH_MDP, 'groups'),
+ '%grp/lists/delete' => $this->make_hook('delete', AUTH_MDP, '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_MDP, 'groups'),
+ '%grp/lists/check' => $this->make_hook('check', AUTH_MDP, 'groups'),
+ '%grp/lists/sync' => $this->make_hook('sync', AUTH_MDP, 'groups'),
- 'grp/alias/admin' => $this->make_hook('aadmin', AUTH_MDP),
- 'grp/alias/create' => $this->make_hook('acreate', AUTH_MDP),
+ '%grp/alias/admin' => $this->make_hook('aadmin', AUTH_MDP, 'groupadmin'),
+ '%grp/alias/create' => $this->make_hook('acreate', AUTH_MDP, 'groupadmin'),
/* hack: lists uses that */
- 'profile' => $this->make_hook('profile', AUTH_PUBLIC),
+ 'profile' => $this->make_hook('profile', AUTH_PUBLIC),
);
}
- function prepare_client(&$page)
+ function prepare_client($page, $user = null)
{
global $globals;
+ Platal::load('lists', 'lists.inc.php');
- require_once 'lists.inc.php';
-
- $this->client =& lists_xmlrpc(Session::getInt('uid'),
- Session::get('password'),
- $globals->asso('mail_domain'));
+ if (is_null($user)) {
+ $user =& S::user();
+ }
+ $this->client = new MMList($user, $globals->asso('mail_domain'));
- $page->useMenu();
$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')) {
+ return PL_NOT_FOUND;
+ }
$this->prepare_client($page);
-
- $page->changeTpl('xnet/groupe/listes.tpl');
+ $page->changeTpl('xnetlists/index.tpl');
if (Get::has('del')) {
- $this->client->unsubscribe(Get::get('del'));
- redirect('lists');
+ S::assert_xsrf_token();
+ $this->client->unsubscribe(Get::v('del'));
+ pl_redirect('lists');
}
if (Get::has('add')) {
- $this->client->subscribe(Get::get('add'));
- redirect('lists');
+ S::assert_xsrf_token();
+ $this->client->subscribe(Get::v('add'));
+ pl_redirect('lists');
}
if (Post::has('del_alias') && may_update()) {
- $alias = Post::get('del_alias');
- // prevent group admin from erasing aliases from other groups
- $alias = substr($alias, 0, strpos($alias, '@')).'@'.$globals->asso('mail_domain');
- $globals->xdb->query(
- 'DELETE FROM x4dat.virtual_redirect, x4dat.virtual
- USING x4dat.virtual AS v
- LEFT JOIN x4dat.virtual_redirect USING(vid)
- WHERE v.alias={?}', $alias);
- $page->trig(Post::get('del_alias')." supprimé !");
+ S::assert_xsrf_token();
+
+ $alias = Post::t('del_alias');
+ list($local_part, ) = explode('@', $alias);
+ delete_list_alias($local_part, $globals->asso('mail_domain'));
+ $page->trigSuccess($alias . ' supprimé !');
}
$listes = $this->client->get_lists();
- $page->assign('listes',$listes);
+ // 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';
+ }
- $alias = $globals->xdb->iterator(
- 'SELECT alias,type
- FROM x4dat.virtual
- WHERE alias
- LIKE {?} AND type="user"
- ORDER BY alias', '%@'.$globals->asso('mail_domain'));
- $page->assign('alias', $alias);
+ $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
+ SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml')
+ WHERE id = {?}",
+ $globals->asso('id'));
+ }
}
- function handler_create(&$page)
+ function handler_create($page)
{
global $globals;
+ if (!$globals->asso('mail_domain')) {
+ return PL_NOT_FOUND;
+ }
$this->prepare_client($page);
-
- $page->changeTpl('xnet/groupe/listes-create.tpl');
- $page->assign('force_list_super', may_update());
+ $page->changeTpl('xnetlists/create.tpl');
if (!Post::has('submit')) {
return;
+ } else {
+ S::assert_xsrf_token();
}
- if (!Post::has('liste')) {
- $page->trig_run('champs «addresse souhaitée» vide');
+ if (!Post::has('liste') || !Post::t('liste')) {
+ $page->trigError('Le champs « adresse souhaitée » est vide.');
+ return;
}
- $liste = Post::get('liste');
-
- if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) {
- $page->trig_run('le nom de la liste ne doit contenir que des lettres, chiffres et tirets');
+ $list = strtolower(Post::t('liste'));
+ if (!preg_match("/^[a-zA-Z0-9\-]*$/", $list)) {
+ $page->trigError('le nom de la liste ne doit contenir que des lettres non accentuées, chiffres et tirets');
+ return;
}
- $new = $liste.'@'.$globals->asso('mail_domain');
- $res = $globals->xdb->query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
- $n = $res->fetchOneCell();
-
- if($n) {
- $page->trig_run('cet alias est déjà pris');
+ require_once 'emails.inc.php';
+ if (list_exist($list, $globals->asso('mail_domain'))) {
+ $page->trigError('Cet alias est déjà pris.');
+ return;
}
- if(!Post::get('desc')) {
- $page->trig_run('le sujet est vide');
+ if (!Post::t('desc')) {
+ $page->trigError('Le sujet est vide.');
+ return;
}
- require_once('platal/xmlrpc-client.inc.php');
- require_once('lists.inc.php');
- $ret = $this->client->create_list(
- $liste, Post::get('desc'), Post::get('advertise'),
- Post::get('modlevel'), Post::get('inslevel'),
- array(Session::get('forlife')), array());
-
- $dom = strtolower($globals->asso("mail_domain"));
- $red = $dom.'_'.$liste;
+ $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()));
- if (!$ret) {
- $page->kill("Un problème est survenu, contacter "
+ if (!$success) {
+ $page->kill("Un problème est survenu, contacter "
."<a href='mailto:support@m4x.org'>support@m4x.org</a>");
return;
}
- $globals->xdb->execute('INSERT INTO x4dat.virtual (alias,type)
- VALUES({?},{?})', $liste.'@'.$dom, 'list');
- $globals->xdb->execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
- VALUES ({?}, {?})', mysql_insert_id(),
- "$red+post@listes.polytechnique.org");
- $globals->xdb->execute('INSERT INTO x4dat.virtual (alias,type)
- VALUES({?},{?})', $liste.'-owner@'.$dom, 'list');
- $globals->xdb->execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
- VALUES ({?}, {?})', mysql_insert_id(),
- "$red+owner@listes.polytechnique.org");
- $globals->xdb->execute('INSERT INTO x4dat.virtual (alias,type)
- VALUES({?},{?})', $liste.'-admin@'.$dom, 'list');
- $globals->xdb->execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
- VALUES ({?}, {?})', mysql_insert_id(),
- "$red+admin@listes.polytechnique.org");
- $globals->xdb->execute('INSERT INTO x4dat.virtual (alias,type)
- VALUES({?},{?})', $liste.'-bounces@'.$dom, 'list');
- $globals->xdb->execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
- VALUES ({?}, {?})', mysql_insert_id(),
- "$red+bounces@listes.polytechnique.org");
-
- global $platal;
- redirect(smarty_function_rel().'/'.$platal->ns.'lists/admin/'.$liste);
+ create_list($list, $globals->asso('mail_domain'));
+
+ XDB::execute("UPDATE groups
+ SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml')
+ WHERE id = {?}",
+ $globals->asso('id'));
+
+ pl_redirect('lists/admin/' . $list);
}
- function handler_sync(&$page, $liste = null)
+ function handler_sync($page, $liste = null)
{
global $globals;
+ if (!$globals->asso('mail_domain')) {
+ return PL_NOT_FOUND;
+ }
$this->prepare_client($page);
-
- $page->changeTpl('xnet/groupe/listes-sync.tpl');
+ $page->changeTpl('xnetlists/sync.tpl');
if (Env::has('add')) {
- $this->client->mass_subscribe($liste, array_keys(Env::getMixed('add')));
+ S::assert_xsrf_token();
+ $this->client->mass_subscribe($liste, array_keys(Env::v('add')));
}
list(,$members) = $this->client->get_members($liste);
$mails = array_map(create_function('$arr', 'return $arr[1];'), $members);
- $subscribers = array_unique(array_merge($subscribers, $mails));
-
- $not_in_group_x = array();
- $not_in_group_ext = array();
-
- $ann = $globals->xdb->iterator(
- "SELECT IF(m.origine='X',IF(u.nom_usage<>'', u.nom_usage, u.nom) ,m.nom) AS nom,
- IF(m.origine='X',u.prenom,m.prenom) AS prenom,
- IF(m.origine='X',u.promo,'extérieur') AS promo,
- IF(m.origine='X',CONCAT(a.alias, '@polytechnique.org'),m.email) AS email,
- IF(m.origine='X',FIND_IN_SET('femme', u.flags),0) AS femme,
- m.perms='admin' AS admin,
- m.origine='X' AS x
- FROM groupex.membres AS m
- LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid )
- LEFT JOIN aliases AS a ON ( a.id = m.uid AND a.type='a_vie' )
- WHERE m.asso_id = {?}", $globals->asso('id'));
+ $subscribers = array_unique($mails);
- $not_in_list = array();
+ $ann = XDB::fetchColumn('SELECT uid
+ FROM group_members
+ WHERE asso_id = {?}', $globals->asso('id'));
+ $users = User::getBulkUsersWithUIDs($ann);
- while ($tmp = $ann->next()) {
- if (!in_array($tmp['email'], $subscribers)) {
- $not_in_list[] = $tmp;
+ $not_in_list = array();
+ foreach ($users as $user) {
+ if (!in_array(strtolower($user->forlifeEmail()), $subscribers)) {
+ $not_in_list[] = $user;
}
}
$page->assign('not_in_list', $not_in_list);
}
- function handler_aadmin(&$page, $lfull = null)
+ function handler_aadmin($page, $lfull = null)
{
global $globals;
- if (is_null($lfull)) {
+ if (!$globals->asso('mail_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 ($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');
+ }
- new_groupadmin_page('xnet/groupe/alias-admin.tpl');
if (Env::has('add_member')) {
- $add = Env::get('add_member');
- if (strstr($add, '@')) {
- list($mbox,$dom) = explode('@', strtolower($add));
- } else {
- $mbox = $add;
- $dom = 'm4x.org';
- }
- if($dom == 'polytechnique.org' || $dom == 'm4x.org') {
- $res = $globals->xdb->query(
- "SELECT a.alias, b.alias
- FROM x4dat.aliases AS a
- LEFT JOIN x4dat.aliases AS b ON (a.id=b.id AND b.type = 'a_vie')
- WHERE a.alias={?} AND a.type!='homonyme'", $mbox);
- if (list($alias, $blias) = $res->fetchOneRow()) {
- $alias = empty($blias) ? $alias : $blias;
- $globals->xdb->query(
- "INSERT INTO x4dat.virtual_redirect (vid,redirect)
- SELECT vid, {?}
- FROM x4dat.virtual
- WHERE alias={?}", "$alias@m4x.org", $lfull);
- $page->trig("$alias@m4x.org ajouté");
- } else {
- $page->trig("$mbox@polytechnique.org n'existe pas.");
- }
+ S::assert_xsrf_token();
+
+ if (add_to_list_alias(Env::t('add_member'), $local_part, $domain)) {
+ $page->trigSuccess('Ajout réussit.');
} else {
- $globals->xdb->query(
- "INSERT INTO x4dat.virtual_redirect (vid,redirect)
- SELECT vid,{?}
- FROM x4dat.virtual
- WHERE alias={?}", "$mbox@$dom", $lfull);
- $page->trig("$mbox@$dom ajouté");
+ $page->trigError('Ajout infructueux.');
}
}
if (Env::has('del_member')) {
- $globals->xdb->query(
- "DELETE FROM x4dat.virtual_redirect
- USING x4dat.virtual_redirect
- INNER JOIN x4dat.virtual USING(vid)
- WHERE redirect={?} AND alias={?}", Env::get('del_member'), $lfull);
- redirect("?liste=$lfull");
+ S::assert_xsrf_token();
+
+ if (delete_from_list_alias(Env::t('del_member'), $local_part, $domain)) {
+ $page->trigSuccess('Suppression réussie.');
+ } else {
+ $page->trigError('Suppression infructueuse.');
+ }
}
- $res = $globals->xdb->iterator(
- "SELECT redirect
- FROM x4dat.virtual_redirect AS vr
- INNER JOIN x4dat.virtual AS v USING(vid)
- WHERE v.alias={?}
- ORDER BY redirect", $lfull);
- $page->assign('mem', $res);
+ $page->assign('members', list_alias_members($local_part, $domain));
}
- function handler_acreate(&$page)
+ function handler_acreate($page)
{
global $globals;
- new_groupadmin_page('xnet/groupe/alias-create.tpl');
+ if (!$globals->asso('mail_domain')) {
+ return PL_NOT_FOUND;
+ }
+ $page->changeTpl('xnetlists/alias-create.tpl');
if (!Post::has('submit')) {
return;
+ } else {
+ S::assert_xsrf_token();
}
if (!Post::has('liste')) {
- $page->trig('champs «addresse souhaitée» vide');
+ $page->trigError('Le champs « adresse souhaitée » est vide.');
return;
}
- $liste = Post::get('liste');
- if (!preg_match("/^[a-zA-Z0-9\-\.]*$/", $liste)) {
- $page->trig('le nom de l\'alias ne doit contenir que des lettres,'
- .' chiffres, tirets et points');
+ $list = Post::v('liste');
+ if (!preg_match("/^[a-zA-Z0-9\-\.]*$/", $list)) {
+ $page->trigError('Le nom de l\'alias ne doit contenir que des lettres,'
+ .' chiffres, tirets et points.');
return;
}
- $new = $liste.'@'.$globals->asso('mail_domain');
- $res = $globals->xdb->query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
- $n = $res->fetchOneCell();
- if($n) {
- $page->trig('cet alias est déjà pris');
+ require_once 'emails.inc.php';
+ if (list_exist($list, $globals->asso('mail_domain'))) {
+ $page->trigError('Cet alias est déjà pris.');
return;
}
- $globals->xdb->query('INSERT INTO x4dat.virtual (alias,type) VALUES({?}, "user")', $new);
-
- global $platal;
- redirect(smarty_function_rel()."/{$platal->ns}alias/admin/$new");
+ add_to_list_alias(S::i('uid'), $list, $globals->asso('mail_domain'));
+ pl_redirect('alias/admin/' . $list . '@' . $globals->asso('mail_domain'));
}
- function handler_profile(&$page, $user = null)
+ function handler_profile($page, $user = null)
{
- redirect('https://www.polytechnique.org/profile/'.$user);
+ http_redirect('https://www.polytechnique.org/profile/'.$user);
}
}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>
projects / platal.git / blobdiff