'%grp/annuaire/vcard' => $this->make_hook('vcard', AUTH_MDP),
'%grp/trombi' => $this->make_hook('trombi', AUTH_MDP),
'%grp/subscribe' => $this->make_hook('subscribe', AUTH_MDP),
+ '%grp/unsubscribe' => $this->make_hook('unsubscribe', AUTH_MDP),
+
+ '%grp/change_rights' => $this->make_hook('change_rights', AUTH_MDP),
'%grp/admin/annuaire'
=> $this->make_hook('admin_annuaire', AUTH_MDP),
SET nom={?}, diminutif={?}, cat={?}, dom={?},
descr={?}, site={?}, mail={?}, resp={?},
forum={?}, mail_domain={?}, ax={?}, pub={?},
- sub_url={?}, inscriptible={?}
+ sub_url={?}, inscriptible={?}, unsub_url={?}
WHERE id={?}",
Post::v('nom'), Post::v('diminutif'),
Post::v('cat'), Post::i('dom'),
Post::v('forum'), Post::v('mail_domain'),
Post::has('ax'), Post::has('pub')?'private':'public',
Post::v('sub_url'), Post::v('inscriptible'),
- $globals->asso('id'));
+ Post::v('unsub_url'),$globals->asso('id'));
if (Post::v('mail_domain')) {
XDB::execute('INSERT INTO virtual_domains (domain) VALUES({?})',
Post::v('mail_domain'));
XDB::execute(
"UPDATE groupex.asso
SET descr={?}, site={?}, mail={?}, resp={?},
- forum={?}, ax={?}, pub= {?}, sub_url={?}
+ forum={?}, ax={?}, pub= {?}, sub_url={?},
+ unsub_url={?}
WHERE id={?}",
Post::v('descr'), Post::v('site'),
Post::v('mail'), Post::v('resp'),
Post::v('forum'), Post::has('ax'),
Post::has('pub')?'private':'public',
- Post::v('sub_url'), $globals->asso('id'));
+ Post::v('sub_url'), Post::v('unsub_url'),
+ $globals->asso('id'));
}
if ($_FILES['logo']['name']) {
$body = Post::v('body');
$mls = array_keys(Env::v('ml', array()));
+ $mbr = array_keys(Env::v('membres', array()));
- require_once 'xnet/mail.inc.php';
- $tos = get_all_redirects(Post::has('membres'), $mls, $mmlist);
- send_xnet_mails($from, $sujet, $body, $tos, Post::v('replyto'));
+ require_once dirname(__FILE__) . '/xnetgrp/mail.inc.php';
+ $tos = get_all_redirects($mbr, $mls, $mmlist);
+ send_xnet_mails($from, $sujet, $body, $tos, Post::v('replyto'), $_FILES['uploaded']);
$page->kill("Mail envoyé !");
$page->assign('sent', true);
}
}
$page->assign('sort', $sort);
- if ($group == 'initiale')
+ if ($group == 'initiale') {
$res = XDB::iterRow(
'SELECT UPPER(SUBSTRING(
IF(m.origine="X", IF(u.nom_usage<>"", u.nom_usage, u.nom),m.nom),
WHERE asso_id = {?}
GROUP BY letter
ORDER BY letter', $globals->asso('id'));
- else
+ } else {
$res = XDB::iterRow(
- 'SELECT IF(m.origine="X",u.promo,"extérieur") AS promo,
+ 'SELECT IF(m.origine="X",u.promo,
+ IF(m.origine="ext", "extérieur", "personne morale")) AS promo,
COUNT(*), IF(m.origine="X",u.promo,"") AS promo_o
FROM groupex.membres AS m
LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid )
WHERE asso_id = {?}
GROUP BY promo
ORDER BY promo_o DESC', $globals->asso('id'));
-
+ }
$alphabet = array();
$nb_tot = 0;
while (list($char, $nb) = $res->next()) {
IF(u.nom_usage<>"", u.nom_usage, u.nom),
m.nom) LIKE "'.addslashes(Env::v('initiale')).'%"';
} elseif (Env::has('promo')) {
- $ini = 'AND IF(m.origine="X", u.promo, "extérieur") = "'
+ $ini = 'AND IF(m.origine="X", u.promo, IF(m.origine="ext", "extérieur", "personne morale")) = "'
.addslashes(Env::v('promo')).'"';
} elseif (Env::has('admin')) {
$ini = 'AND m.perms = "admin"';
$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', u.promo, IF(m.origine='ext', 'extérieur', 'personne morale')) AS promo,
IF(m.origine='X',u.promo,'') AS promo_o,
IF(m.origine='X' AND u.perms != 'pending',a.alias,m.email) AS email,
IF(m.origine='X',FIND_IN_SET('femme', u.flags), m.sexe) AS femme,
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 = {?} $ini
- AND (m.origine = 'ext' OR u.perms != 'pending' OR m.email IS NOT NULL)
+ AND (m.origine != 'X' OR u.perms != 'pending' OR m.email IS NOT NULL)
ORDER BY $tri
LIMIT {?},{?}", $globals->asso('id'), $ofs*NB_PER_PAGE, NB_PER_PAGE);
$page->assign('ann', $ann);
XDB::execute("INSERT INTO groupex.membres
VALUES ({?}, {?}, 'membre', 'X', NULL, NULL, NULL, NULL, NULL)",
$globals->asso('id'), $uid);
- require_once 'diogenes/diogenes.hermes.inc.php';
- $mailer = new HermesMailer();
+ $mailer = new PlMailer();
$mailer->addTo("$u@polytechnique.org");
$mailer->setFrom('"'.S::v('prenom').' '.S::v('nom')
.'" <'.S::v('forlife').'@polytechnique.org>');
}
elseif (Env::has('refuse'))
{
- require_once 'diogenes/diogenes.hermes.inc.php';
- $mailer = new HermesMailer();
+ $mailer = new PlMailer();
$mailer->addTo("$u@polytechnique.org");
$mailer->setFrom('"'.S::v('prenom').' '.S::v('nom')
.'" <'.S::v('forlife').'@polytechnique.org>');
." résoudre ce problème.\n";
}
- require_once 'diogenes/diogenes.hermes.inc.php';
- $mailer = new HermesMailer();
+ $mailer = new PlMailer();
$mailer->addTo($to);
$mailer->setFrom('"'.S::v('prenom').' '.S::v('nom')
.'" <'.S::v('forlife').'@polytechnique.org>');
}
}
+ function handler_change_rights(&$page)
+ {
+ if (Env::has('right') && (may_update() || S::has('suid'))) {
+ switch (Env::v('right')) {
+ case 'admin':
+ XnetSession::killSuid();
+ break;
+ case 'anim':
+ XnetSession::doSelfSuid();
+ may_update(true);
+ is_member(true);
+ break;
+ case 'member':
+ XnetSession::doSelfSuid();
+ may_update(false, true);
+ is_member(true);
+ break;
+ case 'logged':
+ XnetSession::doSelfSuid();
+ may_update(false, true);
+ is_member(false, true);
+ break;
+ }
+ }
+ pl_redirect("");
+ }
+
function handler_admin_annuaire(&$page)
{
global $globals;
$uid = Env::i('userid');
$res = XDB::query("SELECT *
FROM auth_user_md5
- WHERE user_id = {?} AND perms = 'pending'", $uid);
+ WHERE user_id = {?} AND perms = 'pending'", $uid);
if ($res->numRows() == 1) {
XDB::execute('INSERT INTO groupex.membres (uid, asso_id, origine, email)
VALUES ({?}, {?}, "X", {?})',
}
}
- function handler_admin_member_del(&$page, $user = null)
+ function unsubscribe(&$user)
{
- global $globals;
-
- new_groupadmin_page('xnet/groupe/membres-del.tpl');
- $user = get_infos($user);
- if (empty($user)) {
- return PL_NOT_FOUND;
- }
- $page->assign('user', $user);
-
- if (!Post::has('confirm')) {
- return;
- }
-
+ global $globals, $page;
XDB::execute(
"DELETE FROM groupex.membres WHERE uid={?} AND asso_id={?}",
$user['uid'], $globals->asso('id'));
- // don't unsubscribe email from list if other user use same email
$user_same_email = get_infos($user['email']);
+ $domain = $globals->asso('mail_domain');
- if (($domain = $globals->asso('mail_domain')) && empty($user_same_email)) {
+ if (!$domain || !empty($user_same_email)) {
+ return true;
+ }
- $mmlist = new MMList(S::v('uid'), S::v('password'), $domain);
- $listes = $mmlist->get_lists($user['email2']);
+ $mmlist = new MMList(S::v('uid'), S::v('password'), $domain);
+ $listes = $mmlist->get_lists($user['email2']);
- foreach ($listes as $liste) {
- if ($liste['sub'] == 2) {
+ $may_update = may_update();
+ $warning = false;
+ foreach ($listes as $liste) {
+ if ($liste['sub'] == 2) {
+ if ($may_update) {
$mmlist->mass_unsubscribe($liste['list'], Array($user['email2']));
- $page->trig("{$user['prenom']} {$user['nom']} a été"
- ." désinscrit de {$liste['list']}");
- } elseif ($liste['sub']) {
- $page->trig("{$user['prenom']} {$user['nom']} a une"
- ." demande d'inscription en cours sur la"
- ." liste {$liste['list']}@ !");
+ } else {
+ $mmlist->unsubscribe($liste['list']);
}
+ } elseif ($liste['sub']) {
+ $page->trig("{$user['prenom']} {$user['nom']} a une"
+ ." demande d'inscription en cours sur la"
+ ." liste {$liste['list']}@ !");
+ $warning = true;
}
+ }
- XDB::execute(
- "DELETE FROM virtual_redirect
- USING virtual_redirect
- INNER JOIN virtual USING(vid)
- WHERE redirect={?} AND alias LIKE {?}", $user['email'], '%@'.$domain);
- if (mysql_affected_rows()) {
- $page->trig("{$user['prenom']} {$user['nom']} a été désabonné des alias du groupe !");
- }
+ XDB::execute(
+ "DELETE FROM virtual_redirect
+ USING virtual_redirect
+ INNER JOIN virtual USING(vid)
+ WHERE redirect={?} AND alias LIKE {?}", $user['email'], '%@'.$domain);
+ return !$warning;
+ }
+
+ function handler_unsubscribe(&$page)
+ {
+ new_group_page('xnet/groupe/membres-del.tpl');
+ $user = get_infos(S::v('forlife'));
+ if (empty($user)) {
+ return PL_NOT_FOUND;
+ }
+ $page->assign('self', true);
+ $page->assign('user', $user);
+
+ if (!Post::has('confirm')) {
+ return;
+ }
+
+ if ($this->unsubscribe($user)) {
+ $page->trig('Vous avez été désinscrit du groupe avec succès');
+ } else {
+ $page->trig('Vous avez été désinscrit du groupe, mais des erreurs se sont produites lors des désinscriptions des alias et des mailing-lists.');
+ }
+ $page->assign('is_member', is_member(true));
+ }
+
+ function handler_admin_member_del(&$page, $user = null)
+ {
+ new_groupadmin_page('xnet/groupe/membres-del.tpl');
+ $user = get_infos($user);
+ if (empty($user)) {
+ return PL_NOT_FOUND;
}
+ $page->assign('user', $user);
- $page->trig("{$user['prenom']} {$user['nom']} a été retiré du groupe !");
+ if (!Post::has('confirm')) {
+ return;
+ }
+
+ if ($this->unsubscribe($user)) {
+ $page->trig("{$user['prenom']} {$user['nom']} a été désabonné du groupe !");
+ } else {
+ $page->trig("{$user['prenom']} {$user['nom']} a été désabonné du groupe, mais des erreurs subsistent !");
+ }
}
function handler_admin_member(&$page, $user)
$email_changed = ($user['origine'] != 'X' && strtolower($user['email']) != strtolower(Post::v('email')));
$from_email = $user['email'];
if ($user['origine'] != 'X') {
+ $user['nom'] = Post::v('nom');
+ $user['prenom'] = (Post::v('origine') == 'ext') ? Post::v('prenom') : '';
+ $user['sexe'] = (Post::v('origine') == 'ext') ? Post::v('sexe') : 0;
+ $user['origine'] = Post::v('origine');
XDB::query('UPDATE groupex.membres
- SET prenom={?}, nom={?}, email={?}, sexe={?}
+ SET prenom={?}, nom={?}, email={?}, sexe={?}, origine={?}
WHERE uid={?} AND asso_id={?}',
- Post::v('prenom'), Post::v('nom'),
- Post::v('email'), Post::v('sexe'),
- $user['uid'], $globals->asso('id'));
- $user['nom'] = Post::v('nom');
- $user['prenom'] = Post::v('prenom');
- $user['sexe'] = Post::v('sexe');
- $user['email'] = Post::v('email');
- $user['email2'] = Post::v('email');
+ $user['prenom'], $user['nom'], Post::v('email'),
+ $user['sexe'], $user['origine'], $user['uid'],
+ $globals->asso('id'));
+ $user['email'] = Post::v('email');
+ $user['email2'] = Post::v('email');
}
$perms = Post::i('is_admin');
foreach (Env::v('ml1', array()) as $ml => $state) {
$ask = empty($_REQUEST['ml2'][$ml]) ? 0 : 2;
if ($ask == $state) {
- if ($state) {
+ if ($state && $email_changed) {
$mmlist->replace_email($ml, $from_email, $user['email2']);
$page->trig("L'abonnement de {$user['prenom']} {$user['nom']} à $ml@ a été mis à jour");
}
}
if (!$art['public'] &&
- ($art['promo_min'] > $art['promo_max'] ||
+ (($art['promo_min'] > $art['promo_max'] && $art['promo_max'] != 0) ||
($art['promo_min'] != 0 && ($art['promo_min'] <= 1900 || $art['promo_min'] >= 2020)) ||
($art['promo_max'] != 0 && ($art['promo_max'] <= 1900 || $art['promo_max'] >= 2020))))
{
projects / platal.git / blobdiff