X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=e229642e9bdc7689cb15fc0a3cb3727126b37273;hb=01ab5780ddaab6adf864c576205905ac37dfbe65;hp=ff510414266d62c07592a2cbfbcb527cc4c1e050;hpb=edc4367b593ca5771aa26e273ec2560ec983023a;p=platal.git diff --git a/modules/xnetlists.php b/modules/xnetlists.php index ff51041..e229642 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), @@ -74,7 +76,6 @@ class XnetListsModule extends ListsModule return PL_NOT_FOUND; } $this->prepare_client($page); - $page->changeTpl('xnetlists/index.tpl'); if (Get::has('del')) { @@ -91,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(); @@ -120,32 +121,29 @@ class XnetListsModule extends ListsModule 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 «addresse 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')) { @@ -154,39 +152,29 @@ class XnetListsModule extends ListsModule } $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 ({?}, {?})', XDB::insertId(), - "$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 ({?}, {?})', XDB::insertId(), - "$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 ({?}, {?})', XDB::insertId(), - "$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 ({?}, {?})', XDB::insertId(), - "$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); } @@ -198,7 +186,6 @@ class XnetListsModule extends ListsModule return PL_NOT_FOUND; } $this->prepare_client($page); - $page->changeTpl('xnetlists/sync.tpl'); if (Env::has('add')) { @@ -215,8 +202,8 @@ 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 @@ -244,8 +231,7 @@ class XnetListsModule extends ListsModule if (!$globals->asso('mail_domain') || is_null($lfull)) { return PL_NOT_FOUND; } - - new_groupadmin_page('xnetlists/alias-admin.tpl'); + $page->changeTpl('xnetlists/alias-admin.tpl'); if (Env::has('add_member')) { $add = Env::v('add_member'); @@ -268,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( @@ -278,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é"); } } @@ -292,24 +278,22 @@ class XnetListsModule extends ListsModule } global $globals; - $res = XDB::iterator( - "SELECT redirect, - IF(u.nom IS NOT NULL, IF(u.nom_usage<>'', u.nom_usage, u.nom), m.nom) AS nom, - IF(u.prenom IS NOT NULL, u.prenom, m.prenom) AS prenom, - IF(u.promo IS NOT NULL, u.promo, 'extérieur') AS promo, - IF(m2.perms, m2.perms = 'admin', m.perms = 'admin') AS admin, - a.alias - FROM x4dat.virtual_redirect AS vr - INNER JOIN x4dat.virtual AS v USING(vid) - LEFT JOIN x4dat.aliases AS a ON(vr.redirect = CONCAT(a.alias, CONCAT('@', {?})) - OR vr.redirect = CONCAT(a.alias, CONCAT('@', {?}))) - LEFT JOIN x4dat.auth_user_md5 AS u ON(a.id = u.user_id) - LEFT JOIN groupex.membres AS m2 ON(u.user_id = m2.uid AND m2.asso_id = {?}) - LEFT JOIN groupex.membres AS m ON(m.email = vr.redirect AND m.asso_id = {?}) - WHERE v.alias={?} - ORDER BY redirect", - $globals->mail->domain, $globals->mail->domain2, - $globals->asso('id'), $globals->asso('id'), $lfull); + $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); } @@ -320,14 +304,14 @@ class XnetListsModule extends ListsModule if (!$globals->asso('mail_domain')) { return PL_NOT_FOUND; } - new_groupadmin_page('xnetlists/alias-create.tpl'); + $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 «addresse souhaitée» vide'); return; } $liste = Post::v('liste'); @@ -341,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; } @@ -356,4 +340,5 @@ class XnetListsModule extends ListsModule } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>