X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=bee8a2e811fe9373ea90db925670076dcfb805de;hb=1f53925a716bf5cb97ed624a6787a8319eb2bcff;hp=22b45862eeb14d7eae48a853501a5fa4a02ec463;hpb=cb24457f1d720262f087790e91e8f53ec99d181b;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 22b4586..bee8a2e 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -29,33 +29,52 @@ 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), ); } - function handler_events(&$page) + function handler_events(&$page, $archive = null) { global $globals; - new_group_open_page('xnetevents/index.tpl'); + if ($archive == 'archive') { + $archive = true; + new_groupadmin_page('xnetevents/index.tpl'); + } else { + $archive = false; + new_group_open_page('xnetevents/index.tpl'); + } + $action = null; if (Post::has('del')) { + $action = 'del'; + $eid = Post::v('del'); + } elseif (Post::has('archive')) { + $action = 'archive'; + $eid = Post::v('archive'); + } elseif (Post::has('unarchive')) { + $action = 'unarchive'; + $eid = Post::v('unarchive'); + } + + if (!is_null($action)) { if (!may_update()) { - return PL_NOT_ALLOWED; + return PL_FORBIDDEN; } - $eid = Post::v('del'); - $res = XDB::query("SELECT asso_id, short_name FROM groupex.evenements WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); $tmp = $res->fetchOneRow(); if (!$tmp) { - return PL_NOT_ALLOWED; + return PL_FORBIDDEN; } + } + if ($action == 'del') { // deletes the event mailing aliases if ($tmp[1]) { XDB::execute( @@ -85,19 +104,33 @@ class XnetEventsModule extends PLModule PayReq::same_event($eid, $globals->asso('id'))); } - $page->assign('admin', may_update()); + if ($action == 'archive') { + XDB::execute("UPDATE groupex.evenements + SET archive = 1 + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); + } + if ($action == 'unarchive') { + XDB::execute("UPDATE groupex.evenements + SET archive = 0 + 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, 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) LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) - WHERE asso_id = {?}" + 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')); @@ -107,7 +140,7 @@ class XnetEventsModule extends PLModule while ($e = $evenements->next()) { $e['show_participants'] = ($e['show_participants'] && (is_member() || may_update())); $res = XDB::query( - "SELECT titre, details, montant, ei.item_id, nb + "SELECT titre, details, montant, ei.item_id, nb, ep.paid FROM groupex.evenements_items AS ei LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = ei.eid AND ep.item_id = ei.item_id AND uid = {?}) @@ -116,6 +149,7 @@ class XnetEventsModule extends PLModule $e['moments'] = $res->fetchAllAssoc(); $e['topay'] = 0; + $e['paid'] = $e['moments'][0]['paid']; foreach ($e['moments'] as $m) { $e['topay'] += $m['nb'] * $m['montant']; } @@ -131,11 +165,13 @@ 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()); } function handler_sub(&$page, $eid = null) @@ -182,7 +218,7 @@ class XnetEventsModule extends PLModule } // impossible to unsubscribe if you already paid sthing - if (array_sum($subs) && $evt['paid'] != 0) { + 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 ". @@ -192,22 +228,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)); } @@ -243,35 +284,82 @@ 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; } } new_groupadmin_page('xnetevents/edit.tpl'); - $moments = range(1, 4); + $moments = range(1, 4); + $error = false; $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'], Env::v('short_name', '')); - + if ($short_name != Env::v('short_name')) { + $error = true; + } $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') @@ -283,10 +371,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').'-' @@ -311,7 +402,7 @@ class XnetEventsModule extends PLModule // if new event, get its id if (!$eid) { - $eid = mysql_insert_id(); + $eid = XDB::insertId(); } $nb_moments = 0; @@ -333,7 +424,6 @@ class XnetEventsModule extends PLModule WHERE eid = {?} AND item_id = {?}", $eid, $i); } } - // request for a new payment if (Post::v('paiement_id') == -1 && $money_defaut >= 0) { require_once 'validations.inc.php'; @@ -351,15 +441,15 @@ class XnetEventsModule extends PLModule VALUES ({?}, {?}, '', '', 0)", $eid, 1); } - if (is_null($evt['eid'])) { - pl_redirect('events/'.$eid); + if (!$error) { + 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); @@ -368,20 +458,20 @@ 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; + $evt['paiement_id'] = -2; $evt['paiement_req'] = $stamp; } $page->assign('evt', $evt); @@ -398,6 +488,7 @@ class XnetEventsModule extends PLModule } $page->assign('items', $items); } + $page->assign('url_ref', $eid); } function handler_admin(&$page, $eid = null, $item_id = null) @@ -426,48 +517,43 @@ 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()); foreach ($nbs as $id => $nb) { $nb = max(intval($nb), 0); - - 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); - } + XDB::execute("REPLACE INTO groupex.evenements_participants + 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); } $evt = get_event_detail($eid, $item_id); } - $page->assign('admin', may_update()); $page->assign('evt', $evt); $page->assign('tout', is_null($item_id)); @@ -486,7 +572,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; @@ -522,9 +608,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());