X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=56dacd45f29224d6f48740f45e05df88a7a4e524;hb=2ac0bcee0c4da41699b4c396ea82c0abc256e4df;hp=0bbd4dbfec7c2508519139bef68ff52a523e6e18;hpb=1f3362a3a540afd8afa49ce5a58855c574ae49c6;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 0bbd4db..56dacd4 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -1,6 +1,6 @@ $this->make_hook('events', AUTH_MDP), - 'grp/events/sub' => $this->make_hook('sub', AUTH_MDP), - 'grp/events/csv' => $this->make_hook('csv', AUTH_MDP), - 'grp/events/edit' => $this->make_hook('edit', AUTH_MDP), - 'grp/events/admin' => $this->make_hook('admin', AUTH_MDP), + '%grp/events' => $this->make_hook('events', AUTH_MDP), + '%grp/events/sub' => $this->make_hook('sub', AUTH_MDP), + '%grp/events/csv' => $this->make_hook('csv', AUTH_MDP, 'user', NO_HTTPS), + '%grp/events/ical' => $this->make_hook('ical', AUTH_MDP, 'user', NO_HTTPS), + '%grp/events/edit' => $this->make_hook('edit', AUTH_MDP, 'groupadmin'), + '%grp/events/admin' => $this->make_hook('admin', AUTH_MDP, 'groupmember'), ); } - function handler_events(&$page) + function handler_events(&$page, $archive = null) { global $globals; - new_group_page('xnetevents/index.tpl'); + $page->changeTpl('xnetevents/index.tpl'); + $action = null; + $archive = ($archive == 'archive' && may_update()); if (Post::has('del')) { + $action = 'del'; + $eid = Post::v('del'); + } elseif (Post::has('archive')) { + $action = 'archive'; + $eid = Post::v('archive'); + } elseif (Post::has('unarchive')) { + $action = 'unarchive'; + $eid = Post::v('unarchive'); + } + + if (!is_null($action)) { if (!may_update()) { - return PL_NOT_ALLOWED; + return PL_FORBIDDEN; } - $eid = Post::get('del'); - - $res = $globals->xdb->query("SELECT asso_id, short_name FROM groupex.evenements - WHERE eid = {?} AND asso_id = {?}", - $eid, $globals->asso('id')); + $res = XDB::query("SELECT asso_id, short_name FROM groupex.evenements + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); $tmp = $res->fetchOneRow(); if (!$tmp) { - return PL_NOT_ALLOWED; + return PL_FORBIDDEN; } + } + if ($action == 'del') { // deletes the event mailing aliases if ($tmp[1]) { - $globals->xdb->execute( - "DELETE FROM virtual WHERE type = 'evt' AND alias = {?}", - $tmp[1].'-absents'); - $globals->xdb->execute( - "DELETE FROM virtual WHERE type = 'evt' AND alias = {?}", - $tmp[1].'-participants'); + XDB::execute( + "DELETE FROM virtual WHERE type = 'evt' AND alias LIKE {?}", + $tmp[1].'-absents@%'); + XDB::execute( + "DELETE FROM virtual WHERE type = 'evt' AND alias LIKE {?}", + $tmp[1].'-participants@%'); } // deletes the event items - $globals->xdb->execute("DELETE FROM groupex.evenements_items WHERE eid = {?}", $eid); + XDB::execute("DELETE FROM groupex.evenements_items WHERE eid = {?}", $eid); // deletes the event participants - $globals->xdb->execute("DELETE FROM groupex.evenements_participants + XDB::execute("DELETE FROM groupex.evenements_participants WHERE eid = {?}", $eid); // deletes the event - $globals->xdb->execute("DELETE FROM groupex.evenements + XDB::execute("DELETE FROM groupex.evenements WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); // delete the requests for payments require_once 'validations.inc.php'; - $globals->xdb->execute("DELETE FROM requests + XDB::execute("DELETE FROM requests WHERE type = 'paiements' AND data LIKE {?}", PayReq::same_event($eid, $globals->asso('id'))); } - $page->assign('admin', may_update()); + if ($action == 'archive') { + XDB::execute("UPDATE groupex.evenements + SET archive = 1 + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); + } + + if ($action == 'unarchive') { + XDB::execute("UPDATE groupex.evenements + SET archive = 0 + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); + } - $evenements = $globals->xdb->iterator( + $page->assign('archive', $archive); + $evenements = XDB::iterator( "SELECT e.*, LEFT(10, e.debut) AS debut_day, LEFT(10, e.fin) AS fin_day, IF(e.deadline_inscription, e.deadline_inscription >= LEFT(NOW(), 10), 1) AS inscr_open, e.deadline_inscription, u.nom, u.prenom, u.promo, a.alias, - MAX(ep.nb) AS inscrit, MAX(ep.paid) AS paid + MAX(ep.nb) IS NOT NULL AS inscrit, MAX(ep.paid) AS paid FROM groupex.evenements AS e INNER JOIN x4dat.auth_user_md5 AS u ON u.user_id = e.organisateur_uid INNER JOIN x4dat.aliases AS a ON (a.type = 'a_vie' AND a.id = u.user_id) LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) WHERE asso_id = {?} - GROUP BY e.eid - ORDER BY debut", Session::get('uid'), $globals->asso('id')); + AND archive = " . ($archive ? "1 " : "0 ") + . (is_member() || may_update() ? "" : " AND accept_nonmembre != 0 ") + . "GROUP BY e.eid + ORDER BY inscr_open DESC, debut DESC", S::v('uid'), $globals->asso('id')); $evts = array(); while ($e = $evenements->next()) { - $res = $globals->xdb->query( - "SELECT titre, details, montant, ei.item_id, nb + $e['show_participants'] = ($e['show_participants'] && (is_member() || may_update())); + $res = XDB::query( + "SELECT titre, details, montant, ei.item_id, nb, ep.paid FROM groupex.evenements_items AS ei LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = ei.eid AND ep.item_id = ei.item_id AND uid = {?}) WHERE ei.eid = {?}", - Session::get('uid'), $e['eid']); + S::v('uid'), $e['eid']); $e['moments'] = $res->fetchAllAssoc(); $e['topay'] = 0; + $e['paid'] = $e['moments'][0]['paid']; foreach ($e['moments'] as $m) { $e['topay'] += $m['nb'] * $m['montant']; } - $query = $globals->xdb->query( + $query = XDB::query( "SELECT montant FROM {$globals->money->mpay_tprefix}transactions AS t - WHERE ref = {?} AND uid = {?}", $e['paiement_id'], Session::get('uid')); + WHERE ref = {?} AND uid = {?}", $e['paiement_id'], S::v('uid')); $montants = $query->fetchColumn(); foreach ($montants as $m) { @@ -129,20 +160,19 @@ class XnetEventsModule extends PLModule $e['paid'] += trim($p); } + if (Env::has('updated') && $e['eid'] == Env::i('updated')) { + $page->assign('updated', $e); + } $evts[] = $e; } $page->assign('evenements', $evts); - $page->assign('is_member', is_member()); } function handler_sub(&$page, $eid = null) { - global $globals; - require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'; - - new_group_page('xnetevents/subscribe.tpl'); + $page->changeTpl('xnetevents/subscribe.tpl'); $evt = get_event_detail($eid); if (!$evt) { @@ -150,17 +180,25 @@ class XnetEventsModule extends PLModule } if (!$evt['inscr_open']) { - $page->kill('Les inscriptions pour cet événement sont closes'); + $page->kill('Les inscriptions pour cet événement sont closes'); + } + if (!$evt['accept_nonmembre'] && !is_member() && !may_update()) { + $page->kill('Cet événement est fermé aux non-membres du groupe'); } + global $globals; + $res = XDB::query("SELECT stamp FROM requests + WHERE type = 'paiements' AND data LIKE {?}", + PayReq::same_event($evt['eid'], $globals->asso('id'))); + $page->assign('validation', $res->numRows()); $page->assign('event', $evt); if (!Post::has('submit')) { return; } - $moments = Post::getMixed('moment', array()); - $pers = Post::getMixed('personnes', array()); + $moments = Post::v('moment', array()); + $pers = Post::v('personnes', array()); $subs = array(); foreach ($moments as $j => $v) { @@ -171,7 +209,7 @@ class XnetEventsModule extends PLModule if (!isset($pers[$j]) || !is_numeric($pers[$j]) || $pers[$j] < 0) { - $page->trig('Tu dois choisir un nombre d\'invités correct !'); + $page->trig('Tu dois choisir un nombre d\'invités correct !'); return; } $subs[$j] = 1 + $pers[$j]; @@ -179,30 +217,38 @@ class XnetEventsModule extends PLModule } // impossible to unsubscribe if you already paid sthing - if (array_sum($subs) && $evt['paid'] != 0) { - $page->trig("Impossible de te désinscrire complètement ". + if (!array_sum($subs) && $evt['paid'] != 0) { + $page->trig("Impossible de te désinscrire complètement ". "parce que tu as fait un paiement par ". - "chèque ou par liquide. Contacte un ". - "administrateur du groupe si tu es sûr de ". + "chèque ou par liquide. Contacte un ". + "administrateur du groupe si tu es sûr de ". "ne pas venir"); return; } // update actual inscriptions + $updated = false; + $total = 0; + $paid = $evt['paid'] ? $evt['paid'] : 0; foreach ($subs as $j => $nb) { - if ($nb > 0) { - $globals->xdb->execute( + if ($nb >= 0) { + XDB::execute( "REPLACE INTO groupex.evenements_participants - VALUES ({?}, {?}, {?}, {?}, {?})", - $eid, Session::getInt('uid'), $j, $nb, $evt['paid']); + VALUES ({?}, {?}, {?}, {?}, {?}, {?})", + $eid, S::v('uid'), $j, $nb, Env::has('notify_payment') ? 'notify_payment' : '', $paid); + $updated = $eid; } else { - $globals->xdb->execute( + XDB::execute( "DELETE FROM groupex.evenements_participants WHERE eid = {?} AND uid = {?} AND item_id = {?}", - $eid, Session::getInt("uid"), $j); + $eid, S::v("uid"), $j); + $updated = $eid; } + $total += $nb; + } + if ($updated !== false) { + subscribe_lists_event($total, S::i('uid'), $evt); } - $page->assign('event', get_event_detail($eid)); } @@ -219,15 +265,15 @@ class XnetEventsModule extends PLModule return PL_NOT_FOUND; } - header('Content-type: text/x-csv'); + header('Content-type: text/x-csv; encoding=UTF-8'); header('Pragma: '); header('Cache-Control: '); - new_nonhtml_page('xnet/groupe/evt-csv.tpl'); + $page->changeTpl('xnetevents/csv.tpl', NO_SKIN); $admin = may_update(); - $tri = (Env::get('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo'); + $tri = (Env::v('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo'); $page->assign('participants', get_event_participants($evt, $item_id, $tri)); @@ -235,195 +281,181 @@ class XnetEventsModule extends PLModule $page->assign('admin', $admin); $page->assign('moments', $evt['moments']); $page->assign('money', $evt['money']); - $page->assign('tout', !Env::get('item_id', false)); + $page->assign('tout', !Env::v('item_id', false)); } - function handler_edit(&$page, $eid = null) + function handler_ical(&$page, $eid = null) { global $globals; - new_groupadmin_page('xnet/groupe/evt-modif.tpl'); + require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'; + $evt = get_event_detail($eid); + if (!$evt) { + return PL_FORBIDDEN; + } + $evt['debut'] = preg_replace('/(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)/', "\\1\\2\\3T\\4\\5\\6", $evt['debut']); + $evt['fin'] = preg_replace('/(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)/', "\\1\\2\\3T\\4\\5\\6", $evt['fin']); - $page->assign('logged', logged()); - $page->assign('admin', may_update()); + foreach ($evt['moments'] as $m) { + $evt['descriptif'] .= "\n\n** " . $m['titre'] . " **\n" . $m['details']; + } - $moments = range(1, 4); - $page->assign('moments', $moments); + $page->changeTpl('xnetevents/calendar.tpl', NO_SKIN); - if (!is_null($eid)) { - $res = $globals->xdb->query("SELECT short_name, asso_id - FROM groupex.evenements - WHERE eid = {?}", $eid); - $infos = $res->fetchOneAssoc(); - if ($infos['asso_id'] != $globals->asso('id')) { - return PL_NOT_ALLOWED; - } + require_once('ical.inc.php'); + $page->assign('asso', $globals->asso()); + $page->assign('timestamp', time()); + $page->assign('admin', may_update()); + + if (may_update()) { + $page->assign('participants', get_event_participants($evt, null, 'promo, nom, prenom')); } + $page->register_function('display_ical', 'display_ical'); + $page->assign_by_ref('e', $evt); - $get_form = true; + header('Content-Type: text/calendar; charset=utf-8'); + } - if (Post::get('intitule')) { - $get_form = false; - $short_name = Env::get('short_name'); + function handler_edit(&$page, $eid = null) + { + global $globals; - // Quelques vérifications sur l'alias (caractères spéciaux) - if ($short_name && !preg_match( "/^[a-zA-Z0-9\-.]{3,20}$/", $short_name)) { - $page->trig("Le raccourci demandé n'est pas valide. - Vérifie qu'il comporte entre 3 et 20 caractères - et qu'il ne contient que des lettres non accentuées, - des chiffres ou les caractères - et ."); - $short_name = $infos['short_name']; - $get_form = true; + // get eid if the the given one is a short name + if (!is_null($eid) && !is_numeric($eid)) { + $res = XDB::query("SELECT eid + FROM groupex.evenements + WHERE asso_id = {?} AND short_name = {?}", + $globals->asso('id'), $eid); + if ($res->numRows()) { + $eid = (int)$res->fetchOneCell(); } + } - //vérifier que l'alias n'est pas déja pris - if ($short_name && $short_name != $infos['short_name']) { - $res = $globals->xdb->query('SELECT COUNT(*) FROM virtual WHERE alias LIKE {?}', $short_name."-%"); - if ($res->fetchOneCell() > 0) { - $page->trig("Le raccourci demandé est déjà utilisé. Choisis en un autre."); - $short_name = $infos['short_name']; - $get_form = true; - } + // check the event is in our group + if (!is_null($eid)) { + $res = XDB::query("SELECT short_name + FROM groupex.evenements + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); + if ($res->numRows()) { + $infos = $res->fetchOneAssoc(); + } else { + return PL_FORBIDDEN; } + } + + $page->changeTpl('xnetevents/edit.tpl'); + + $moments = range(1, 4); + $error = false; + $page->assign('moments', $moments); - // if had a previous shortname change the old lists - if ($short_name && $infos['short_name'] && $short_name != $infos['short_name']) { - $globals->xdb->execute("UPDATE virtual - SET alias = REPLACE(alias, {?}, {?}) - WHERE type = 'evt' AND alias LIKE {?}", - $infos['short_name'], $short_name, - $infos['short_name']."-%"); + if (Post::v('intitule')) { + require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'; + $short_name = event_change_shortname($page, $infos['short_name'], + Env::v('short_name', '')); + if ($short_name != Env::v('short_name')) { + $error = true; } - elseif ($short_name && !$infos['short_name']) { - // if we have a first new short_name create the lists - // - $globals->xdb->execute("INSERT INTO virtual SET type = 'evt', alias = {?}", - $short_name."-participants@".$globals->xnet->evts_domain); - - $res = $globals->xdb->query("SELECT LAST_INSERT_ID()"); - $globals->xdb->execute("INSERT INTO virtual_redirect ( - SELECT {?} AS vid, IF(u.nom IS NULL, m.email, CONCAT(a.alias, {?})) AS redirect - FROM groupex.evenements_participants AS ep - LEFT JOIN groupex.membres AS m ON (ep.uid = m.uid) - LEFT JOIN auth_user_md5 AS u ON (u.user_id = ep.uid) - LEFT JOIN aliases AS a ON (a.id = ep.uid AND a.type = 'a_vie') - WHERE ep.eid = {?} - GROUP BY ep.uid)", - $res->fetchOneCell(), "@".$globals->mail->domain, $eid); - - $globals->xdb->execute("INSERT INTO virtual SET type = 'evt', alias = {?}", - $short_name."-absents@".$globals->xnet->evts_domain); - - $res = $globals->xdb->query("SELECT LAST_INSERT_ID()"); - $globals->xdb->execute("INSERT INTO virtual_redirect ( - SELECT {?} AS vid, IF(u.nom IS NULL, m.email, CONCAT(a.alias, {?})) AS redirect - FROM groupex.membres AS m - LEFT JOIN groupex.evenements_participants AS ep ON (ep.uid = m.uid) - 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 = {?} AND ep.uid IS NULL - GROUP BY m.uid)", - $res->fetchOneCell(), "@".$globals->mail->domain, $globals->asso('id')); + $evt = array( + 'eid' => $eid, + 'asso_id' => $globals->asso('id'), + 'paiement_id' => Post::v('paiement_id') > 0 ? Post::v('paiement_id') : null, + 'debut' => Post::v('deb_Year').'-'.Post::v('deb_Month') + .'-'.Post::v('deb_Day').' '.Post::v('deb_Hour') + .':'.Post::v('deb_Minute').':00', + 'fin' => Post::v('fin_Year').'-'.Post::v('fin_Month') + .'-'.Post::v('fin_Day').' '.Post::v('fin_Hour') + .':'.Post::v('fin_Minute').':00', + 'short_name' => $short_name, + ); + + $trivial = array('intitule', 'descriptif', 'noinvite', + 'show_participants', 'accept_nonmembre', 'organisateur_uid'); + foreach ($trivial as $k) { + $evt[$k] = Post::v($k); } - elseif (!$short_name && $infos['short_name']) { - // if we delete the old short name, delete the lists - $globals->xdb->execute("DELETE virtual, virtual_redirect FROM virtual - LEFT JOIN virtual_redirect USING(vid) - WHERE virtual.alias LIKE {?}", - $infos['short_name']."-%"); + if (!$eid) { + $evt['organisateur_uid'] = S::v('uid'); } - $evt = array(); - $evt['eid'] = $eid; - $evt['asso_id'] = $globals->asso('id'); - $evt['organisateur_uid'] = Session::get('uid'); - $evt['intitule'] = Post::get('intitule'); - $evt['paiement_id'] = (Post::get('paiement_id')>0) ? Post::get('paiement_id') : null; - $evt['descriptif'] = Post::get('descriptif'); - $evt['debut'] = Post::get('deb_Year')."-".Post::get('deb_Month') - . "-".Post::get('deb_Day')." ".Post::get('deb_Hour') - . ":".Post::get('deb_Minute').":00"; - $evt['fin'] = Post::get('fin_Year')."-".Post::get('fin_Month') - . "-".Post::get('fin_Day')." ".Post::get('fin_Hour') - . ":".Post::get('fin_Minute').":00"; - $evt['membres_only'] = Post::get('membres_only'); - $evt['advertise'] = Post::get('advertise'); - $evt['show_participants'] = Post::get('show_participants'); - $evt['noinvite'] = Post::get('noinvite'); - if (!$short_name) { - $short_name = ''; + if (Post::v('deadline')) { + $evt['deadline_inscription'] = Post::v('inscr_Year').'-' + . Post::v('inscr_Month').'-' + . Post::v('inscr_Day'); + } else { + $evt['deadline_inscription'] = null; } - $evt['short_name'] = $short_name; - $evt['deadline_inscription'] = Post::get('deadline', 'off') == 'on' ? null - : (Post::get('inscr_Year')."-".Post::get('inscr_Month') - ."-".Post::get('inscr_Day')); // Store the modifications in the database - $globals->xdb->execute("REPLACE INTO groupex.evenements + XDB::execute('REPLACE INTO groupex.evenements SET eid={?}, asso_id={?}, organisateur_uid={?}, intitule={?}, - paiement_id = {?}, descriptif = {?}, - debut = {?}, fin = {?}, - membres_only = {?}, advertise = {?}, show_participants = {?}, - short_name = {?}, deadline_inscription = {?}, noinvite = {?}", - $evt['eid'], $evt['asso_id'], $evt['organisateur_uid'], $evt['intitule'] - , $evt['paiement_id'], $evt['descriptif'], - $evt['debut'], $evt['fin'], - $evt['membres_only'], $evt['advertise'], $evt['show_participants'], - $evt['short_name'], $evt['deadline_inscription'], $evt['noinvite']); + paiement_id = {?}, descriptif = {?}, debut = {?}, + fin = {?}, show_participants = {?}, short_name = {?}, + deadline_inscription = {?}, noinvite = {?}, + accept_nonmembre = {?}', + $evt['eid'], $evt['asso_id'], $evt['organisateur_uid'], + $evt['intitule'], $evt['paiement_id'], $evt['descriptif'], + $evt['debut'], $evt['fin'], $evt['show_participants'], + $evt['short_name'], $evt['deadline_inscription'], + $evt['noinvite'], $evt['accept_nonmembre']); // if new event, get its id if (!$eid) { - $res = $globals->xdb->query("SELECT LAST_INSERT_ID()"); - $eid = $res->fetchOneCell(); - $evt['eid'] = $eid; + $eid = XDB::insertId(); } - $nb_moments = 0; + $nb_moments = 0; $money_defaut = 0; foreach ($moments as $i) { - if (Post::get('titre'.$i)) { + if (Post::v('titre'.$i)) { $nb_moments++; - if (!($money_defaut > 0)) - $money_defaut = strtr(Post::get('montant'.$i), ',', '.'); - $globals->xdb->execute(" + + $montant = strtr(Post::v('montant'.$i), ',', '.'); + $money_defaut += (float)$montant; + XDB::execute(" REPLACE INTO groupex.evenements_items VALUES ({?}, {?}, {?}, {?}, {?})", - $eid, $i, Post::get('titre'.$i), - Post::get('details'.$i), - strtr(Post::get('montant'.$i), ',', '.')); + $eid, $i, Post::v('titre'.$i), + Post::v('details'.$i), $montant); } else { - $globals->xdb->execute("DELETE FROM groupex.evenements_items + XDB::execute("DELETE FROM groupex.evenements_items WHERE eid = {?} AND item_id = {?}", $eid, $i); } } - // request for a new payment - if (Post::get('paiement_id') == -1 && $money_defaut >= 0) { + if (Post::v('paiement_id') == -1 && $money_defaut >= 0) { require_once 'validations.inc.php'; - $p = new PayReq(Session::get('uid'), - Post::get('intitule')." - ".$globals->asso('nom'), - Post::get('site'), $money_defaut, - Post::get('confirmation'), 0, 999, + $p = new PayReq(S::v('uid'), + Post::v('intitule')." - ".$globals->asso('nom'), + Post::v('site'), $money_defaut, + Post::v('confirmation'), 0, 999, $globals->asso('id'), $eid); - $p->submit(); + if ($p->accept()) { + $p->submit(); + } else { + $page->assign('paiement_message', Post::v('confirmation')); + $page->assign('paiement_site', Post::v('site')); + $error = true; + } } // events with no sub-event: add a sub-event with no name if ($nb_moments == 0) { - $globals->xdb->execute("INSERT INTO groupex.evenements_items - VALUES ({?}, {?}, '', '', 0)", $eid, 1); + XDB::execute("INSERT INTO groupex.evenements_items + VALUES ({?}, {?}, '', '', 0)", $eid, 1); } - } - if (!$get_form) { - redirect("evenements.php"); + if (!$error) { + pl_redirect('events'); + } } // get a list of all the payment for this asso - $res = $globals->xdb->iterator("SELECT id, text - FROM {$globals->money->mpay_tprefix}paiements - WHERE asso_id = {?}", $globals->asso('id')); + $res = XDB::iterator("SELECT id, text + FROM {$globals->money->mpay_tprefix}paiements + WHERE asso_id = {?}", $globals->asso('id')); $paiements = array(); while ($a = $res->next()) $paiements[$a['id']] = $a['text']; { $page->assign('paiements', $paiements); @@ -431,27 +463,26 @@ class XnetEventsModule extends PLModule // when modifying an old event retreive the old datas if ($eid) { - $res = $globals->xdb->query( - "SELECT eid, intitule, descriptif, debut, fin, - membres_only, advertise, show_participants, - paiement_id, short_name, deadline_inscription, - noinvite + $res = XDB::query( + "SELECT eid, intitule, descriptif, debut, fin, organisateur_uid, + show_participants, paiement_id, short_name, + deadline_inscription, noinvite, accept_nonmembre FROM groupex.evenements WHERE eid = {?}", $eid); $evt = $res->fetchOneAssoc(); // find out if there is already a request for a payment for this event require_once 'validations.inc.php'; - $res = $globals->xdb->query("SELECT stamp FROM requests - WHERE type = 'paiements' AND data LIKE {?}", - PayReq::same_event($eid, $globals->asso('id'))); + $res = XDB::query("SELECT stamp FROM requests + WHERE type = 'paiements' AND data LIKE {?}", + PayReq::same_event($eid, $globals->asso('id'))); $stamp = $res->fetchOneCell(); if ($stamp) { - $evt['paiement_id'] = -2; + $evt['paiement_id'] = -2; $evt['paiement_req'] = $stamp; } $page->assign('evt', $evt); // get all the different moments infos - $res = $globals->xdb->iterator( + $res = XDB::iterator( "SELECT item_id, titre, details, montant FROM groupex.evenements_items AS ei INNER JOIN groupex.evenements AS e ON(e.eid = ei.eid) @@ -463,6 +494,7 @@ class XnetEventsModule extends PLModule } $page->assign('items', $items); } + $page->assign('url_ref', $eid); } function handler_admin(&$page, $eid = null, $item_id = null) @@ -476,67 +508,57 @@ class XnetEventsModule extends PLModule return PL_NOT_FOUND; } - if ($evt['show_participants']) { - new_group_page('xnetevents/admin.tpl'); - } else { - new_groupadmin_page('xnetevents/admin.tpl'); + $page->changeTpl('xnetevents/admin.tpl'); + if (!$evt['show_participants'] && !may_update()) { + return PL_FORBIDDEN; } - if (may_update() && Post::get('adm')) { - $member = get_infos(Post::get('mail')); + if (may_update() && Post::v('adm')) { + $member = get_infos(Post::v('mail')); if (!$member) { $page->trig("Membre introuvable"); } // change the price paid by a participant - if (Env::get('adm') == 'prix' && $member) { - $globals->xdb->execute("UPDATE groupex.evenements_participants - SET paid = IF(paid + {?} > 0, paid + {?}, 0) - WHERE uid = {?} AND eid = {?}", - strtr(Env::get('montant'), ',', '.'), - strtr(Env::get('montant'), ',', '.'), - $member['uid'], $eid); + if (Env::v('adm') == 'prix' && $member) { + XDB::execute("UPDATE groupex.evenements_participants + SET paid = IF(paid + {?} > 0, paid + {?}, 0) + WHERE uid = {?} AND eid = {?}", + strtr(Env::v('montant'), ',', '.'), + strtr(Env::v('montant'), ',', '.'), + $member['uid'], $evt['eid']); } // change the number of personns coming with a participant - if (Env::get('adm') == 'nbs' && $member) { - $res = $globals->xdb->query("SELECT paid - FROM groupex.evenements_participants - WHERE uid = {?} AND eid = {?}", - $member['uid'], $eid); + if (Env::v('adm') == 'nbs' && $member) { + $res = XDB::query("SELECT paid + FROM groupex.evenements_participants + WHERE uid = {?} AND eid = {?}", + $member['uid'], $evt['eid']); $paid = intval($res->fetchOneCell()); - $nbs = Post::getMixed('nb', array()); + $nbs = Post::v('nb', array()); foreach ($nbs as $id => $nb) { - $nb = intval($nb); - - if ($nb < 0) { - $nb = 0; - } - - if ($nb) { - $globals->xdb->execute("REPLACE INTO groupex.evenements_participants - VALUES ({?}, {?}, {?}, {?}, {?})", - $eid, $member['uid'], $id, $nb, $paid); - } else { - $globals->xdb->execute("DELETE FROM groupex.evenements_participants - WHERE uid = {?} AND eid = {?} AND item_id = {?}", - $member['uid'], $eid, $id); - } + $nb = max(intval($nb), 0); + XDB::execute("REPLACE INTO groupex.evenements_participants + VALUES ({?}, {?}, {?}, {?}, {?}, {?})", + $evt['eid'], $member['uid'], $id, $nb, '', $paid); } - $res = $globals->xdb->query("SELECT uid FROM groupex.evenements_participants - WHERE uid = {?} AND eid = {?}", - $member['uid'], $eid); - $u = $res->fetchOneCell(); + $res = XDB::query("SELECT COUNT(uid) AS cnt, SUM(nb) AS nb + FROM groupex.evenements_participants + WHERE uid = {?} AND eid = {?} + GROUP BY uid", + $member['uid'], $evt['eid']); + $u = $res->fetchOneAssoc(); + $u = $u['cnt'] ? null : $u['nb']; subscribe_lists_event($u, $member['uid'], $evt); } $evt = get_event_detail($eid, $item_id); } - $page->assign('admin', may_update()); $page->assign('evt', $evt); $page->assign('tout', is_null($item_id)); @@ -544,9 +566,9 @@ class XnetEventsModule extends PLModule $page->assign('moments', $evt['moments']); } - $tri = (Env::get('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo'); + $tri = (Env::v('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo'); $whereitemid = is_null($item_id) ? '' : "AND ep.item_id = $item_id"; - $res = $globals->xdb->iterRow( + $res = XDB::iterRow( 'SELECT UPPER(SUBSTRING(IF(u.nom IS NULL, m.nom, IF(u.nom_usage<>"", u.nom_usage, u.nom)), 1, 1)), COUNT(DISTINCT ep.uid) @@ -554,27 +576,60 @@ class XnetEventsModule extends PLModule INNER JOIN groupex.evenements AS e ON (ep.eid = e.eid) LEFT JOIN groupex.membres AS m ON ( ep.uid = m.uid AND e.asso_id = m.asso_id) LEFT JOIN auth_user_md5 AS u ON ( u.user_id = ep.uid ) - WHERE ep.eid = {?} '.$whereitemid.' - GROUP BY UPPER(SUBSTRING(IF(u.nom IS NULL,m.nom,u.nom), 1, 1))', $eid); + WHERE ep.eid = {?} '.$whereitemid . ' + GROUP BY UPPER(SUBSTRING(IF(u.nom IS NULL,m.nom,u.nom), 1, 1))', $evt['eid']); $alphabet = array(); $nb_tot = 0; while (list($char, $nb) = $res->next()) { $alphabet[ord($char)] = $char; $nb_tot += $nb; - if (Env::has('initiale') && $char == strtoupper(Env::get('initiale'))) { + if (Env::has('initiale') && $char == strtoupper(Env::v('initiale'))) { $tot = $nb; } } ksort($alphabet); $page->assign('alphabet', $alphabet); - $ofs = Env::getInt('offset'); - $tot = Env::get('initiale') ? $tot : $nb_tot; + if ($evt['paiement_id']) { + $res = XDB::iterator( + "SELECT IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom, u.prenom, + u.promo, a.alias AS email, t.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 (a.id = t.uid AND a.type='a_vie' ) + LEFT JOIN groupex.evenements_participants AS ep ON(ep.uid = t.uid AND ep.eid = {?}) + WHERE t.ref = {?} AND ep.uid IS NULL", + $evt['eid'], $evt['paiement_id']); + $page->assign('oublis', $res->total()); + $page->assign('oubliinscription', $res); + } + + $absents = XDB::iterator("SELECT p.uid, + IF(m.origine = 'X', IF(u.nom_usage != '', u.nom_usage, u.nom), m.nom) AS nom, + IF(m.origine = 'X', u.prenom, u.prenom) AS prenom, + IF(m.origine = 'X', u.promo, m.origine) AS promo, + IF(m.origine = 'X', FIND_IN_SET('femme', u.flags), m.sexe) AS sexe, + IF(m.origine = 'X', a.alias, m.email) AS email + FROM groupex.evenements_participants AS p + INNER JOIN groupex.membres AS m USING(uid) + LEFT JOIN groupex.evenements_participants AS p2 ON (p2.uid = m.uid AND p2.eid = p.eid + AND p2.nb != 0) + LEFT JOIN auth_user_md5 AS u ON (u.user_id = m.uid) + LEFT JOIN aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie') + WHERE p.eid = {?} AND p2.eid IS NULL + " . (Env::v('initiale') ? " AND IF(u.nom IS NULL, m.nom, + IF(u.nom_usage<>'', u.nom_usage, u.nom)) LIKE '" . Env::v('initiale') . "%'" + : "") . " + GROUP BY m.uid + ORDER BY nom, prenom, promo", $evt['eid']); + + $ofs = Env::i('offset'); + $tot = (Env::v('initiale') ? $tot : $nb_tot) - $absents->total(); $nbp = intval(($tot-1)/NB_PER_PAGE); $links = array(); if ($ofs) { - $links['précédent'] = $ofs-1; + $links['précédent'] = $ofs-1; } for ($i = 0; $i <= $nbp; $i++) { $links[(string)($i+1)] = $i; @@ -586,24 +641,13 @@ class XnetEventsModule extends PLModule $page->assign('links', $links); } - if ($evt['paiement_id']) { - $res = $globals->xdb->iterator( - "SELECT IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom, u.prenom, - u.promo, a.alias AS email, t.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 (a.id = t.uid AND a.type='a_vie' ) - LEFT JOIN groupex.evenements_participants AS ep ON(ep.uid = t.uid AND ep.eid = {?}) - WHERE t.ref = {?} AND ep.uid IS NULL", - $evt['eid'], $evt['paiement_id']); - $page->assign('oublis', $res->total()); - $page->assign('oubliinscription', $res); - } - $page->assign('participants', + $page->assign('absents', $absents); + $page->assign('participants', get_event_participants($evt, $item_id, $tri, "LIMIT ".($ofs*NB_PER_PAGE).", ".NB_PER_PAGE)); } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>