X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=f99c4cb96f3eb15c670865530e7c390f6479336a;hb=2c0315bc77abc3c53b5891d2a8c5d4943fd27143;hp=a539774316a33cbe930f812660e1747fd96eb201;hpb=9fdacf8d3f30d59d44a8988449db6aae6e4aae21;p=platal.git diff --git a/modules/xnetlists.php b/modules/xnetlists.php index a539774..f99c4cb 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -28,20 +28,23 @@ 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), + '%grp/lists/create' => $this->make_hook('create', AUTH_MDP), - '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), + '%grp/lists/archives' => $this->make_hook('archives', AUTH_COOKIE), - '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), + '%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/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), + '%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), /* hack: lists uses that */ 'profile' => $this->make_hook('profile', AUTH_PUBLIC), @@ -54,8 +57,7 @@ class XnetListsModule extends ListsModule require_once 'lists.inc.php'; - $this->client =& lists_xmlrpc(Session::getInt('uid'), - Session::get('password'), + $this->client =& lists_xmlrpc(S::v('uid'), S::v('password'), $globals->asso('mail_domain')); $page->useMenu(); @@ -69,33 +71,33 @@ class XnetListsModule extends ListsModule $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'); + $this->client->unsubscribe(Get::v('del')); + pl_redirect('lists'); } if (Get::has('add')) { - $this->client->subscribe(Get::get('add')); - redirect('lists'); + $this->client->subscribe(Get::v('add')); + pl_redirect('lists'); } if (Post::has('del_alias') && may_update()) { - $alias = Post::get('del_alias'); + $alias = Post::v('del_alias'); // prevent group admin from erasing aliases from other groups $alias = substr($alias, 0, strpos($alias, '@')).'@'.$globals->asso('mail_domain'); - $globals->xdb->query( + 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é !"); + $page->trig(Post::v('del_alias')." supprimé !"); } $listes = $this->client->get_lists(); $page->assign('listes',$listes); - $alias = $globals->xdb->iterator( + $alias = XDB::iterator( 'SELECT alias,type FROM x4dat.virtual WHERE alias @@ -106,16 +108,92 @@ class XnetListsModule extends ListsModule $page->assign('may_update', may_update()); } + function handler_create(&$page) + { + global $globals; + + $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'); + return; + } + + $liste = 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'); + return; + } + + $new = $liste.'@'.$globals->asso('mail_domain'); + $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); + $n = $res->fetchOneCell(); + + if ($n) { + $page->trig('cet alias est déjà pris'); + return; + } + if (!Post::v('desc')) { + $page->trig('le sujet est vide'); + return; + } + + require_once 'lists.inc.php'; + $ret = $this->client->create_list( + $liste, Post::v('desc'), Post::v('advertise'), + Post::v('modlevel'), Post::v('inslevel'), + array(S::v('forlife')), array()); + + $dom = strtolower($globals->asso("mail_domain")); + $red = $dom.'_'.$liste; + + if (!$ret) { + $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"); + + pl_redirect('lists/admin/'.$liste); + } + function handler_sync(&$page, $liste = null) { global $globals; $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'))); + $this->client->mass_subscribe($liste, array_keys(Env::v('add'))); } list(,$members) = $this->client->get_members($liste); @@ -125,12 +203,12 @@ class XnetListsModule extends ListsModule $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, + $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',FIND_IN_SET('femme', u.flags),0) AS femme, m.perms='admin' AS admin, m.origine='X' AS x FROM groupex.membres AS m @@ -149,9 +227,104 @@ class XnetListsModule extends ListsModule $page->assign('not_in_list', $not_in_list); } + function handler_aadmin(&$page, $lfull = null) + { + if (is_null($lfull)) { + return PL_NOT_FOUND; + } + + new_groupadmin_page('xnet/groupe/alias-admin.tpl'); + + if (Env::has('add_member')) { + $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->trig("$alias@m4x.org ajouté"); + } else { + $page->trig("$mbox@polytechnique.org n'existe pas."); + } + } else { + XDB::query( + "INSERT INTO x4dat.virtual_redirect (vid,redirect) + SELECT vid,{?} + FROM x4dat.virtual + WHERE alias={?}", "$mbox@$dom", $lfull); + $page->trig("$mbox@$dom ajouté"); + } + } + + if (Env::has('del_member')) { + 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); + } + + $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); + $page->assign('mem', $res); + } + + function handler_acreate(&$page) + { + global $globals; + + new_groupadmin_page('xnet/groupe/alias-create.tpl'); + + if (!Post::has('submit')) { + return; + } + + if (!Post::has('liste')) { + $page->trig('champs «addresse souhaitée» vide'); + return; + } + $liste = Post::v('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'); + return; + } + + $new = $liste.'@'.$globals->asso('mail_domain'); + $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); + $n = $res->fetchOneCell(); + if ($n) { + $page->trig('cet alias est déjà pris'); + return; + } + + XDB::query('INSERT INTO x4dat.virtual (alias,type) VALUES({?}, "user")', $new); + + pl_redirect("alias/admin/$new"); + } + function handler_profile(&$page, $user = null) { - redirect('https://www.polytechnique.org/profile/'.$user); + http_redirect('https://www.polytechnique.org/profile/'.$user); } }