projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes an "undefined variable" error in modules/email.php.
[platal.git]
/
modules
/
xnetevents.php
diff --git
a/modules/xnetevents.php
b/modules/xnetevents.php
index
e7e939e
..
f5cd0f4
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
9
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 *
@@
-58,6
+58,7
@@
class XnetEventsModule extends PLModule
if (!may_update()) {
return PL_FORBIDDEN;
}
if (!may_update()) {
return PL_FORBIDDEN;
}
+ S::assert_xsrf_token();
$res = XDB::query("SELECT asso_id, short_name FROM groupex.evenements
WHERE eid = {?} AND asso_id = {?}",
$res = XDB::query("SELECT asso_id, short_name FROM groupex.evenements
WHERE eid = {?} AND asso_id = {?}",
@@
-97,6
+98,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')));
+ $globals->updateNbValid();
}
if ($action == 'archive') {
}
if ($action == 'archive') {
@@
-115,7
+117,7
@@
class XnetEventsModule extends PLModule
$page->assign('archive', $archive);
$evenements = XDB::iterator(
$page->assign('archive', $archive);
$evenements = XDB::iterator(
- "SELECT e.*, LEFT(10, e.debut) AS
debut_day, LEFT(10, e.fin) AS fin
_day,
+ "SELECT e.*, LEFT(10, e.debut) AS
first_day, LEFT(10, e.fin) AS last
_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,
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,
@@
-126,13
+128,19
@@
class XnetEventsModule extends PLModule
LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?})
WHERE asso_id = {?}
AND archive = " . ($archive ? "1 " : "0 ")
LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?})
WHERE asso_id = {?}
AND archive = " . ($archive ? "1 " : "0 ")
- . (is_member() || may_update() ? "" : " AND accept_nonmembre != 0 ")
. "GROUP BY e.eid
ORDER BY inscr_open DESC, debut DESC", S::v('uid'), $globals->asso('id'));
$evts = array();
. "GROUP BY e.eid
ORDER BY inscr_open DESC, debut DESC", S::v('uid'), $globals->asso('id'));
$evts = array();
+ $undisplayed_events = 0;
+ $this->load('xnetevents.inc.php');
while ($e = $evenements->next()) {
while ($e = $evenements->next()) {
+ if (!is_member() && !may_update() && !$e['accept_nonmembre']) {
+ $undisplayed_events ++;
+ continue;
+ }
+
$e['show_participants'] = ($e['show_participants'] && (is_member() || may_update()));
$res = XDB::query(
"SELECT titre, details, montant, ei.item_id, nb, ep.paid
$e['show_participants'] = ($e['show_participants'] && (is_member() || may_update()));
$res = XDB::query(
"SELECT titre, details, montant, ei.item_id, nb, ep.paid
@@
-160,6
+168,8
@@
class XnetEventsModule extends PLModule
$e['paid'] += trim($p);
}
$e['paid'] += trim($p);
}
+ make_event_date($e);
+
if (Env::has('updated') && $e['eid'] == Env::i('updated')) {
$page->assign('updated', $e);
}
if (Env::has('updated') && $e['eid'] == Env::i('updated')) {
$page->assign('updated', $e);
}
@@
-167,17
+177,27
@@
class XnetEventsModule extends PLModule
}
$page->assign('evenements', $evts);
}
$page->assign('evenements', $evts);
+ $page->assign('undisplayed_events', $undisplayed_events);
}
function handler_sub(&$page, $eid = null)
{
}
function handler_sub(&$page, $eid = null)
{
-
require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'
;
+
$this->load('xnetevents.inc.php')
;
$page->changeTpl('xnetevents/subscribe.tpl');
$evt = get_event_detail($eid);
$page->changeTpl('xnetevents/subscribe.tpl');
$evt = get_event_detail($eid);
- if (
!$evt
) {
+ if (
is_null($evt)
) {
return PL_NOT_FOUND;
}
return PL_NOT_FOUND;
}
+ if ($evt === false) {
+ global $globals, $platal;
+ $url = $globals->asso('sub_url');
+ if (empty($url)) {
+ $url = $platal->ns . 'subscribe';
+ }
+ $page->kill('Cet événement est reservé aux membres du groupe ' . $globals->asso('nom') .
+ '. Pour devenir membre, rends-toi sur la page de <a href="' . $url . '">demande d\'inscripton</a>.');
+ }
if (!$evt['inscr_open']) {
$page->kill('Les inscriptions pour cet événement sont closes');
if (!$evt['inscr_open']) {
$page->kill('Les inscriptions pour cet événement sont closes');
@@
-186,10
+206,17
@@
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')) {
return;
$page->assign('event', $evt);
if (!Post::has('submit')) {
return;
+ } else {
+ S::assert_xsrf_token();
}
$moments = Post::v('moment', array());
}
$moments = Post::v('moment', array());
@@
-204,7
+231,7
@@
class XnetEventsModule extends PLModule
if (!isset($pers[$j]) || !is_numeric($pers[$j])
|| $pers[$j] < 0)
{
if (!isset($pers[$j]) || !is_numeric($pers[$j])
|| $pers[$j] < 0)
{
- $page->trig('Tu dois choisir un nombre d\'invités correct !');
+ $page->trig
Error
('Tu dois choisir un nombre d\'invités correct !');
return;
}
$subs[$j] = 1 + $pers[$j];
return;
}
$subs[$j] = 1 + $pers[$j];
@@
-213,11
+240,11
@@
class XnetEventsModule extends PLModule
// impossible to unsubscribe if you already paid sthing
if (!array_sum($subs) && $evt['paid'] != 0) {
// impossible to unsubscribe if you already paid sthing
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 ".
- "ne pas venir");
+ $page->trig
Error
("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 ".
+
"ne pas venir");
return;
}
return;
}
@@
-225,23
+252,26
@@
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;
}
if ($updated !== false) {
$updated = $eid;
}
$total += $nb;
}
if ($updated !== false) {
+ $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès.');
subscribe_lists_event($total, S::i('uid'), $evt);
}
$page->assign('event', get_event_detail($eid));
subscribe_lists_event($total, S::i('uid'), $evt);
}
$page->assign('event', get_event_detail($eid));
@@
-249,7
+279,7
@@
class XnetEventsModule extends PLModule
function handler_csv(&$page, $eid = null, $item_id = null)
{
function handler_csv(&$page, $eid = null, $item_id = null)
{
-
require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'
;
+
$this->load('xnetevents.inc.php')
;
if (!is_numeric($item_id)) {
$item_id = null;
if (!is_numeric($item_id)) {
$item_id = null;
@@
-276,6
+306,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));
}
@@
-283,7
+314,7
@@
class XnetEventsModule extends PLModule
{
global $globals;
{
global $globals;
-
require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'
;
+
$this->load('xnetevents.inc.php')
;
$evt = get_event_detail($eid);
if (!$evt) {
return PL_FORBIDDEN;
$evt = get_event_detail($eid);
if (!$evt) {
return PL_FORBIDDEN;
@@
-346,8
+377,11
@@
class XnetEventsModule extends PLModule
$page->assign('moments', $moments);
if (Post::v('intitule')) {
$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'],
+ S::assert_xsrf_token();
+
+ $this->load('xnetevents.inc.php');
+ $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;
@@
-422,7
+456,7
@@
class XnetEventsModule extends PLModule
// request for a new payment
if (Post::v('paiement_id') == -1 && $money_defaut >= 0) {
require_once 'validations.inc.php';
// request for a new payment
if (Post::v('paiement_id') == -1 && $money_defaut >= 0) {
require_once 'validations.inc.php';
- $p = new PayReq(S::
v('uid'
),
+ $p = new PayReq(S::
user(
),
Post::v('intitule')." - ".$globals->asso('nom'),
Post::v('site'), $money_defaut,
Post::v('confirmation'), 0, 999,
Post::v('intitule')." - ".$globals->asso('nom'),
Post::v('site'), $money_defaut,
Post::v('confirmation'), 0, 999,
@@
-496,7
+530,7
@@
class XnetEventsModule extends PLModule
{
global $globals;
{
global $globals;
-
require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'
;
+
$this->load('xnetevents.inc.php')
;
$evt = get_event_detail($eid, $item_id);
if (!$evt) {
$evt = get_event_detail($eid, $item_id);
if (!$evt) {
@@
-509,16
+543,18
@@
class XnetEventsModule extends PLModule
}
if (may_update() && Post::v('adm')) {
}
if (may_update() && Post::v('adm')) {
+ S::assert_xsrf_token();
+
$member = get_infos(Post::v('mail'));
if (!$member) {
$member = get_infos(Post::v('mail'));
if (!$member) {
- $page->trig("Membre introuvable");
+ $page->trig
Error
("Membre introuvable");
}
// change the price paid by a participant
if (Env::v('adm') == 'prix' && $member) {
XDB::execute("UPDATE groupex.evenements_participants
SET paid = IF(paid + {?} > 0, paid + {?}, 0)
}
// change the price paid by a participant
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
+573,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
+583,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'])) {
@@
-620,19
+656,19
@@
class XnetEventsModule extends PLModule
ORDER BY nom, prenom, promo", $evt['eid']);
$ofs = Env::i('offset');
ORDER BY nom, prenom, promo", $evt['eid']);
$ofs = Env::i('offset');
- $tot = (Env::v('initiale') ? $tot : $nb_tot)
- $absents->total()
;
- $nbp =
intval(($tot-1)/
NB_PER_PAGE);
- $links = array();
- if ($ofs) {
- $links['précédent'] = $ofs-1;
- }
- for ($i = 0; $i <= $nbp; $i++) {
- $links[(string)($i+1)] = $i;
- }
- if ($ofs < $nbp) {
- $links['suivant'] = $ofs+1;
- }
- if (count($links)>1) {
+ $tot = (Env::v('initiale') ? $tot : $nb_tot);
+ $nbp =
ceil($tot /
NB_PER_PAGE);
+ if ($nbp > 1) {
+ $links = array();
+ if ($ofs) {
+ $links['précédent'] = $ofs - 1;
+ }
+ for ($i = 1 ; $i <= $nbp; $i++) {
+ $links[(string)$i] = $i - 1;
+ }
+ if ($ofs < $nbp) {
+ $links['suivant'] = $ofs+1;
+ }
$page->assign('links', $links);
}
$page->assign('links', $links);
}