X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=b4e59872a95af0edca0f54dab775ef446731b74e;hb=5660032ac785d410f90e3f5b0d6948dc90b0cfea;hp=7176f09a6d75beed39932cb14bff1f27bd3f1d2d;hpb=00112b2e8cd1e6e37d06135e6279380f7e2aaa73;p=platal.git diff --git a/modules/xnetlists.php b/modules/xnetlists.php index 7176f09..b4e5987 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -1,6 +1,6 @@ client = new MMList(S::v('uid'), S::v('password'), - $globals->asso('mail_domain')); + if (is_null($user)) { + $user =& S::user(); + } + $this->client = new MMList($user, $globals->asso('mail_domain')); $page->assign('asso', $globals->asso()); $page->setType($globals->asso('cat')); @@ -219,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 #x4dat#.auth_user_md5 AS u ON ( u.user_id = m.uid ) - LEFT JOIN #x4dat#.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 #groupex#.membres + WHERE asso_id = {?}', $globals->asso('id')); + $users = User::getBuildUsersWithUIDs($ann, 'promo,full_name'); $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; } } @@ -256,37 +248,21 @@ 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 aliases AS a - LEFT JOIN 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 IGNORE INTO virtual_redirect (vid,redirect) - SELECT vid, {?} - FROM 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 IGNORE INTO virtual_redirect (vid,redirect) - SELECT vid,{?} - FROM virtual - WHERE alias={?}", "$mbox@$dom", $lfull); - $page->trigSuccess("$mbox@$dom ajouté"); + $page->trigError($add . " n'existe pas."); } } @@ -301,23 +277,21 @@ class XnetListsModule extends ListsModule } 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 #x4dat#.aliases AS a ON (r.login IS NOT NULL AND r.login = a.alias) - LEFT JOIN #x4dat#.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)