X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents%2Fxnetevents.inc.php;h=fe20a8eaba49433492f7b8c07d400b9c10a0d6bd;hb=f7a93ff33f4c2f41702950e9258faa09894afcd1;hp=acdfa561f3bf91cd13bc73956e9386b4672f35ed;hpb=673e56aa757fce4ea57c27ab2c0d5ce87d713e51;p=platal.git diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index acdfa56..fe20a8e 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -59,6 +59,9 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) $evt['nb_tot'] = array_sum($res->fetchColumn()); $evt['titre'] = ''; $evt['item_id'] = 0; + $evt['csv_name'] = urlencode($evt['intitule']); + } else { + $evt['csv_name'] = urlencode($evt['intitule'] . '.' . $evt['titre']); } $evt['moments'] = XDB::fetchAllAssoc('SELECT titre, details, montant, ei.item_id, nb, @@ -76,7 +79,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) if ($m['montant']) { $evt['money'] = true; } - $evt['paid'] = $m['paid']; + $evt['paid'] += $m['paid']; $evt['notify_payment'] = $evt['notify_payment'] || $m['notify_payment']; } @@ -322,7 +325,6 @@ function make_event_date(&$e) $end = strtotime($e['fin']); $first_day = @strtotime($e['first_day']); $last_day = strtotime($e['last_day']); - unset($e['debut'], $e['fin'], $e['first_day'], $e['last_day']); $date = ""; if ($start && $end != $start) {