X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=ae991b48f431d06b038583407410766130af880e;hb=ff82994d23549527fe2e9c9f1214d639b73c0a22;hp=4f6dcb2c20b418e182546d6a0cce0add1eedf930;hpb=7f1ff426fc774ff5baedc4d76df5f6bced50b720;p=platal.git diff --git a/modules/xnetlists.php b/modules/xnetlists.php index 4f6dcb2..ae991b4 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -1,6 +1,6 @@ $this->make_hook('lists', AUTH_MDP, 'groupmember'), - '%grp/lists/create' => $this->make_hook('create', AUTH_MDP, 'groupmember'), + '%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/members' => $this->make_hook('members', AUTH_COOKIE), + '%grp/lists/csv' => $this->make_hook('csv', 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), - '%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, 'groupadmin'), - '%grp/alias/create' => $this->make_hook('acreate', AUTH_MDP, 'groupadmin'), + '%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), + 'profile' => $this->make_hook('profile', AUTH_PUBLIC), ); } @@ -98,24 +99,31 @@ class XnetListsModule extends ListsModule $alias = substr($alias, 0, strpos($alias, '@')).'@'.$globals->asso('mail_domain'); XDB::query( 'DELETE FROM r, v - USING x4dat.virtual AS v - LEFT JOIN x4dat.virtual_redirect AS r USING(vid) + USING virtual AS v + LEFT JOIN virtual_redirect AS r USING(vid) WHERE v.alias={?}', $alias); - $page->trigSuccess(Post::v('del_alias')." supprimé !"); + $page->trigSuccess(Post::v('del_alias')." supprimé !"); } $listes = $this->client->get_lists(); - $page->assign('listes',$listes); + $page->assign('listes', $listes); $alias = XDB::iterator( 'SELECT alias,type - FROM x4dat.virtual + FROM virtual WHERE alias LIKE {?} AND type="user" ORDER BY alias', '%@'.$globals->asso('mail_domain')); $page->assign('alias', $alias); $page->assign('may_update', may_update()); + + if (count($listes) > 0 && !$globals->asso('has_ml')) { + XDB::execute("UPDATE groups + SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml') + WHERE id = {?}", + $globals->asso('id')); + } } function handler_create(&$page) @@ -134,8 +142,8 @@ class XnetListsModule extends ListsModule S::assert_xsrf_token(); } - if (!Post::has('liste')) { - $page->trigError('champs «adresse souhaitée» vide'); + if (!Post::has('liste') || !Post::v('liste')) { + $page->trigError('Le champs « adresse souhaitée Â» est vide.'); return; } @@ -147,7 +155,7 @@ class XnetListsModule extends ListsModule } $new = $liste.'@'.$globals->asso('mail_domain'); - $res = XDB::query('SELECT alias FROM x4dat.virtual WHERE alias={?}', $new); + $res = XDB::query('SELECT alias FROM virtual WHERE alias={?}', $new); if ($res->numRows()) { $page->trigError('cet alias est déjà pris'); @@ -176,12 +184,18 @@ class XnetListsModule extends ListsModule if (!empty($app)) { $app = '-' . $app; } - XDB::execute('INSERT INTO x4dat.virtual (alias,type) + XDB::execute('INSERT INTO virtual (alias,type) VALUES({?},{?})', $liste. $app . '@'.$dom, 'list'); - XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect) + XDB::execute('INSERT INTO virtual_redirect (vid,redirect) VALUES ({?}, {?})', XDB::insertId(), $red . $mdir . '@listes.polytechnique.org'); } + + XDB::execute("UPDATE groups + SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml') + WHERE id = {?}", + $globals->asso('id')); + pl_redirect('lists/admin/'.$liste); } @@ -207,25 +221,15 @@ class XnetListsModule extends ListsModule $not_in_group_x = array(); $not_in_group_ext = array(); - $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, '@{$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 = {?} - ORDER BY promo, nom, prenom", $globals->asso('id')); + $ann = XDB::fetchColumn('SELECT uid + FROM group_members + WHERE asso_id = {?}', $globals->asso('id')); + $users = User::getBulkUsersWithUIDs($ann); $not_in_list = array(); - - while ($tmp = $ann->next()) { - if (!in_array(strtolower($tmp['email']), $subscribers)) { - $not_in_list[] = $tmp; + foreach ($users as $user) { + if (!in_array(strtolower($user->forlifeEmail()), $subscribers)) { + $not_in_list[] = $user; } } @@ -244,68 +248,50 @@ class XnetListsModule extends ListsModule if (Env::has('add_member')) { S::assert_xsrf_token(); - $add = Env::v('add_member'); - if (strstr($add, '@')) { - list($mbox,$dom) = explode('@', strtolower($add)); - } else { - $mbox = $add; - $dom = 'm4x.org'; + $add = Env::t('add_member'); + $user = User::getSilent($add); + if ($user) { + $add = $user->forlifeEmail(); + } else if (!User::isForeignEmailAddress($add)) { + $add = null; } - 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->trigSuccess("$alias@m4x.org ajouté"); - } else { - $page->trigError("$mbox@{$globals->mail->domain} n'existe pas."); - } + if (!empty($add)) { + XDB::execute('INSERT INTO virtual_redirect (vid, redirect) + SELECT vid, {?} + FROM virtual + WHERE alias = {?}', strtolower($add), $lfull); + $page->trigSuccess($add . ' ajouté.'); } else { - XDB::query( - "INSERT INTO x4dat.virtual_redirect (vid,redirect) - SELECT vid,{?} - FROM x4dat.virtual - WHERE alias={?}", "$mbox@$dom", $lfull); - $page->trigSuccess("$mbox@$dom ajouté"); + $page->trigError($add . " n'existe pas."); } } if (Env::has('del_member')) { S::assert_xsrf_token(); XDB::query( - "DELETE FROM x4dat.virtual_redirect - USING x4dat.virtual_redirect - INNER JOIN x4dat.virtual USING(vid) + "DELETE FROM virtual_redirect + USING virtual_redirect + INNER JOIN virtual USING(vid) WHERE redirect={?} AND alias={?}", Env::v('del_member'), $lfull); pl_redirect('alias/admin/'.$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); + $emails = XDB::fetchColumn('SELECT redirect + FROM virtual_redirect AS vr + INNER JOIN virtual AS v USING(vid) + WHERE v.alias = {?} + ORDER BY redirect', $lfull); + $mem = array(); + foreach ($emails as $email) { + $user = User::getSilent($email); + if ($user) { + $mem[] = array('user' => $user, 'email' => $email); + } else { + $mem[] = array('email' => $email); + } + } + $page->assign('mem', $mem); } function handler_acreate(&$page) @@ -324,7 +310,7 @@ class XnetListsModule extends ListsModule } if (!Post::has('liste')) { - $page->trigError('champs «adresse souhaitée» vide'); + $page->trigError('Le champs « adresse souhaitée Â» est vide.'); return; } $liste = Post::v('liste'); @@ -335,14 +321,14 @@ class XnetListsModule extends ListsModule } $new = $liste.'@'.$globals->asso('mail_domain'); - $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); + $res = XDB::query('SELECT COUNT(*) FROM virtual WHERE alias = {?}', $new); $n = $res->fetchOneCell(); if ($n) { $page->trigError('cet alias est déjà pris'); return; } - XDB::query('INSERT INTO x4dat.virtual (alias,type) VALUES({?}, "user")', $new); + XDB::query('INSERT INTO virtual (alias,type) VALUES({?}, "user")', $new); pl_redirect("alias/admin/$new"); }