X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=53c61865d433f85b334c1d8ec7fc8923cf4acc07;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=4aa57ee92f66cb2321f11464cbfe2a329cff82df;hpb=dc2073c35a769a0fe026897d2f597c99ef92e5d3;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 4aa57ee..53c6186 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -61,7 +61,7 @@ class XnetEventsModule extends PLModule if (!is_null($action)) { if (!may_update()) { - return PL_NOT_ALLOWED; + return PL_FORBIDDEN; } $res = XDB::query("SELECT asso_id, short_name FROM groupex.evenements @@ -70,7 +70,7 @@ class XnetEventsModule extends PLModule $tmp = $res->fetchOneRow(); if (!$tmp) { - return PL_NOT_ALLOWED; + return PL_FORBIDDEN; } } @@ -117,16 +117,14 @@ class XnetEventsModule extends PLModule WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); } - + $page->assign('archive', $archive); - $page->assign('admin', may_update()); - $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) @@ -142,7 +140,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 = {?}) @@ -151,6 +149,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']; } @@ -166,11 +165,13 @@ 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) @@ -217,7 +218,7 @@ class XnetEventsModule extends PLModule } // impossible to unsubscribe if you already paid sthing - if (array_sum($subs) && $evt['paid'] != 0) { + 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 ". @@ -227,22 +228,27 @@ class XnetEventsModule extends PLModule } // update actual inscriptions + $updated = false; + $total = 0; foreach ($subs as $j => $nb) { - if ($nb > 0) { + if ($nb >= 0) { XDB::execute( "REPLACE INTO groupex.evenements_participants VALUES ({?}, {?}, {?}, {?}, {?})", $eid, S::v('uid'), $j, $nb, $evt['paid']); - $page->assign('updated', true); + $updated = $eid; } else { XDB::execute( "DELETE FROM groupex.evenements_participants WHERE eid = {?} AND uid = {?} AND item_id = {?}", $eid, S::v("uid"), $j); - $page->assign('updated', true); + $updated = $eid; } + $total += $nb; + } + if ($updated !== false) { + subscribe_lists_event($total, S::i('uid'), $evt); } - $page->assign('event', get_event_detail($eid)); } @@ -285,7 +291,7 @@ class XnetEventsModule extends PLModule require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'; $evt = get_event_detail($eid); if (!$evt) { - return PL_NOT_FOUND; + 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']); @@ -327,12 +333,14 @@ class XnetEventsModule extends PLModule // check the event is in our group if (!is_null($eid)) { - $res = XDB::query("SELECT short_name, asso_id + $res = XDB::query("SELECT short_name FROM groupex.evenements - WHERE eid = {?}", $eid); - $infos = $res->fetchOneAssoc(); - if ($infos['asso_id'] != $globals->asso('id')) { - return PL_NOT_ALLOWED; + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); + if ($res->numRows()) { + $infos = $res->fetchOneAssoc(); + } else { + return PL_FORBIDDEN; } } @@ -391,7 +399,7 @@ class XnetEventsModule extends PLModule // if new event, get its id if (!$eid) { - $eid = mysql_insert_id(); + $eid = XDB::insertId(); } $nb_moments = 0; @@ -528,26 +536,23 @@ class XnetEventsModule extends PLModule if ($nb) { XDB::execute("REPLACE INTO groupex.evenements_participants VALUES ({?}, {?}, {?}, {?}, {?})", - $evt['eid'], $member['uid'], $id, $nb, $paid); - } else { - XDB::execute("DELETE FROM groupex.evenements_participants - WHERE uid = {?} AND eid = {?} AND item_id = {?}", - $member['uid'], $evt['eid'], $id); + $evt['eid'], $member['uid'], $id, $nb, $paid); } } - $res = XDB::query("SELECT uid + $res = XDB::query("SELECT COUNT(uid) AS cnt, SUM(nb) AS nb FROM groupex.evenements_participants - WHERE uid = {?} AND eid = {?}", + WHERE uid = {?} AND eid = {?} + GROUP BY uid", $member['uid'], $evt['eid']); - $u = $res->fetchOneCell(); + $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));