X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=bc1bcbbe466eedb5b9a9405e56e5ff2ce0f395b7;hb=07e02fe3af9db38b14225e5bf0ed937147acb37d;hp=036452ed3ba32de0878ef6816eb4fb042c866928;hpb=b27ccd85af8db2d996495ba1e8a63b504b2a9b4a;p=platal.git diff --git a/modules/xnetlists.php b/modules/xnetlists.php index 036452e..bc1bcbb 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -1,6 +1,6 @@ $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) + protected function get_lists_domain() { global $globals; - Platal::load('lists', 'lists.inc.php'); - - $this->client = new MMList(S::v('uid'), S::v('password'), - $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'); } if (Post::has('del_alias') && may_update()) { S::assert_xsrf_token(); - $alias = Post::v('del_alias'); - // prevent group admin from erasing aliases from other groups - $alias = substr($alias, 0, strpos($alias, '@')).'@'.$globals->asso('mail_domain'); - XDB::query( - 'DELETE FROM r, v - USING x4dat.virtual AS v - LEFT JOIN x4dat.virtual_redirect AS r USING(vid) - WHERE v.alias={?}', $alias); - $page->trigSuccess(Post::v('del_alias')." supprimé !"); + $alias = Post::t('del_alias'); + list($local_part, ) = explode('@', $alias); + delete_list_alias($local_part, $this->get_lists_domain()); + $page->trigSuccess($alias . ' supprimé !'); } - $listes = $this->client->get_lists(); - $page->assign('listes', $listes); + $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'; + } - $alias = 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($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 groupex.asso + 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')) { + if (!$this->get_lists_domain()) { return PL_NOT_FOUND; } - $this->prepare_client($page); $page->changeTpl('xnetlists/create.tpl'); if (!Post::has('submit')) { @@ -140,191 +152,128 @@ class XnetListsModule extends ListsModule S::assert_xsrf_token(); } - if (!Post::has('liste')) { - $page->trigError('champs «adresse souhaitée» vide'); + if (!Post::has('liste') || !Post::t('liste')) { + $page->trigError('Le champs « adresse souhaitée Â» est vide.'); return; } - $liste = strtolower(Post::v('liste')); - - if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) { + $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 = XDB::query('SELECT alias FROM x4dat.virtual WHERE alias={?}', $new); - - if ($res->numRows()) { - $page->trigError('cet alias est déjà pris'); + require_once 'emails.inc.php'; + if (list_exist($list, $this->get_lists_domain())) { + $page->trigError('Cet alias est déjà pris.'); return; } - if (!Post::v('desc')) { - $page->trigError('le sujet est vide'); + if (!Post::t('desc')) { + $page->trigError('Le sujet est vide.'); return; } - $ret = $this->client->create_list( - $liste, utf8_decode(Post::v('desc')), Post::v('advertise'), - Post::v('modlevel'), Post::v('inslevel'), - array(S::user()->forlifeEmail()), array(S::user()->forlifeEmail())); + $mlist = $this->prepare_list($list); + $success = MailingList::create($mlist->mbox, $mlist->domain, S::user(), + Post::t('desc'), + Post::t('advertise'), Post::t('modlevel'), Post::t('inslevel'), + array(S::user()->forlifeEmail()), array(S::user()->forlifeEmail())); - $dom = strtolower($globals->asso("mail_domain")); - $red = $dom.'_'.$liste; - - if (!$ret) { + if (!$success) { $page->kill("Un problème est survenu, contacter " ."support@m4x.org"); return; } - foreach (array('', 'owner', 'admin', 'bounces', 'unsubscribe') as $app) { - $mdir = $app == '' ? '+post' : '+' . $app; - if (!empty($app)) { - $app = '-' . $app; - } - XDB::execute('INSERT INTO x4dat.virtual (alias,type) - VALUES({?},{?})', $liste. $app . '@'.$dom, 'list'); - XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect) - VALUES ({?}, {?})', XDB::insertId(), - $red . $mdir . '@listes.polytechnique.org'); - } + create_list($mlist->mbox, $mlist->domain); - XDB::execute("UPDATE groupex.asso + global $globals; + XDB::execute("UPDATE groups SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml') WHERE id = {?}", $globals->asso('id')); - pl_redirect('lists/admin/'.$liste); + pl_redirect('lists/admin/' . $list); } - function handler_sync(&$page, $liste = null) + 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); - $not_in_group_x = array(); - $not_in_group_ext = array(); - - $ann = 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, '@{$globals->mail->domain}'),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 = {?} - ORDER BY promo, nom, prenom", $globals->asso('id')); + global $globals; + $ann = XDB::fetchColumn('SELECT uid + FROM group_members + WHERE asso_id = {?}', $globals->asso('id')); + $users = User::getBulkUsersWithUIDs($ann); $not_in_list = array(); - - while ($tmp = $ann->next()) { - if (!in_array(strtolower($tmp['email']), $subscribers)) { - $not_in_list[] = $tmp; + 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 (!$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(); - $add = Env::v('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 = 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; - XDB::query( - "INSERT INTO x4dat.virtual_redirect (vid,redirect) - SELECT vid, {?} - FROM x4dat.virtual - WHERE alias={?}", "$alias@m4x.org", $lfull); - $page->trigSuccess("$alias@m4x.org ajouté"); - } else { - $page->trigError("$mbox@{$globals->mail->domain} n'existe pas."); - } + if (add_to_list_alias(Env::t('add_member'), $local_part, $domain)) { + $page->trigSuccess('Ajout réussi.'); } else { - XDB::query( - "INSERT INTO x4dat.virtual_redirect (vid,redirect) - SELECT vid,{?} - FROM x4dat.virtual - WHERE alias={?}", "$mbox@$dom", $lfull); - $page->trigSuccess("$mbox@$dom ajouté"); + $page->trigError('Ajout infructueux.'); } } if (Env::has('del_member')) { S::assert_xsrf_token(); - XDB::query( - "DELETE FROM x4dat.virtual_redirect - USING x4dat.virtual_redirect - INNER JOIN x4dat.virtual USING(vid) - WHERE redirect={?} AND alias={?}", Env::v('del_member'), $lfull); - pl_redirect('alias/admin/'.$lfull); + + if (delete_from_list_alias(Env::t('del_member'), $local_part, $domain)) { + $page->trigSuccess('Suppression réussie.'); + } else { + $page->trigError('Suppression infructueuse.'); + } } - global $globals; - $res = XDB::iterator("SELECT IF(r.login IS NULL, m.nom, IF(u.nom_usage != '', u.nom_usage, u.nom)) AS nom, - IF(r.login IS NULL, m.prenom, u.prenom) AS prenom, - IF(r.login IS NULL, 'extérieur', u.promo) AS promo, - m.perms = 'admin' AS admin, r.redirect, r.login AS alias - FROM (SELECT redirect AS redirect, - IF(SUBSTRING_INDEX(redirect, '@', -1) IN ({?}, {?}), - SUBSTRING_INDEX(redirect, '@', 1), NULL) AS login - FROM x4dat.virtual_redirect AS vr - INNER JOIN x4dat.virtual AS v USING(vid) - WHERE v.alias = {?} - ORDER BY redirect) AS r - LEFT JOIN aliases AS a ON (r.login IS NOT NULL AND r.login = a.alias) - LEFT JOIN auth_user_md5 AS u ON (u.user_id = a.id) - LEFT JOIN groupex.membres AS m ON (m.asso_id = {?} AND IF(r.login IS NULL, m.email = r.redirect, m.uid = u.user_id))", - $globals->mail->domain, $globals->mail->domain2, - $lfull, $globals->asso('id')); - $page->assign('mem', $res); + $page->assign('members', list_alias_members($local_part, $domain)); } - function handler_acreate(&$page) + 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'); @@ -336,34 +285,32 @@ class XnetListsModule extends ListsModule } if (!Post::has('liste')) { - $page->trigError('champs «adresse souhaitée» vide'); + $page->trigError('Le champs « adresse souhaitée Â» est vide.'); return; } - $liste = Post::v('liste'); - if (!preg_match("/^[a-zA-Z0-9\-\.]*$/", $liste)) { - $page->trigError('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 = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); - $n = $res->fetchOneCell(); - if ($n) { - $page->trigError('cet alias est déjà pris'); + require_once 'emails.inc.php'; + $lists_domain = $this->get_lists_domain(); + if (list_exist($list, $lists_domain)) { + $page->trigError('Cet alias est déjà pris.'); return; } - XDB::query('INSERT INTO x4dat.virtual (alias,type) VALUES({?}, "user")', $new); - - pl_redirect("alias/admin/$new"); + add_to_list_alias(S::i('uid'), $list, $lists_domain); + pl_redirect('alias/admin/' . $list . '@' . $lists_domain); } - function handler_profile(&$page, $user = null) + function handler_profile($page, $user = null) { http_redirect('https://www.polytechnique.org/profile/'.$user); } } -// 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: ?>