X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=986cad9fa5d54c41a3f79dde3b869c161c7cc8e2;hb=8b83a166c039c798039818bda7114275dcec33f0;hp=a534a5b5ef53c8beb16a01cde38ba9d27c616a2d;hpb=c9110c6c4f4d15c76c3353353bd91c48f9bb51d3;p=platal.git diff --git a/modules/xnetlists.php b/modules/xnetlists.php index a534a5b..986cad9 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -55,14 +55,15 @@ 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')); + + return $globals->asso('mail_domain'); } function handler_lists(&$page) @@ -74,16 +75,16 @@ class XnetListsModule extends ListsModule $page->changeTpl('xnetlists/index.tpl'); if (Get::has('del')) { - $this->client->unsubscribe(Get::get('del')); + $this->client->unsubscribe(Get::v('del')); pl_redirect('lists'); } if (Get::has('add')) { - $this->client->subscribe(Get::get('add')); + $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'); XDB::query( @@ -91,7 +92,7 @@ class XnetListsModule extends ListsModule 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(); @@ -126,7 +127,7 @@ class XnetListsModule extends ListsModule return; } - $liste = Post::get('liste'); + $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'); @@ -141,16 +142,14 @@ class XnetListsModule extends ListsModule $page->trig('cet alias est déjà pris'); return; } - if (!Post::get('desc')) { + if (!Post::v('desc')) { $page->trig('le sujet est vide'); return; } - require_once 'platal/xmlrpc-client.inc.php'; - require_once 'lists.inc.php'; $ret = $this->client->create_list( - $liste, Post::get('desc'), Post::get('advertise'), - Post::get('modlevel'), Post::get('inslevel'), + $liste, Post::v('desc'), Post::v('advertise'), + Post::v('modlevel'), Post::v('inslevel'), array(S::v('forlife')), array()); $dom = strtolower($globals->asso("mail_domain")); @@ -164,22 +163,22 @@ class XnetListsModule extends ListsModule 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); @@ -194,12 +193,12 @@ class XnetListsModule extends ListsModule $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); $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(); @@ -220,7 +219,7 @@ class XnetListsModule extends ListsModule $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; } } @@ -237,7 +236,7 @@ class XnetListsModule extends ListsModule new_groupadmin_page('xnet/groupe/alias-admin.tpl'); if (Env::has('add_member')) { - $add = Env::get('add_member'); + $add = Env::v('add_member'); if (strstr($add, '@')) { list($mbox,$dom) = explode('@', strtolower($add)); } else { @@ -276,16 +275,29 @@ class XnetListsModule extends ListsModule "DELETE FROM x4dat.virtual_redirect USING x4dat.virtual_redirect INNER JOIN x4dat.virtual USING(vid) - WHERE redirect={?} AND alias={?}", Env::get('del_member'), $lfull); + WHERE redirect={?} AND alias={?}", Env::v('del_member'), $lfull); pl_redirect('alias/admin/'.$lfull); } + global $globals; $res = XDB::iterator( - "SELECT redirect + "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", $lfull); + ORDER BY redirect", + $globals->mail->domain, $globals->mail->domain2, + $globals->asso('id'), $globals->asso('id'), $lfull); $page->assign('mem', $res); } @@ -303,7 +315,7 @@ class XnetListsModule extends ListsModule $page->trig('champs «addresse souhaitée» vide'); return; } - $liste = Post::get('liste'); + $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');