X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=50f8b9dc815b37027d687ff24348990f899d3756;hb=a5878ac19cc6ea75a753470cf68b7d2180d6cd51;hp=7638917d40b00a6bfe0bd75864d9988d487e68f9;hpb=092945b4d51826bf0305e7204447094b69804efc;p=platal.git diff --git a/modules/xnetlists.php b/modules/xnetlists.php index 7638917..50f8b9d 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -1,6 +1,6 @@ $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/annu' => $this->make_hook('annu', AUTH_COOKIE), '%grp/lists/archives' => $this->make_hook('archives', AUTH_COOKIE), + '%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), @@ -43,8 +45,8 @@ class XnetListsModule extends ListsModule '%grp/lists/check' => $this->make_hook('check', AUTH_MDP), '%grp/lists/sync' => $this->make_hook('sync', AUTH_MDP), - '%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), @@ -55,12 +57,11 @@ class XnetListsModule extends ListsModule { global $globals; - require_once 'lists.inc.php'; + require_once dirname(__FILE__).'/lists/lists.inc.php'; - $this->client =& lists_xmlrpc(S::v('uid'), S::v('password'), - $globals->asso('mail_domain')); + $this->client = new MMList(S::v('uid'), S::v('password'), + $globals->asso('mail_domain')); - $page->useMenu(); $page->assign('asso', $globals->asso()); $page->setType($globals->asso('cat')); @@ -71,8 +72,10 @@ class XnetListsModule extends ListsModule { global $globals; + if (!$globals->asso('mail_domain')) { + return PL_NOT_FOUND; + } $this->prepare_client($page); - $page->changeTpl('xnetlists/index.tpl'); if (Get::has('del')) { @@ -89,11 +92,11 @@ class XnetListsModule extends ListsModule // prevent group admin from erasing aliases from other groups $alias = substr($alias, 0, strpos($alias, '@')).'@'.$globals->asso('mail_domain'); XDB::query( - 'DELETE FROM x4dat.virtual_redirect, x4dat.virtual + 'DELETE FROM r, v USING x4dat.virtual AS v - LEFT JOIN x4dat.virtual_redirect USING(vid) + LEFT JOIN x4dat.virtual_redirect AS r USING(vid) WHERE v.alias={?}', $alias); - $page->trig(Post::v('del_alias')." supprimé !"); + $page->trig(Post::v('del_alias')." supprimé !"); } $listes = $this->client->get_lists(); @@ -114,33 +117,33 @@ class XnetListsModule extends ListsModule { global $globals; + if (!$globals->asso('mail_domain')) { + return PL_NOT_FOUND; + } $this->prepare_client($page); - $page->changeTpl('xnetlists/create.tpl'); - $page->assign('force_list_super', may_update()); if (!Post::has('submit')) { return; } if (!Post::has('liste')) { - $page->trig('champs «addresse souhaitée» vide'); + $page->trig('champs «adresse souhaitée» vide'); return; } - $liste = Post::v('liste'); + $liste = strtolower(Post::v('liste')); if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) { - $page->trig('le nom de la liste ne doit contenir que des lettres, chiffres et tirets'); + $page->trig('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 COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); - $n = $res->fetchOneCell(); + $res = XDB::query('SELECT alias FROM x4dat.virtual WHERE alias={?}', $new); - if ($n) { - $page->trig('cet alias est déjà pris'); + if ($res->numRows()) { + $page->trig('cet alias est déjà pris'); return; } if (!Post::v('desc')) { @@ -148,41 +151,30 @@ class XnetListsModule extends ListsModule return; } - require_once 'lists.inc.php'; $ret = $this->client->create_list( - $liste, Post::v('desc'), Post::v('advertise'), + $liste, utf8_decode(Post::v('desc')), Post::v('advertise'), Post::v('modlevel'), Post::v('inslevel'), - array(S::v('forlife')), array()); + array(S::v('forlife')), array(S::v('forlife'))); $dom = strtolower($globals->asso("mail_domain")); $red = $dom.'_'.$liste; if (!$ret) { - $page->kill("Un problème est survenu, contacter " + $page->kill("Un problème est survenu, contacter " ."support@m4x.org"); return; } - XDB::execute('INSERT INTO x4dat.virtual (alias,type) - VALUES({?},{?})', $liste.'@'.$dom, 'list'); - XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect) - VALUES ({?}, {?})', mysql_insert_id(), - "$red+post@listes.polytechnique.org"); - XDB::execute('INSERT INTO x4dat.virtual (alias,type) - VALUES({?},{?})', $liste.'-owner@'.$dom, 'list'); - XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect) - VALUES ({?}, {?})', mysql_insert_id(), - "$red+owner@listes.polytechnique.org"); - XDB::execute('INSERT INTO x4dat.virtual (alias,type) - VALUES({?},{?})', $liste.'-admin@'.$dom, 'list'); - XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect) - VALUES ({?}, {?})', mysql_insert_id(), - "$red+admin@listes.polytechnique.org"); - XDB::execute('INSERT INTO x4dat.virtual (alias,type) - VALUES({?},{?})', $liste.'-bounces@'.$dom, 'list'); - XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect) - VALUES ({?}, {?})', mysql_insert_id(), - "$red+bounces@listes.polytechnique.org"); - + 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'); + } pl_redirect('lists/admin/'.$liste); } @@ -190,8 +182,10 @@ class XnetListsModule extends ListsModule { global $globals; + if (!$globals->asso('mail_domain')) { + return PL_NOT_FOUND; + } $this->prepare_client($page); - $page->changeTpl('xnetlists/sync.tpl'); if (Env::has('add')) { @@ -200,7 +194,7 @@ class XnetListsModule extends ListsModule list(,$members) = $this->client->get_members($liste); $mails = array_map(create_function('$arr', 'return $arr[1];'), $members); - $subscribers = array_unique(array_merge($subscribers, $mails)); + $subscribers = array_unique($mails); $not_in_group_x = array(); $not_in_group_ext = array(); @@ -208,20 +202,21 @@ class XnetListsModule extends ListsModule $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, '@polytechnique.org'),m.email) AS email, + 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 = {?}", $globals->asso('id')); + WHERE m.asso_id = {?} + ORDER BY promo, nom, prenom", $globals->asso('id')); $not_in_list = array(); while ($tmp = $ann->next()) { - if (!in_array($tmp['email'], $subscribers)) { + if (!in_array(strtolower($tmp['email']), $subscribers)) { $not_in_list[] = $tmp; } } @@ -231,11 +226,12 @@ class XnetListsModule extends ListsModule function handler_aadmin(&$page, $lfull = null) { - if (is_null($lfull)) { + global $globals; + + if (!$globals->asso('mail_domain') || is_null($lfull)) { return PL_NOT_FOUND; } - - new_groupadmin_page('xnet/groupe/alias-admin.tpl'); + $page->changeTpl('xnetlists/alias-admin.tpl'); if (Env::has('add_member')) { $add = Env::v('add_member'); @@ -258,9 +254,9 @@ class XnetListsModule extends ListsModule SELECT vid, {?} FROM x4dat.virtual WHERE alias={?}", "$alias@m4x.org", $lfull); - $page->trig("$alias@m4x.org ajouté"); + $page->trig("$alias@m4x.org ajouté"); } else { - $page->trig("$mbox@polytechnique.org n'existe pas."); + $page->trig("$mbox@{$globals->mail->domain} n'existe pas."); } } else { XDB::query( @@ -268,7 +264,7 @@ class XnetListsModule extends ListsModule SELECT vid,{?} FROM x4dat.virtual WHERE alias={?}", "$mbox@$dom", $lfull); - $page->trig("$mbox@$dom ajouté"); + $page->trig("$mbox@$dom ajouté"); } } @@ -281,12 +277,23 @@ class XnetListsModule extends ListsModule pl_redirect('alias/admin/'.$lfull); } - $res = 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); + 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); } @@ -294,14 +301,17 @@ class XnetListsModule extends ListsModule { 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; } if (!Post::has('liste')) { - $page->trig('champs «addresse souhaitée» vide'); + $page->trig('champs «adresse souhaitée» vide'); return; } $liste = Post::v('liste'); @@ -315,7 +325,7 @@ class XnetListsModule extends ListsModule $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); $n = $res->fetchOneCell(); if ($n) { - $page->trig('cet alias est déjà pris'); + $page->trig('cet alias est déjà pris'); return; } @@ -330,4 +340,5 @@ class XnetListsModule extends ListsModule } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>