X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=5dbe9bb63598901ab37be57213fcfe2fc0495767;hb=300325787a5d47336b64110034e582ae611341e0;hp=c5e2dc1a7efaad6393fc2e85b52346c797feb0d7;hpb=2a557a092265981fcb53edfd38ed0dde353d9c24;p=platal.git diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index c5e2dc1..5dbe9bb 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -34,12 +34,19 @@ function get_infos($email) } $res = XDB::query( - "SELECT uid, nom, prenom, email, email AS email2, perms='admin', origine + "SELECT uid, nom, prenom, email, email AS email2, perms='admin', origine, sexe FROM groupex.membres WHERE $field = {?} AND asso_id = {?}", $email, $globals->asso('id')); if ($res->numRows()) { - return $res->fetchOneAssoc(); + $user = $res->fetchOneAssoc(); + if ($user['origine'] == 'X') { + $res = XDB::query("SELECT nom, prenom, promo, FIND_IN_SET(flags, 'femme') AS sexe + FROM auth_user_md5 + WHERE user_id = {?}", $user['uid']); + $user = array_merge($user, $res->fetchOneAssoc()); + } + return $user; } elseif ($dom == 'polytechnique.org' || $dom == 'm4x.org') { $res = XDB::query( "SELECT user_id AS uid, u.promo, @@ -47,7 +54,8 @@ function get_infos($email) u.prenom, b.alias, CONCAT(b.alias, '@m4x.org') AS email, CONCAT(b.alias, '@polytechnique.org') AS email2, - m.perms='admin' AS perms, m.origine + m.perms='admin' AS perms, m.origine, + FIND_IN_SET(u.flags, 'femme') AS sexe FROM auth_user_md5 AS u INNER JOIN aliases AS a ON ( u.user_id = a.id AND a.type != 'homonyme' ) INNER JOIN aliases AS b ON ( u.user_id = b.id AND b.type = 'a_vie' ) @@ -72,8 +80,9 @@ class XnetGrpModule extends PLModule '%grp/mail' => $this->make_hook('mail', AUTH_MDP), '%grp/annuaire' => $this->make_hook('annuaire', AUTH_MDP), '%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/paiement' => $this->make_hook('paiement', AUTH_MDP), + '%grp/unsubscribe' => $this->make_hook('unsubscribe', AUTH_MDP), '%grp/admin/annuaire' => $this->make_hook('admin_annuaire', AUTH_MDP), @@ -82,6 +91,8 @@ class XnetGrpModule extends PLModule => $this->make_hook('admin_member', AUTH_MDP), '%grp/member/new' => $this->make_hook('admin_member_new', AUTH_MDP), + '%grp/member/new/ajax' + => $this->make_hook('admin_member_new_ajax', AUTH_MDP, '', NO_AUTH), '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_MDP), @@ -100,11 +111,7 @@ class XnetGrpModule extends PLModule return PL_NOT_FOUND; } - $page->changeTpl('xnet/groupe/asso.tpl'); - $page->setType($globals->asso('cat')); - $page->assign('is_admin', may_update()); - $page->assign('is_member', is_member()); - $page->assign('logged', S::logged()); + new_group_open_page('xnet/groupe/asso.tpl'); if (S::logged()) { if (Env::has('read')) { @@ -212,7 +219,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'), @@ -221,7 +228,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')); @@ -230,13 +237,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']) { @@ -273,10 +282,11 @@ class XnetGrpModule extends PLModule $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); } @@ -285,16 +295,7 @@ class XnetGrpModule extends PLModule function handler_annuaire(&$page) { global $globals; - - define('NB_PER_PAGE', 25); - - if ($globals->asso('pub') == 'public') { - new_group_page('xnet/groupe/annuaire.tpl'); - } else { - new_groupadmin_page('xnet/groupe/annuaire.tpl'); - } - - $page->assign('admin', may_update()); + new_annu_page('xnet/groupe/annuaire.tpl'); $sort = Env::v('order'); switch (Env::v('order')) { @@ -305,26 +306,27 @@ class XnetGrpModule extends PLModule } $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), + IF(m.origine="X", IF(u.nom_usage<>"", u.nom_usage, u.nom),m.nom), 1, 1)) as letter, COUNT(*) FROM groupex.membres AS m LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid ) 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()) { @@ -336,6 +338,7 @@ class XnetGrpModule extends PLModule } $page->assign('group', $group); $page->assign('request_group', Env::v($group)); + $page->assign('only_admin', Env::has('admin')); $page->assign('alphabet', $alphabet); $page->assign('nb_tot', $nb_tot); @@ -362,31 +365,70 @@ class XnetGrpModule extends PLModule 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',a.alias,m.email) AS email, + 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, m.perms='admin' AS admin, m.origine='X' AS x, + u.perms!='pending' AS inscrit, m.uid 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 = {?} $ini - AND (m.origine = 'ext' OR u.perms != 'pending') + 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); } + function handler_trombi(&$page, $num = 1) + { + global $globals; + new_annu_page('xnet/groupe/trombi.tpl'); + + $page->assign('urlmainsite', "https://www.polytechnique.org/"); + $trombi = new Trombi(array($this, '_trombi_getlist')); + $trombi->hidePromo(); + $trombi->setAdmin(); + $page->assign_by_ref('trombi', $trombi); + } + + function _trombi_getlist($offset, $limit) + { + global $globals; + $where = "WHERE m.asso_id= '".addslashes($globals->asso('id'))."'"; + + $res = XDB::query( + "SELECT COUNT(*) + FROM auth_user_md5 AS u + RIGHT JOIN photo AS p ON u.user_id=p.uid + INNER JOIN groupex.membres AS m ON (m.uid = u.user_id) + $where"); + $pnb = $res->fetchOneCell(); + + $res = XDB::query("SELECT promo, user_id, a.alias AS forlife, + IF (nom_usage='', u.nom, nom_usage) AS nom, u.prenom + FROM photo AS p + INNER JOIN auth_user_md5 AS u ON u.user_id=p.uid + INNER JOIN aliases AS a ON ( u.user_id=a.id AND a.type='a_vie' ) + INNER JOIN groupex.membres AS m ON (m.uid = u.user_id) + $where + ORDER BY promo, u.nom, u.prenom LIMIT {?}, {?}", $offset*$limit, $limit); + + return array($pnb, $res->fetchAllAssoc()); + } + function handler_vcard(&$page, $photos = null) { global $globals; @@ -407,11 +449,7 @@ class XnetGrpModule extends PLModule { global $globals; - $page->changeTpl('xnet/groupe/inscrire.tpl'); - - $page->setType($globals->asso('cat')); - $page->assign('asso', $globals->asso()); - $page->assign('admin', may_update()); + new_group_open_page('xnet/groupe/inscrire.tpl'); if (!$globals->asso('inscriptible')) $page->kill("Il n'est pas possible de s'inscire en ligne à ce " @@ -443,8 +481,7 @@ class XnetGrpModule extends PLModule 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>'); @@ -462,8 +499,7 @@ class XnetGrpModule extends PLModule } 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>'); @@ -521,8 +557,7 @@ class XnetGrpModule extends PLModule ." 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>'); @@ -532,74 +567,6 @@ class XnetGrpModule extends PLModule } } - function handler_paiement(&$page) - { - global $globals; - - new_group_page('xnet/groupe/telepaiement.tpl'); - - $res = XDB::query( - "SELECT id, text - FROM {$globals->money->mpay_tprefix}paiements - WHERE asso_id = {?} AND NOT FIND_IN_SET(flags, 'old') - ORDER BY id DESC", $globals->asso('id')); - $tit = $res->fetchAllAssoc(); - $page->assign('titres', $tit); - - $order = Env::v('order', 'timestamp'); - $orders = array('timestamp', 'nom', 'promo', 'montant'); - if (!in_array($order, $orders)) { - $order = 'timestamp'; - } - $inv_order = Env::v('order_inv', 0); - $page->assign('order', $order); - $page->assign('order_inv', !$inv_order); - - if ($order == 'timestamp') { - $inv_order = !$inv_order; - } - - if ($inv_order) { - $inv_order = ' DESC'; - } else { - $inv_order = ''; - } - if ($order == 'montant') { - $order = 'LENGTH(montant) '.$inv_order.', montant'; - } - - $orderby = 'ORDER BY '.$order.$inv_order; - if ($order != 'nom') { - $orderby .= ', nom'; $inv_order = ''; - } - $orderby .= ', prenom'.$inv_order; - if ($order != 'timestamp') { - $orderby .= ', timestamp DESC'; - } - - if (may_update()) { - $trans = array(); - foreach($tit as $foo) { - $pid = $foo['id']; - $res = XDB::query( - "SELECT IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom, - u.prenom, u.promo, a.alias, timestamp AS `date`, montant - FROM {$globals->money->mpay_tprefix}transactions AS t - INNER JOIN auth_user_md5 AS u ON ( t.uid = u.user_id ) - INNER JOIN aliases AS a ON ( t.uid = a.id AND a.type='a_vie' ) - WHERE ref = {?} ".$orderby, $pid); - $trans[$pid] = $res->fetchAllAssoc(); - $sum = 0; - foreach ($trans[$pid] as $i => $t) { - $sum += strtr(substr($t['montant'], 0, strpos($t['montant'], 'EUR')), ',', '.'); - } - $trans[$pid][] = array('nom' => 'somme totale', - 'montant' => strtr($sum, '.', ',').' EUR'); - } - $page->assign('trans', $trans); - } - } - function handler_admin_annuaire(&$page) { global $globals; @@ -652,6 +619,7 @@ class XnetGrpModule extends PLModule global $globals; new_groupadmin_page('xnet/groupe/membres-add.tpl'); + $page->addJsLink('ajax.js'); if (is_null($email)) { return; @@ -677,68 +645,152 @@ class XnetGrpModule extends PLModule } } else { if (isvalid_email($email)) { - $res = XDB::query('SELECT MAX(uid)+1 FROM groupex.membres'); - $uid = max(intval($res->fetchOneCell()), 50001); - XDB::execute('INSERT INTO groupex.membres (uid,asso_id,origine,email) - VALUES({?},{?},"ext",{?})', $uid, - $globals->asso('id'), $email); - pl_redirect("member/$email"); + if (Env::v('x') && Env::has('userid') && Env::i('userid')) { + $uid = Env::i('userid'); + $res = XDB::query("SELECT * + FROM auth_user_md5 + WHERE user_id = {?} AND perms = 'pending'", $uid); + if ($res->numRows() == 1) { + XDB::execute('INSERT INTO groupex.membres (uid, asso_id, origine, email) + VALUES ({?}, {?}, "X", {?})', + $uid, $globals->asso('id'), $email); + if (Env::v('market')) { + $res = XDB::query('SELECT COUNT(*) + FROM register_marketing + WHERE uid={?} AND email={?}', $uid, $email); + if (!$res->fetchOneCell()) { + XDB::execute("INSERT INTO register_marketing (uid,sender,email,date,last,nb,type,hash) + VALUES ({?}, {?}, {?}, NOW(), 0, 0, {?}, '')", + $uid, S::v('uid'), $email, Env::v('market_from')); + require_once('validations.inc.php'); + $req = new MarkReq(S::v('uid'), $uid, $email, Env::v('market_from') == 'user'); + $req->submit(); + } + } + pl_redirect("member/$email"); + } + $page->trig("Utilisateur invalide"); + } else { + $res = XDB::query('SELECT MAX(uid)+1 FROM groupex.membres'); + $uid = max(intval($res->fetchOneCell()), 50001); + XDB::execute('INSERT INTO groupex.membres (uid,asso_id,origine,email) + VALUES({?},{?},"ext",{?})', $uid, + $globals->asso('id'), $email); + pl_redirect("member/$email"); + } } else { $page->trig("« $email » n'est pas une adresse mail valide"); } } } - function handler_admin_member_del(&$page, $user = null) + function handler_admin_member_new_ajax(&$page) { - global $globals; - - new_groupadmin_page('xnet/groupe/membres-del.tpl'); - $user = get_infos($user); - if (empty($user)) { - return PL_NOT_FOUND; + header('Content-Type: text/html; charset="iso-8859-15"'); + $page->changeTpl('xnet/groupe/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)) { + $where .= " AND nom LIKE '%$nom%'"; } - $page->assign('user', $user); - - if (!Post::has('confirm')) { + if (!empty($prenom)) { + $where .= " AND prenom LIKE '%$prenom%'"; + } + if (preg_match('/^[0-9]{4}$/', Env::v('promo'))) { + $where .= " AND promo = " . Env::i('promo'); + } elseif (Env::has('promo')) { return; } + $res = XDB::iterator("SELECT user_id, nom, prenom, promo + FROM auth_user_md5 + WHERE $where"); + if ($res->total() < 30) { + $page->assign("choix", $res); + } + } + function unsubscribe(&$user) + { + 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); - $page->trig("{$user['prenom']} {$user['nom']} a été retiré du groupe !"); + 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', false); + } + + 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); + + 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) @@ -756,20 +808,21 @@ class XnetGrpModule extends PLModule $globals->asso('mail_domain')); if (Post::has('change')) { - $email_changed = ($user['origine'] != 'X' && $user['email'] != Post::v('email')); + $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'); @@ -785,7 +838,7 @@ class XnetGrpModule extends PLModule 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"); } @@ -813,15 +866,15 @@ class XnetGrpModule extends PLModule if($state == $ask) continue; if($ask) { XDB::query("INSERT INTO virtual_redirect (vid,redirect) - SELECT vid,{?} FROM virtual WHERE alias={?}", - $user['email'], $ml); + SELECT vid,{?} FROM virtual WHERE alias={?}", + $user['email'], $ml); $page->trig("{$user['prenom']} {$user['nom']} a été abonné à $ml"); } else { XDB::query("DELETE FROM virtual_redirect - USING virtual_redirect - INNER JOIN virtual USING(vid) - WHERE redirect={?} AND alias={?}", - $user['email'], $ml); + USING virtual_redirect + INNER JOIN virtual USING(vid) + WHERE redirect={?} AND alias={?}", + $user['email'], $ml); $page->trig("{$user['prenom']} {$user['nom']} a été désabonné de $ml"); } } @@ -855,13 +908,15 @@ class XnetGrpModule extends PLModule INNER JOIN groupex.announces AS a ON ( (a.promo_min = 0 OR a.promo_min <= u.promo) AND (a.promo_max = 0 OR a.promo_max <= u.promo)) INNER JOIN auth_user_md5 AS u2 ON (u2.user_id = a.user_id) - WHERE u.user_id = {?} AND peremption >= NOW()", $uid); + WHERE u.user_id = {?} AND peremption >= NOW() AND a.asso_id = {?}", + $uid, $globals->asso('id')); } else { $rss = XDB::iterator("SELECT a.id, a.titre, a.texte, a.create_date, IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, u.prenom, u.promo FROM groupex.announces AS a INNER JOIN auth_user_md5 AS u USING(user_id) - WHERE FIND_IN_SET(a.flags, 'public') AND peremption >= NOW()"); + WHERE FIND_IN_SET(a.flags, 'public') AND peremption >= NOW() AND a.asso_id = {?}", + $globals->asso('id')); } $page->assign('asso', $globals->asso()); $page->assign('rss', $rss); @@ -894,8 +949,8 @@ class XnetGrpModule extends PLModule $art['event'] = Post::v('event'); $art['contact_html'] = $art['contacts']; - if (@$art['event']) { - $art['contact_html'] .= "\n{$globals->baseurl}/{$platal->ns}events/sub/{$art['event']}"; + if ($art['event']) { + $art['contact_html'] .= "\n{$globals->baseurl}/{$platal->ns}events/sub/{$art['event']}"; } if (!$art['public'] && @@ -918,12 +973,12 @@ class XnetGrpModule extends PLModule VALUES ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?})", S::i('uid'), $globals->asso('id'), $art['titre'], $art['texte'], $art['contact_html'], $art['peremption'], $promo_min, $promo_max, $art['public'] ? 'public' : ''); - $aid = mysql_insert_id(); + $aid = XDB::insertId(); if ($art['xorg']) { require_once('validations.inc.php'); require_once('url_catcher.inc.php'); $article = new EvtReq("[{$globals->asso('nom')}] " . $art['titre'], - url_catcher($art['texte'] . (!empty($art['contacts']) ? "\n\nContacts :\n" . $art['contacts'] : "")), + url_catcher($art['texte'] . (!empty($art['contact_html']) ? "\n\nContacts :\n" . $art['contact_html'] : "")), $art['promo_min'], $art['promo_max'], $art['peremption'], "", S::v('uid')); $article->submit(); $page->trig("L'affichage sur la page d'accueil de Polytechnique.org est en attente de validation");