projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds a check on Google Apps accounts in checkdb.php.
[platal.git]
/
modules
/
xnetevents.php
diff --git
a/modules/xnetevents.php
b/modules/xnetevents.php
index
e7e939e
..
3910dbc
100644
(file)
--- a/
modules/xnetevents.php
+++ b/
modules/xnetevents.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
7
Polytechnique.org *
+ * Copyright (C) 2003-200
8
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-97,6
+97,7
@@
class XnetEventsModule extends PLModule
XDB::execute("DELETE FROM requests
WHERE type = 'paiements' AND data LIKE {?}",
PayReq::same_event($eid, $globals->asso('id')));
XDB::execute("DELETE FROM requests
WHERE type = 'paiements' AND data LIKE {?}",
PayReq::same_event($eid, $globals->asso('id')));
+ update_NbValid();
}
if ($action == 'archive') {
}
if ($action == 'archive') {
@@
-186,6
+187,11
@@
class XnetEventsModule extends PLModule
$page->kill('Cet événement est fermé aux non-membres du groupe');
}
$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')) {
$page->assign('event', $evt);
if (!Post::has('submit')) {
@@
-225,18
+231,20
@@
class XnetEventsModule extends PLModule
$updated = false;
$total = 0;
$paid = $evt['paid'] ? $evt['paid'] : 0;
$updated = false;
$total = 0;
$paid = $evt['paid'] ? $evt['paid'] : 0;
+ $telepaid= $evt['telepaid'] ? $evt['telepaid'] : 0;
foreach ($subs as $j => $nb) {
if ($nb >= 0) {
XDB::execute(
"REPLACE INTO groupex.evenements_participants
foreach ($subs as $j => $nb) {
if ($nb >= 0) {
XDB::execute(
"REPLACE INTO groupex.evenements_participants
- VALUES ({?}, {?}, {?}, {?}, {?})",
- $eid, S::v('uid'), $j, $nb, $paid);
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?})",
+ $eid, S::v('uid'), $j, $nb, Env::has('notify_payment') ? 'notify_payment' : '',
+ $j == 1 ? $paid - $telepaid : 0);
$updated = $eid;
} else {
XDB::execute(
"DELETE FROM groupex.evenements_participants
WHERE eid = {?} AND uid = {?} AND item_id = {?}",
$updated = $eid;
} else {
XDB::execute(
"DELETE FROM groupex.evenements_participants
WHERE eid = {?} AND uid = {?} AND item_id = {?}",
- $eid, S::v("uid"), $j);
+ $eid, S::v("uid"), $j);
$updated = $eid;
}
$total += $nb;
$updated = $eid;
}
$total += $nb;
@@
-276,6
+284,7
@@
class XnetEventsModule extends PLModule
$page->assign('admin', $admin);
$page->assign('moments', $evt['moments']);
$page->assign('money', $evt['money']);
$page->assign('admin', $admin);
$page->assign('moments', $evt['moments']);
$page->assign('money', $evt['money']);
+ $page->assign('telepayment', $evt['paiement_id']);
$page->assign('tout', !Env::v('item_id', false));
}
$page->assign('tout', !Env::v('item_id', false));
}
@@
-347,7
+356,8
@@
class XnetEventsModule extends PLModule
if (Post::v('intitule')) {
require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php';
if (Post::v('intitule')) {
require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php';
- $short_name = event_change_shortname($page, $infos['short_name'],
+ $short_name = event_change_shortname($page, $eid,
+ $infos['short_name'],
Env::v('short_name', ''));
if ($short_name != Env::v('short_name')) {
$error = true;
Env::v('short_name', ''));
if ($short_name != Env::v('short_name')) {
$error = true;
@@
-518,7
+528,7
@@
class XnetEventsModule extends PLModule
if (Env::v('adm') == 'prix' && $member) {
XDB::execute("UPDATE groupex.evenements_participants
SET paid = IF(paid + {?} > 0, paid + {?}, 0)
if (Env::v('adm') == 'prix' && $member) {
XDB::execute("UPDATE groupex.evenements_participants
SET paid = IF(paid + {?} > 0, paid + {?}, 0)
- WHERE uid = {?} AND eid = {?}",
+ WHERE uid = {?} AND eid = {?}
AND item_id = 1
",
strtr(Env::v('montant'), ',', '.'),
strtr(Env::v('montant'), ',', '.'),
$member['uid'], $evt['eid']);
strtr(Env::v('montant'), ',', '.'),
strtr(Env::v('montant'), ',', '.'),
$member['uid'], $evt['eid']);
@@
-537,8
+547,8
@@
class XnetEventsModule extends PLModule
foreach ($nbs as $id => $nb) {
$nb = max(intval($nb), 0);
XDB::execute("REPLACE INTO groupex.evenements_participants
foreach ($nbs as $id => $nb) {
$nb = max(intval($nb), 0);
XDB::execute("REPLACE INTO groupex.evenements_participants
- VALUES ({?}, {?}, {?}, {?}, {?})",
- $evt['eid'], $member['uid'], $id, $nb,
$paid
);
+ VALUES ({?}, {?}, {?}, {?}, {?}
, {?}
)",
+ $evt['eid'], $member['uid'], $id, $nb,
'', $id == 1 ? $paid : 0
);
}
$res = XDB::query("SELECT COUNT(uid) AS cnt, SUM(nb) AS nb
}
$res = XDB::query("SELECT COUNT(uid) AS cnt, SUM(nb) AS nb
@@
-547,14
+557,14
@@
class XnetEventsModule extends PLModule
GROUP BY uid",
$member['uid'], $evt['eid']);
$u = $res->fetchOneAssoc();
GROUP BY uid",
$member['uid'], $evt['eid']);
$u = $res->fetchOneAssoc();
- $u = $u['cnt'] ?
null : $u['nb']
;
+ $u = $u['cnt'] ?
$u['nb'] : null
;
subscribe_lists_event($u, $member['uid'], $evt);
}
$evt = get_event_detail($eid, $item_id);
}
subscribe_lists_event($u, $member['uid'], $evt);
}
$evt = get_event_detail($eid, $item_id);
}
- $page->assign('evt', $evt);
+ $page->assign
_by_ref
('evt', $evt);
$page->assign('tout', is_null($item_id));
if (count($evt['moments'])) {
$page->assign('tout', is_null($item_id));
if (count($evt['moments'])) {