X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=08478fe8a8d81e69bf309feade78198a3a52dca1;hb=555fde868f2cce5d99b0b11a88eecf8eef4e8123;hp=7afb82e9f71d930028ec93ef77caad5f1af387b2;hpb=d24c8a1195dce2641e62477fc4618786d931ebce;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 7afb82e..08478fe 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -1,6 +1,6 @@ $this->make_hook('sub', AUTH_MDP), '%grp/events/csv' => $this->make_hook('csv', AUTH_MDP), '%grp/events/ical' => $this->make_hook('ical', AUTH_MDP), - '%grp/events/edit' => $this->make_hook('edit', AUTH_MDP), - '%grp/events/admin' => $this->make_hook('admin', AUTH_MDP), + '%grp/events/edit' => $this->make_hook('edit', AUTH_MDP, 'groupadmin'), + '%grp/events/admin' => $this->make_hook('admin', AUTH_MDP, 'groupmember'), ); } @@ -39,15 +39,10 @@ class XnetEventsModule extends PLModule { global $globals; - if ($archive == 'archive') { - $archive = true; - new_groupadmin_page('xnetevents/index.tpl'); - } else { - $archive = false; - new_group_open_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'); @@ -140,7 +135,7 @@ class XnetEventsModule extends PLModule while ($e = $evenements->next()) { $e['show_participants'] = ($e['show_participants'] && (is_member() || may_update())); $res = XDB::query( - "SELECT titre, details, montant, ei.item_id, nb + "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 = {?}) @@ -149,6 +144,7 @@ class XnetEventsModule extends PLModule $e['moments'] = $res->fetchAllAssoc(); $e['topay'] = 0; + $e['paid'] = $e['moments'][0]['paid']; foreach ($e['moments'] as $m) { $e['topay'] += $m['nb'] * $m['montant']; } @@ -176,8 +172,7 @@ class XnetEventsModule extends PLModule function handler_sub(&$page, $eid = null) { require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'; - - new_group_open_page('xnetevents/subscribe.tpl'); + $page->changeTpl('xnetevents/subscribe.tpl'); $evt = get_event_detail($eid); if (!$evt) { @@ -185,10 +180,10 @@ 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'); + $page->kill('Cet événement est fermé aux non-membres du groupe'); } $page->assign('event', $evt); @@ -209,7 +204,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]; @@ -217,11 +212,11 @@ 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; } @@ -229,12 +224,13 @@ class XnetEventsModule extends PLModule // update actual inscriptions $updated = false; $total = 0; + $paid = $evt['paid'] ? $evt['paid'] : 0; foreach ($subs as $j => $nb) { if ($nb >= 0) { XDB::execute( "REPLACE INTO groupex.evenements_participants VALUES ({?}, {?}, {?}, {?}, {?})", - $eid, S::v('uid'), $j, $nb, $evt['paid']); + $eid, S::v('uid'), $j, $nb, $paid); $updated = $eid; } else { XDB::execute( @@ -264,7 +260,7 @@ class XnetEventsModule extends PLModule return PL_NOT_FOUND; } - header('Content-type: text/x-csv; encoding=iso-8859-1'); + header('Content-type: text/x-csv; encoding=UTF-8'); header('Pragma: '); header('Cache-Control: '); @@ -343,16 +339,19 @@ class XnetEventsModule extends PLModule } } - new_groupadmin_page('xnetevents/edit.tpl'); + $page->changeTpl('xnetevents/edit.tpl'); - $moments = range(1, 4); + $moments = range(1, 4); + $error = false; $page->assign('moments', $moments); 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; + } $evt = array( 'eid' => $eid, 'asso_id' => $globals->asso('id'), @@ -420,7 +419,6 @@ class XnetEventsModule extends PLModule WHERE eid = {?} AND item_id = {?}", $eid, $i); } } - // request for a new payment if (Post::v('paiement_id') == -1 && $money_defaut >= 0) { require_once 'validations.inc.php'; @@ -429,16 +427,24 @@ class XnetEventsModule extends PLModule 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) { XDB::execute("INSERT INTO groupex.evenements_items - VALUES ({?}, {?}, '', '', 0)", $eid, 1); + VALUES ({?}, {?}, '', '', 0)", $eid, 1); } - pl_redirect('events'); + if (!$error) { + pl_redirect('events'); + } } // get a list of all the payment for this asso @@ -466,7 +472,7 @@ class XnetEventsModule extends PLModule 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); @@ -497,10 +503,9 @@ 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::v('adm')) { @@ -531,12 +536,9 @@ class XnetEventsModule extends PLModule foreach ($nbs as $id => $nb) { $nb = max(intval($nb), 0); - - if ($nb) { - XDB::execute("REPLACE INTO groupex.evenements_participants - VALUES ({?}, {?}, {?}, {?}, {?})", - $evt['eid'], $member['uid'], $id, $nb, $paid); - } + XDB::execute("REPLACE INTO groupex.evenements_participants + VALUES ({?}, {?}, {?}, {?}, {?})", + $evt['eid'], $member['uid'], $id, $nb, $paid); } $res = XDB::query("SELECT COUNT(uid) AS cnt, SUM(nb) AS nb @@ -589,7 +591,7 @@ class XnetEventsModule extends PLModule $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; @@ -615,10 +617,26 @@ class XnetEventsModule extends PLModule $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 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 nb = 0 + GROUP BY p.uid + ORDER BY nom, prenom, promo", $evt['eid']); + + $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: ?>