X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=977ea1f894b02d91671b01ff7bb75f9b2c955639;hb=91f4232430d5ecb47873c9686346344f3d3d7a43;hp=40fa3856aa417dbdcf1d9711ec998d0bccb674eb;hpb=a3a049fc80d3707bcc76903ab89f73974c470c0c;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 40fa385..977ea1f 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -26,36 +26,55 @@ class XnetEventsModule extends PLModule function handlers() { return array( - '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/edit' => $this->make_hook('edit', AUTH_MDP), - 'grp/events/admin' => $this->make_hook('admin', AUTH_MDP), + '%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_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; } - $eid = Post::get('del'); - $res = XDB::query("SELECT asso_id, short_name FROM groupex.evenements - WHERE eid = {?} AND asso_id = {?}", - $eid, $globals->asso('id')); + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); $tmp = $res->fetchOneRow(); if (!$tmp) { return PL_NOT_ALLOWED; } + } + if ($action == 'del') { // deletes the event mailing aliases if ($tmp[1]) { XDB::execute( @@ -85,6 +104,21 @@ class XnetEventsModule extends PLModule PayReq::same_event($eid, $globals->asso('id'))); } + 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); $page->assign('admin', may_update()); $evenements = XDB::iterator( @@ -98,19 +132,22 @@ class XnetEventsModule extends PLModule 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 = {?} - GROUP BY e.eid - ORDER BY debut", Session::get('uid'), $globals->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(); 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 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 = {?}) WHERE ei.eid = {?}", - Session::get('uid'), $e['eid']); + S::v('uid'), $e['eid']); $e['moments'] = $res->fetchAllAssoc(); $e['topay'] = 0; @@ -121,7 +158,7 @@ class XnetEventsModule extends PLModule $query = XDB::query( "SELECT montant FROM {$globals->money->mpay_tprefix}transactions AS t - WHERE ref = {?} AND uid = {?}", $e['paiement_id'], Session::get('uid')); + WHERE ref = {?} AND uid = {?}", $e['paiement_id'], S::v('uid')); $montants = $query->fetchColumn(); foreach ($montants as $m) { @@ -140,7 +177,7 @@ class XnetEventsModule extends PLModule { require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'; - new_group_page('xnetevents/subscribe.tpl'); + new_group_open_page('xnetevents/subscribe.tpl'); $evt = get_event_detail($eid); if (!$evt) { @@ -150,6 +187,9 @@ class XnetEventsModule extends PLModule if (!$evt['inscr_open']) { $page->kill('Les inscriptions pour cet événement sont closes'); } + if (!$evt['accept_nonmembre'] && !is_member() && !may_update()) { + $page->kill('Cet événement est fermé aux non-membres du groupe'); + } $page->assign('event', $evt); @@ -157,8 +197,8 @@ class XnetEventsModule extends PLModule return; } - $moments = Post::getMixed('moment', array()); - $pers = Post::getMixed('personnes', array()); + $moments = Post::v('moment', array()); + $pers = Post::v('personnes', array()); $subs = array(); foreach ($moments as $j => $v) { @@ -192,13 +232,13 @@ class XnetEventsModule extends PLModule XDB::execute( "REPLACE INTO groupex.evenements_participants VALUES ({?}, {?}, {?}, {?}, {?})", - $eid, Session::getInt('uid'), $j, $nb, $evt['paid']); + $eid, S::v('uid'), $j, $nb, $evt['paid']); $page->assign('updated', true); } else { XDB::execute( "DELETE FROM groupex.evenements_participants WHERE eid = {?} AND uid = {?} AND item_id = {?}", - $eid, Session::getInt("uid"), $j); + $eid, S::v("uid"), $j); $page->assign('updated', true); } } @@ -223,11 +263,11 @@ class XnetEventsModule extends PLModule header('Pragma: '); header('Cache-Control: '); - new_nonhtml_page('xnetevents/csv.tpl'); + $page->changeTpl('xnetevents/csv.tpl', NO_SKIN); $admin = may_update(); - $tri = (Env::get('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo'); + $tri = (Env::v('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo'); $page->assign('participants', get_event_participants($evt, $item_id, $tri)); @@ -235,7 +275,39 @@ class XnetEventsModule extends PLModule $page->assign('admin', $admin); $page->assign('moments', $evt['moments']); $page->assign('money', $evt['money']); - $page->assign('tout', !Env::get('item_id', false)); + $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_NOT_FOUND; + } + $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) @@ -258,35 +330,37 @@ class XnetEventsModule extends PLModule $moments = range(1, 4); $page->assign('moments', $moments); - if (Post::get('intitule')) { + if (Post::v('intitule')) { require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php'; $short_name = event_change_shortname($page, $infos['short_name'], - Env::get('short_name', '')); + Env::v('short_name', '')); $evt = array( 'eid' => $eid, 'asso_id' => $globals->asso('id'), - 'organisateur_uid' => Session::get('uid'), - 'paiement_id' => Post::get('paiement_id') > 0 ? Post::get('paiement_id') : null, - 'debut' => Post::get('deb_Year').'-'.Post::get('deb_Month') - .'-'.Post::get('deb_Day').' '.Post::get('deb_Hour') - .':'.Post::get('deb_Minute').':00', - 'fin' => Post::get('fin_Year').'-'.Post::get('fin_Month') - .'-'.Post::get('fin_Day').' '.Post::get('fin_Hour') - .':'.Post::get('fin_Minute').':00', + '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') + .':'.Post::v('deb_Minute').':00', + 'fin' => Post::v('fin_Year').'-'.Post::v('fin_Month') + .'-'.Post::v('fin_Day').' '.Post::v('fin_Hour') + .':'.Post::v('fin_Minute').':00', 'short_name' => $short_name, ); $trivial = array('intitule', 'descriptif', 'noinvite', - 'show_participants'); + 'show_participants', 'accept_nonmembre', 'organisateur_uid'); foreach ($trivial as $k) { - $evt[$k] = Post::get($k); + $evt[$k] = Post::v($k); + } + if (!$eid) { + $evt['organisateur_uid'] = S::v('uid'); } - if (Post::get('deadline')) { - $evt['deadline_inscription'] = Post::get('inscr_Year').'-' - . Post::get('inscr_Month').'-' - . Post::get('inscr_Day'); + if (Post::v('deadline')) { + $evt['deadline_inscription'] = Post::v('inscr_Year').'-' + . Post::v('inscr_Month').'-' + . Post::v('inscr_Day'); } else { $evt['deadline_inscription'] = null; } @@ -296,12 +370,13 @@ class XnetEventsModule extends PLModule SET eid={?}, asso_id={?}, organisateur_uid={?}, intitule={?}, paiement_id = {?}, descriptif = {?}, debut = {?}, fin = {?}, show_participants = {?}, short_name = {?}, - deadline_inscription = {?}, noinvite = {?}', + deadline_inscription = {?}, noinvite = {?}, + accept_nonmembre = {?}', $evt['eid'], $evt['asso_id'], $evt['organisateur_uid'], $evt['intitule'], $evt['paiement_id'], $evt['descriptif'], $evt['debut'], $evt['fin'], $evt['show_participants'], $evt['short_name'], $evt['deadline_inscription'], - $evt['noinvite']); + $evt['noinvite'], $evt['accept_nonmembre']); // if new event, get its id if (!$eid) { @@ -312,16 +387,16 @@ class XnetEventsModule extends PLModule $money_defaut = 0; foreach ($moments as $i) { - if (Post::get('titre'.$i)) { + if (Post::v('titre'.$i)) { $nb_moments++; - $montant = strtr(Post::get('montant'.$i), ',', '.'); + $montant = strtr(Post::v('montant'.$i), ',', '.'); $money_defaut += (float)$montant; XDB::execute(" REPLACE INTO groupex.evenements_items VALUES ({?}, {?}, {?}, {?}, {?})", - $eid, $i, Post::get('titre'.$i), - Post::get('details'.$i), $montant); + $eid, $i, Post::v('titre'.$i), + Post::v('details'.$i), $montant); } else { XDB::execute("DELETE FROM groupex.evenements_items WHERE eid = {?} AND item_id = {?}", $eid, $i); @@ -329,12 +404,12 @@ class XnetEventsModule extends PLModule } // request for a new payment - if (Post::get('paiement_id') == -1 && $money_defaut >= 0) { + if (Post::v('paiement_id') == -1 && $money_defaut >= 0) { require_once 'validations.inc.php'; - $p = new PayReq(Session::get('uid'), - Post::get('intitule')." - ".$globals->asso('nom'), - Post::get('site'), $money_defaut, - Post::get('confirmation'), 0, 999, + $p = new PayReq(S::v('uid'), + Post::v('intitule')." - ".$globals->asso('nom'), + Post::v('site'), $money_defaut, + Post::v('confirmation'), 0, 999, $globals->asso('id'), $eid); $p->submit(); } @@ -346,8 +421,7 @@ class XnetEventsModule extends PLModule } if (is_null($evt['eid'])) { - global $platal; - redirect(smarty_function_rel().'/'.$platal->path.'/'.$eid); + pl_redirect('events'); } } @@ -363,9 +437,9 @@ 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 + "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(); @@ -412,31 +486,31 @@ class XnetEventsModule extends PLModule new_groupadmin_page('xnetevents/admin.tpl'); } - if (may_update() && Post::get('adm')) { - $member = get_infos(Post::get('mail')); + if (may_update() && Post::v('adm')) { + $member = get_infos(Post::v('mail')); if (!$member) { $page->trig("Membre introuvable"); } // change the price paid by a participant - if (Env::get('adm') == 'prix' && $member) { + if (Env::v('adm') == 'prix' && $member) { XDB::execute("UPDATE groupex.evenements_participants SET paid = IF(paid + {?} > 0, paid + {?}, 0) WHERE uid = {?} AND eid = {?}", - strtr(Env::get('montant'), ',', '.'), - strtr(Env::get('montant'), ',', '.'), + strtr(Env::v('montant'), ',', '.'), + strtr(Env::v('montant'), ',', '.'), $member['uid'], $eid); } // change the number of personns coming with a participant - if (Env::get('adm') == 'nbs' && $member) { + if (Env::v('adm') == 'nbs' && $member) { $res = XDB::query("SELECT paid FROM groupex.evenements_participants WHERE uid = {?} AND eid = {?}", $member['uid'], $eid); $paid = intval($res->fetchOneCell()); - $nbs = Post::getMixed('nb', array()); + $nbs = Post::v('nb', array()); foreach ($nbs as $id => $nb) { $nb = max(intval($nb), 0); @@ -470,7 +544,7 @@ class XnetEventsModule extends PLModule $page->assign('moments', $evt['moments']); } - $tri = (Env::get('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo'); + $tri = (Env::v('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo'); $whereitemid = is_null($item_id) ? '' : "AND ep.item_id = $item_id"; $res = XDB::iterRow( 'SELECT UPPER(SUBSTRING(IF(u.nom IS NULL, m.nom, @@ -488,15 +562,15 @@ class XnetEventsModule extends PLModule while (list($char, $nb) = $res->next()) { $alphabet[ord($char)] = $char; $nb_tot += $nb; - if (Env::has('initiale') && $char == strtoupper(Env::get('initiale'))) { + if (Env::has('initiale') && $char == strtoupper(Env::v('initiale'))) { $tot = $nb; } } ksort($alphabet); $page->assign('alphabet', $alphabet); - $ofs = Env::getInt('offset'); - $tot = Env::get('initiale') ? $tot : $nb_tot; + $ofs = Env::i('offset'); + $tot = Env::v('initiale') ? $tot : $nb_tot; $nbp = intval(($tot-1)/NB_PER_PAGE); $links = array(); if ($ofs) {