X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=85010461eba779391b50c73e25d06a7f5dd68bc9;hb=7f304b19d99da617750ed43ed6246ebd226fe645;hp=2a9ad7d5bfcc9d0bb5eb67dccc02dba7eaf652a6;hpb=7cdecf882d9716b795faf533cdf6a4427082278a;p=platal.git diff --git a/modules/xnetlists.php b/modules/xnetlists.php index 2a9ad7d..8501046 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), @@ -70,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')) { @@ -88,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(); @@ -113,24 +117,25 @@ 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 «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; } @@ -139,7 +144,7 @@ class XnetListsModule extends ListsModule $n = $res->fetchOneCell(); if ($n) { - $page->trig('cet alias est déjà pris'); + $page->trig('cet alias est déjà pris'); return; } if (!Post::v('desc')) { @@ -156,29 +161,29 @@ class XnetListsModule extends ListsModule $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(), + 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 ({?}, {?})', mysql_insert_id(), + 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 ({?}, {?})', mysql_insert_id(), + 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 ({?}, {?})', mysql_insert_id(), + VALUES ({?}, {?})', XDB::insertId(), "$red+bounces@listes.polytechnique.org"); pl_redirect('lists/admin/'.$liste); @@ -188,8 +193,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')) { @@ -206,7 +213,7 @@ 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',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, @@ -214,7 +221,8 @@ class XnetListsModule extends ListsModule 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(); @@ -229,11 +237,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'); @@ -256,7 +265,7 @@ 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."); } @@ -266,7 +275,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é"); } } @@ -284,13 +293,13 @@ class XnetListsModule extends ListsModule "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(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.aliases AS a ON(vr.redirect = CONCAT(a.alias, '@', {?}) + OR vr.redirect = CONCAT(a.alias, '@', {?})) 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 = {?}) @@ -305,14 +314,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 «addresse souhaitée» vide'); return; } $liste = Post::v('liste'); @@ -326,7 +338,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; } @@ -341,4 +353,5 @@ class XnetListsModule extends ListsModule } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>