X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=065d1a59a5fe244772b4b01e9c08e0fc05fe122d;hb=5486a0d34e21ce8e16e3539748a629603ace40de;hp=00bc231b833b662f08ebcf5a0deddf5b2c5b02a3;hpb=91a14f73f85c6a062976f722361b282c47e05a4c;p=platal.git diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 00bc231..065d1a5 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -1,6 +1,6 @@ $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), @@ -110,7 +113,7 @@ class XnetGrpModule extends PLModule return PL_NOT_FOUND; } - new_group_open_page('xnet/groupe/asso.tpl'); + new_group_open_page('xnetgrp/asso.tpl'); if (S::logged()) { if (Env::has('read')) { @@ -205,7 +208,7 @@ class XnetGrpModule extends PLModule { global $globals; - new_groupadmin_page('xnet/groupe/edit.tpl'); + new_groupadmin_page('xnetgrp/edit.tpl'); if (Post::has('submit')) { if (S::has_perms()) { @@ -218,7 +221,7 @@ class XnetGrpModule extends PLModule 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'), @@ -227,7 +230,7 @@ class XnetGrpModule extends PLModule 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')); @@ -236,13 +239,15 @@ class XnetGrpModule extends PLModule 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']) { @@ -268,7 +273,7 @@ class XnetGrpModule extends PLModule { global $globals; - new_groupadmin_page('xnet/groupe/mail.tpl'); + new_groupadmin_page('xnetgrp/mail.tpl'); $mmlist = new MMList(S::v('uid'), S::v('password'), $globals->asso('mail_domain')); $page->assign('listes', $mmlist->get_lists()); @@ -292,7 +297,7 @@ class XnetGrpModule extends PLModule function handler_annuaire(&$page) { global $globals; - new_annu_page('xnet/groupe/annuaire.tpl'); + new_annu_page('xnetgrp/annuaire.tpl'); $sort = Env::v('order'); switch (Env::v('order')) { @@ -378,12 +383,14 @@ class XnetGrpModule extends PLModule m.perms='admin' AS admin, m.origine='X' AS x, u.perms!='pending' AS inscrit, - m.uid + m.uid, e.email AS actif 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' ) + LEFT JOIN emails AS e ON ( e.flags = 'active' AND e.uid = m.uid) WHERE m.asso_id = {?} $ini AND (m.origine != 'X' OR u.perms != 'pending' OR m.email IS NOT NULL) + GROUP BY m.uid ORDER BY $tri LIMIT {?},{?}", $globals->asso('id'), $ofs*NB_PER_PAGE, NB_PER_PAGE); $page->assign('ann', $ann); @@ -392,7 +399,7 @@ class XnetGrpModule extends PLModule function handler_trombi(&$page, $num = 1) { global $globals; - new_annu_page('xnet/groupe/trombi.tpl'); + new_annu_page('xnetgrp/trombi.tpl'); $page->assign('urlmainsite', "https://www.polytechnique.org/"); $trombi = new Trombi(array($this, '_trombi_getlist')); @@ -438,7 +445,7 @@ class XnetGrpModule extends PLModule $vcard = new VCard($res->fetchColumn(), $photos == 'photos', 'Membre du groupe ' . $globals->asso('nom')); $vcard->do_page($page); } else { - return PL_NOTALLOWED; + return PL_FORBIDDEN; } } @@ -446,7 +453,7 @@ class XnetGrpModule extends PLModule { global $globals; - new_group_open_page('xnet/groupe/inscrire.tpl'); + new_group_open_page('xnetgrp/inscrire.tpl'); if (!$globals->asso('inscriptible')) $page->kill("Il n'est pas possible de s'inscire en ligne à ce " @@ -564,13 +571,40 @@ class XnetGrpModule extends PLModule } } + 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; require_once 'xnet/mail.inc.php'; - new_groupadmin_page('xnet/groupe/annuaire-admin.tpl'); + new_groupadmin_page('xnetgrp/annuaire-admin.tpl'); $mmlist = new MMList(S::v('uid'), S::v('password'), $globals->asso('mail_domain')); $lists = $mmlist->get_lists(); @@ -615,7 +649,7 @@ class XnetGrpModule extends PLModule { global $globals; - new_groupadmin_page('xnet/groupe/membres-add.tpl'); + new_groupadmin_page('xnetgrp/membres-add.tpl'); $page->addJsLink('ajax.js'); if (is_null($email)) { @@ -684,7 +718,7 @@ class XnetGrpModule extends PLModule function handler_admin_member_new_ajax(&$page) { header('Content-Type: text/html; charset="iso-8859-15"'); - $page->changeTpl('xnet/groupe/membres-new-search.tpl', NO_SKIN); + $page->changeTpl('xnetgrp/membres-new-search.tpl', NO_SKIN); list($nom, $prenom) = str_replace(array('-', ' ', "'"), '%', array(Env::v('nom'), Env::v('prenom'))); $where = "perms = 'pending'"; if (!empty($nom)) { @@ -706,63 +740,95 @@ class XnetGrpModule extends PLModule } } - 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('xnetgrp/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; } - $page->trig("{$user['prenom']} {$user['nom']} a été retiré du groupe !"); + 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('xnetgrp/membres-del.tpl'); + $user = get_infos($user); + if (empty($user)) { + return PL_NOT_FOUND; + } + $page->assign('user', $user); + + 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) { global $globals; - new_groupadmin_page('xnet/groupe/membres-edit.tpl'); + new_groupadmin_page('xnetgrp/membres-edit.tpl'); $user = get_infos($user); if (empty($user)) { @@ -863,7 +929,7 @@ class XnetGrpModule extends PLModule global $globals; require_once('rss.inc.php'); require_once('url_catcher.inc.php'); - $uid = init_rss('xnet/groupe/announce-rss.tpl', $user, $hash, false); + $uid = init_rss('xnetgrp/announce-rss.tpl', $user, $hash, false); $page->register_modifier('url_catcher', 'url_catcher'); if ($uid) { @@ -890,7 +956,7 @@ class XnetGrpModule extends PLModule function handler_edit_announce(&$page, $aid = null) { global $globals, $platal; - new_groupadmin_page('xnet/groupe/announce-edit.tpl'); + new_groupadmin_page('xnetgrp/announce-edit.tpl'); $page->assign('new', is_null($aid)); $art = array(); @@ -919,13 +985,18 @@ class XnetGrpModule extends PLModule } 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)))) { $page->trig("L'intervalle de promotions est invalide"); Post::kill('valid'); } + + if (!trim($art['titre']) || !trim($art['texte'])) { + $page->trig("L'article doit avoir un titre et un contenu"); + Post::kill('valid'); + } } if (Post::v('valid') == 'Enregistrer') { @@ -1019,7 +1090,7 @@ class XnetGrpModule extends PLModule function handler_admin_announce(&$page) { global $globals; - new_groupadmin_page('xnet/groupe/announce-admin.tpl'); + new_groupadmin_page('xnetgrp/announce-admin.tpl'); if (Env::has('del')) { XDB::execute("DELETE FROM groupex.announces