X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=3295ca056e931b00d8b8d17da151e265b9da4ef8;hb=d655dba1a05100bdd309200eb20409e848abf98c;hp=5e3d31b148f7780ee822f8769d03618d9a936d3d;hpb=f02eefd4d0eabc353e9020150c4692b70450c54e;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 5e3d31b..3295ca0 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -29,6 +29,7 @@ class XnetEventsModule extends PLModule '%grp/events' => $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/edit' => $this->make_hook('edit', AUTH_MDP), '%grp/events/admin' => $this->make_hook('admin', AUTH_MDP), ); @@ -60,7 +61,7 @@ class XnetEventsModule extends PLModule if (!is_null($action)) { if (!may_update()) { - return PL_NOT_ALLOWED; + return PL_FORBIDDEN; } $res = XDB::query("SELECT asso_id, short_name FROM groupex.evenements @@ -69,7 +70,7 @@ class XnetEventsModule extends PLModule $tmp = $res->fetchOneRow(); if (!$tmp) { - return PL_NOT_ALLOWED; + return PL_FORBIDDEN; } } @@ -116,7 +117,7 @@ class XnetEventsModule extends PLModule WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); } - + $page->assign('archive', $archive); $page->assign('admin', may_update()); @@ -125,7 +126,7 @@ class XnetEventsModule extends PLModule 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, - MAX(ep.nb) AS inscrit, MAX(ep.paid) AS paid + MAX(ep.nb) IS NOT NULL AS inscrit, MAX(ep.paid) AS paid FROM groupex.evenements AS e INNER JOIN x4dat.auth_user_md5 AS u ON u.user_id = e.organisateur_uid INNER JOIN x4dat.aliases AS a ON (a.type = 'a_vie' AND a.id = u.user_id) @@ -165,9 +166,12 @@ class XnetEventsModule extends PLModule $e['paid'] += trim($p); } + if (Env::has('updated') && $e['eid'] == Env::i('updated')) { + $page->assign('updated', $e); + } $evts[] = $e; } - + $page->assign('evenements', $evts); $page->assign('is_member', is_member()); } @@ -226,22 +230,27 @@ class XnetEventsModule extends PLModule } // update actual inscriptions + $updated = false; + $total = 0; foreach ($subs as $j => $nb) { - if ($nb > 0) { + if ($nb >= 0) { XDB::execute( "REPLACE INTO groupex.evenements_participants VALUES ({?}, {?}, {?}, {?}, {?})", $eid, S::v('uid'), $j, $nb, $evt['paid']); - $page->assign('updated', true); + $updated = $eid; } else { XDB::execute( "DELETE FROM groupex.evenements_participants WHERE eid = {?} AND uid = {?} AND item_id = {?}", $eid, S::v("uid"), $j); - $page->assign('updated', true); + $updated = $eid; } + $total += $nb; + } + if ($updated !== false) { + subscribe_lists_event($total, S::i('uid'), $evt); } - $page->assign('event', get_event_detail($eid)); } @@ -277,18 +286,63 @@ class XnetEventsModule extends PLModule $page->assign('tout', !Env::v('item_id', false)); } + function handler_ical(&$page, $eid = null) + { + global $globals; + + require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'; + $evt = get_event_detail($eid); + if (!$evt) { + return PL_FORBIDDEN; + } + $evt['debut'] = preg_replace('/(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)/', "\\1\\2\\3T\\4\\5\\6", $evt['debut']); + $evt['fin'] = preg_replace('/(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)/', "\\1\\2\\3T\\4\\5\\6", $evt['fin']); + + foreach ($evt['moments'] as $m) { + $evt['descriptif'] .= "\n\n** " . $m['titre'] . " **\n" . $m['details']; + } + + $page->changeTpl('xnetevents/calendar.tpl', NO_SKIN); + + require_once('ical.inc.php'); + $page->assign('asso', $globals->asso()); + $page->assign('timestamp', time()); + $page->assign('admin', may_update()); + + if (may_update()) { + $page->assign('participants', get_event_participants($evt, null, 'promo, nom, prenom')); + } + $page->register_function('display_ical', 'display_ical'); + $page->assign_by_ref('e', $evt); + + header('Content-Type: text/calendar; charset=utf-8'); + } + function handler_edit(&$page, $eid = null) { global $globals; + // get eid if the the given one is a short name + if (!is_null($eid) && !is_numeric($eid)) { + $res = XDB::query("SELECT eid + FROM groupex.evenements + WHERE asso_id = {?} AND short_name = {?}", + $globals->asso('id'), $eid); + if ($res->numRows()) { + $eid = (int)$res->fetchOneCell(); + } + } + // check the event is in our group if (!is_null($eid)) { - $res = XDB::query("SELECT short_name, asso_id - FROM groupex.evenements - WHERE eid = {?}", $eid); - $infos = $res->fetchOneAssoc(); - if ($infos['asso_id'] != $globals->asso('id')) { - return PL_NOT_ALLOWED; + $res = XDB::query("SELECT short_name + FROM groupex.evenements + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); + if ($res->numRows()) { + $infos = $res->fetchOneAssoc(); + } else { + return PL_FORBIDDEN; } } @@ -305,7 +359,6 @@ class XnetEventsModule extends PLModule $evt = array( 'eid' => $eid, 'asso_id' => $globals->asso('id'), - 'organisateur_uid' => S::v('uid'), 'paiement_id' => Post::v('paiement_id') > 0 ? Post::v('paiement_id') : null, 'debut' => Post::v('deb_Year').'-'.Post::v('deb_Month') .'-'.Post::v('deb_Day').' '.Post::v('deb_Hour') @@ -317,10 +370,13 @@ class XnetEventsModule extends PLModule ); $trivial = array('intitule', 'descriptif', 'noinvite', - 'show_participants', 'accept_nonmembre'); + 'show_participants', 'accept_nonmembre', 'organisateur_uid'); foreach ($trivial as $k) { $evt[$k] = Post::v($k); } + if (!$eid) { + $evt['organisateur_uid'] = S::v('uid'); + } if (Post::v('deadline')) { $evt['deadline_inscription'] = Post::v('inscr_Year').'-' @@ -345,7 +401,7 @@ class XnetEventsModule extends PLModule // if new event, get its id if (!$eid) { - $eid = mysql_insert_id(); + $eid = XDB::insertId(); } $nb_moments = 0; @@ -385,15 +441,13 @@ class XnetEventsModule extends PLModule VALUES ({?}, {?}, '', '', 0)", $eid, 1); } - if (is_null($evt['eid'])) { - pl_redirect('events/'.$eid); - } + pl_redirect('events'); } // get a list of all the payment for this asso $res = XDB::iterator("SELECT id, text - FROM {$globals->money->mpay_tprefix}paiements - WHERE asso_id = {?}", $globals->asso('id')); + FROM {$globals->money->mpay_tprefix}paiements + WHERE asso_id = {?}", $globals->asso('id')); $paiements = array(); while ($a = $res->next()) $paiements[$a['id']] = $a['text']; { $page->assign('paiements', $paiements); @@ -402,17 +456,17 @@ class XnetEventsModule extends PLModule // when modifying an old event retreive the old datas if ($eid) { $res = XDB::query( - "SELECT eid, intitule, descriptif, debut, fin, - show_participants, paiement_id, short_name, - deadline_inscription, noinvite, accept_nonmembre + "SELECT eid, intitule, descriptif, debut, fin, organisateur_uid, + show_participants, paiement_id, short_name, + deadline_inscription, noinvite, accept_nonmembre FROM groupex.evenements WHERE eid = {?}", $eid); $evt = $res->fetchOneAssoc(); // find out if there is already a request for a payment for this event require_once 'validations.inc.php'; $res = XDB::query("SELECT stamp FROM requests - WHERE type = 'paiements' AND data LIKE {?}", - PayReq::same_event($eid, $globals->asso('id'))); + WHERE type = 'paiements' AND data LIKE {?}", + PayReq::same_event($eid, $globals->asso('id'))); $stamp = $res->fetchOneCell(); if ($stamp) { $evt['paiement_id'] = -2; @@ -432,6 +486,7 @@ class XnetEventsModule extends PLModule } $page->assign('items', $items); } + $page->assign('url_ref', $eid); } function handler_admin(&$page, $eid = null, $item_id = null) @@ -460,19 +515,19 @@ class XnetEventsModule extends PLModule // 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 = {?}", + SET paid = IF(paid + {?} > 0, paid + {?}, 0) + WHERE uid = {?} AND eid = {?}", strtr(Env::v('montant'), ',', '.'), strtr(Env::v('montant'), ',', '.'), - $member['uid'], $eid); + $member['uid'], $evt['eid']); } // change the number of personns coming with a participant if (Env::v('adm') == 'nbs' && $member) { $res = XDB::query("SELECT paid - FROM groupex.evenements_participants - WHERE uid = {?} AND eid = {?}", - $member['uid'], $eid); + FROM groupex.evenements_participants + WHERE uid = {?} AND eid = {?}", + $member['uid'], $evt['eid']); $paid = intval($res->fetchOneCell()); $nbs = Post::v('nb', array()); @@ -482,19 +537,18 @@ class XnetEventsModule extends PLModule if ($nb) { XDB::execute("REPLACE INTO groupex.evenements_participants - VALUES ({?}, {?}, {?}, {?}, {?})", - $eid, $member['uid'], $id, $nb, $paid); - } else { - XDB::execute("DELETE FROM groupex.evenements_participants - WHERE uid = {?} AND eid = {?} AND item_id = {?}", - $member['uid'], $eid, $id); + VALUES ({?}, {?}, {?}, {?}, {?})", + $evt['eid'], $member['uid'], $id, $nb, $paid); } } - $res = XDB::query("SELECT uid FROM groupex.evenements_participants - WHERE uid = {?} AND eid = {?}", - $member['uid'], $eid); - $u = $res->fetchOneCell(); + $res = XDB::query("SELECT COUNT(uid) AS cnt, SUM(nb) AS nb + FROM groupex.evenements_participants + WHERE uid = {?} AND eid = {?} + GROUP BY uid", + $member['uid'], $evt['eid']); + $u = $res->fetchOneAssoc(); + $u = $u['cnt'] ? null : $u['nb']; subscribe_lists_event($u, $member['uid'], $evt); } @@ -520,7 +574,7 @@ class XnetEventsModule extends PLModule 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.' - GROUP BY UPPER(SUBSTRING(IF(u.nom IS NULL,m.nom,u.nom), 1, 1))', $eid); + GROUP BY UPPER(SUBSTRING(IF(u.nom IS NULL,m.nom,u.nom), 1, 1))', $evt['eid']); $alphabet = array(); $nb_tot = 0; @@ -556,9 +610,9 @@ class XnetEventsModule extends PLModule "SELECT IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom, u.prenom, u.promo, a.alias AS email, t.montant FROM {$globals->money->mpay_tprefix}transactions AS t - INNER JOIN auth_user_md5 AS u ON(t.uid = u.user_id) - INNER JOIN aliases AS a ON (a.id = t.uid AND a.type='a_vie' ) - LEFT JOIN groupex.evenements_participants AS ep ON(ep.uid = t.uid AND ep.eid = {?}) + INNER JOIN auth_user_md5 AS u ON(t.uid = u.user_id) + INNER JOIN aliases AS a ON (a.id = t.uid AND a.type='a_vie' ) + LEFT JOIN groupex.evenements_participants AS ep ON(ep.uid = t.uid AND ep.eid = {?}) WHERE t.ref = {?} AND ep.uid IS NULL", $evt['eid'], $evt['paiement_id']); $page->assign('oublis', $res->total());