projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes address search.
[platal.git]
/
modules
/
xnetevents
/
xnetevents.inc.php
diff --git
a/modules/xnetevents/xnetevents.inc.php
b/modules/xnetevents/xnetevents.inc.php
index
acdfa56
..
fd92d22
100644
(file)
--- a/
modules/xnetevents/xnetevents.inc.php
+++ b/
modules/xnetevents/xnetevents.inc.php
@@
-31,7
+31,7
@@
function get_event_detail($eid, $item_id = false, $asso_id = null)
IF(e.deadline_inscription,
e.deadline_inscription >= LEFT(NOW(), 10),
1) AS inscr_open,
IF(e.deadline_inscription,
e.deadline_inscription >= LEFT(NOW(), 10),
1) AS inscr_open,
- LEFT(
10, e.debut) AS start_day, LEFT(10, e.fin
) AS last_day,
+ LEFT(
e.debut, 10) AS first_day, LEFT(e.fin, 10
) AS last_day,
LEFT(NOW(), 10) AS now,
ei.titre, e.subscription_notification
FROM group_events AS e
LEFT(NOW(), 10) AS now,
ei.titre, e.subscription_notification
FROM group_events AS e
@@
-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['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,
}
$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;
}
if ($m['montant']) {
$evt['money'] = true;
}
- $evt['paid']
= $m['paid'];
+ $evt['paid']
+
= $m['paid'];
$evt['notify_payment'] = $evt['notify_payment'] || $m['notify_payment'];
}
$evt['notify_payment'] = $evt['notify_payment'] || $m['notify_payment'];
}
@@
-320,9
+323,8
@@
function make_event_date(&$e)
{
$start = strtotime($e['debut']);
$end = strtotime($e['fin']);
{
$start = strtotime($e['debut']);
$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']);
+ $first_day = $e['first_day'];
+ $last_day = $e['last_day'];
$date = "";
if ($start && $end != $start) {
$date = "";
if ($start && $end != $start) {