<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
function handlers()
{
return array(
- '%grp/lists' => $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),
);
}
$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)
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;
}
}
$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');
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);
}
$not_in_group_ext = array();
$ann = XDB::fetchColumn('SELECT uid
- FROM groupex.membres
+ FROM group_members
WHERE asso_id = {?}', $globals->asso('id'));
$users = User::getBuildUsersWithUIDs($ann, 'promo,full_name');
+
$not_in_list = array();
foreach ($users as $user) {
if (!in_array(strtolower($user->forlifeEmail()), $subscribers)) {
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);
}
}
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');
}
$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");
}