X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=056ca5a9ed79677899f15fd18946f84cbfee2c60;hb=fbfc01a1c59242edec753a060c67990b0e78a11f;hp=db91a51d59c5e63108e4ed6a2d98e7034c423f68;hpb=ab9fe2c98b2c7284b098812448c9729ef3b472e4;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index db91a51..056ca5a 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -1,6 +1,6 @@ $this->make_hook('events', AUTH_MDP), '%grp/events/sub' => $this->make_hook('sub', AUTH_MDP), - '%grp/events/csv' => $this->make_hook('csv', AUTH_MDP), - '%grp/events/ical' => $this->make_hook('ical', AUTH_MDP), + '%grp/events/csv' => $this->make_hook('csv', AUTH_MDP, 'user', NO_HTTPS), + '%grp/events/ical' => $this->make_hook('ical', AUTH_MDP, 'user', NO_HTTPS), '%grp/events/edit' => $this->make_hook('edit', AUTH_MDP, 'groupadmin'), '%grp/events/admin' => $this->make_hook('admin', AUTH_MDP, 'groupmember'), ); @@ -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'))); + update_NbValid(); } if ($action == 'archive') { @@ -112,7 +113,7 @@ class XnetEventsModule extends PLModule WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); } - + $page->assign('archive', $archive); $evenements = XDB::iterator( "SELECT e.*, LEFT(10, e.debut) AS debut_day, LEFT(10, e.fin) AS fin_day, @@ -126,13 +127,18 @@ 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 ") - . (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(); + $undisplayed_events = 0; 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 @@ -165,8 +171,9 @@ class XnetEventsModule extends PLModule } $evts[] = $e; } - + $page->assign('evenements', $evts); + $page->assign('undisplayed_events', $undisplayed_events); } function handler_sub(&$page, $eid = null) @@ -186,6 +193,11 @@ class XnetEventsModule extends PLModule $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')) { @@ -225,18 +237,20 @@ class XnetEventsModule extends PLModule $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 - 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 = {?}", - $eid, S::v("uid"), $j); + $eid, S::v("uid"), $j); $updated = $eid; } $total += $nb; @@ -276,6 +290,7 @@ class XnetEventsModule extends PLModule $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)); } @@ -307,7 +322,7 @@ class XnetEventsModule extends PLModule } $page->register_function('display_ical', 'display_ical'); $page->assign_by_ref('e', $evt); - + header('Content-Type: text/calendar; charset=utf-8'); } @@ -347,7 +362,8 @@ class XnetEventsModule extends PLModule 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; @@ -415,7 +431,7 @@ class XnetEventsModule extends PLModule $eid, $i, Post::v('titre'.$i), Post::v('details'.$i), $montant); } else { - XDB::execute("DELETE FROM groupex.evenements_items + XDB::execute("DELETE FROM groupex.evenements_items WHERE eid = {?} AND item_id = {?}", $eid, $i); } } @@ -518,7 +534,7 @@ class XnetEventsModule extends PLModule 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']); @@ -537,8 +553,8 @@ class XnetEventsModule extends PLModule 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 @@ -547,14 +563,14 @@ class XnetEventsModule extends PLModule 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); } - $page->assign('evt', $evt); + $page->assign_by_ref('evt', $evt); $page->assign('tout', is_null($item_id)); if (count($evt['moments'])) { @@ -571,7 +587,7 @@ class XnetEventsModule extends PLModule INNER JOIN groupex.evenements AS e ON (ep.eid = e.eid) LEFT JOIN groupex.membres AS m ON ( ep.uid = m.uid AND e.asso_id = m.asso_id) LEFT JOIN auth_user_md5 AS u ON ( u.user_id = ep.uid ) - WHERE ep.eid = {?} '.$whereitemid.' + WHERE ep.eid = {?} '.$whereitemid . ' GROUP BY UPPER(SUBSTRING(IF(u.nom IS NULL,m.nom,u.nom), 1, 1))', $evt['eid']); $alphabet = array(); @@ -586,23 +602,6 @@ class XnetEventsModule extends PLModule ksort($alphabet); $page->assign('alphabet', $alphabet); - $ofs = Env::i('offset'); - $tot = Env::v('initiale') ? $tot : $nb_tot; - $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) { - $page->assign('links', $links); - } - if ($evt['paiement_id']) { $res = XDB::iterator( "SELECT IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom, u.prenom, @@ -625,16 +624,37 @@ class XnetEventsModule extends PLModule IF(m.origine = 'X', a.alias, m.email) AS email FROM groupex.evenements_participants AS p INNER JOIN groupex.membres AS m USING(uid) - LEFT JOIN groupex.evenements_participants AS p2 ON (p2.uid = m.uid AND p2.eid = p.eid + LEFT JOIN groupex.evenements_participants AS p2 ON (p2.uid = m.uid AND p2.eid = p.eid AND p2.nb != 0) LEFT JOIN auth_user_md5 AS u ON (u.user_id = m.uid) LEFT JOIN aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie') WHERE p.eid = {?} AND p2.eid IS NULL + " . (Env::v('initiale') ? " AND IF(u.nom IS NULL, m.nom, + IF(u.nom_usage<>'', u.nom_usage, u.nom)) LIKE '" . Env::v('initiale') . "%'" + : "") . " GROUP BY m.uid - ORDER BY nom, prenom, promo", $evt['eid']); + 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) { + $page->assign('links', $links); + } + $page->assign('absents', $absents); - $page->assign('participants', + $page->assign('participants', get_event_participants($evt, $item_id, $tri, "LIMIT ".($ofs*NB_PER_PAGE).", ".NB_PER_PAGE)); }