X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=3dbe0c68d32088851cd37a03ad0d9e577087095b;hb=e93255ef54304c697ef7ac101247f23dc5f7b31f;hp=c5729f351d2a6f45adfdfd85ef33977f37dac2f3;hpb=26ba053e75092d038f571b77eaf3005509da0648;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index c5729f3..3dbe0c6 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -26,12 +26,12 @@ 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, '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'), + '%grp/events' => $this->make_hook('events', AUTH_PASSWD, 'groups'), + '%grp/events/sub' => $this->make_hook('sub', AUTH_PASSWD, 'groups'), + '%grp/events/csv' => $this->make_hook('csv', AUTH_PASSWD, 'groups', NO_HTTPS), + '%grp/events/ical' => $this->make_hook('ical', AUTH_PASSWD, 'groups', NO_HTTPS), + '%grp/events/edit' => $this->make_hook('edit', AUTH_PASSWD, 'groupadmin'), + '%grp/events/admin' => $this->make_hook('admin', AUTH_PASSWD, 'groupmember'), ); } @@ -73,10 +73,9 @@ class XnetEventsModule extends PLModule if ($action == 'del') { // deletes the event mailing aliases if ($tmp[1]) { - foreach (array('-absents@', '-participants@', '-paye@', '-participants-non-paye@') as $v) { - XDB::execute("DELETE FROM virtual - WHERE type = 'evt' AND alias LIKE {?}", - $tmp[1] . $v . '%'); + require_once 'emails.inc.php'; + foreach (explode(',', $globals->xnet->event_lists) as $suffix) { + delete_list_alias($tmp[1] . $suffix, $globals->xnet->evts_domain, 'event'); } } @@ -152,16 +151,11 @@ class XnetEventsModule extends PLModule $e['topay'] += $m['nb'] * $m['montant']; } - $query = XDB::query( - "SELECT amount + $montant = XDB::fetchOneCell( + "SELECT SUM(amount) as sum_amount FROM payment_transactions AS t WHERE ref = {?} AND uid = {?}", $e['paiement_id'], S::v('uid')); - $montants = $query->fetchColumn(); - - foreach ($montants as $m) { - $p = strtr(substr($m, 0, strpos($m, 'EUR')), ',', '.'); - $e['paid'] += trim($p); - } + $e['paid'] += $montant; make_event_date($e); @@ -266,7 +260,26 @@ class XnetEventsModule extends PLModule } if ($updated !== false) { $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès.'); - subscribe_lists_event(S::i('uid'), $evt, ($total > 0 ? 1 : 0), 0); + subscribe_lists_event(S::i('uid'), $evt['short_name'], ($total > 0 ? 1 : 0), 0); + + if ($evt['subscription_notification'] != 'nobody') { + $mailer = new PlMailer('xnetevents/subscription-notif.mail.tpl'); + if ($evt['subscription_notification'] != 'creator') { + $admins = $globals->asso()->iterAdmins(); + while ($admin = $admins->next()) { + $mailer->addTo($admin); + } + } + if ($evt['subscription_notification'] != 'animator') { + $mailer->addTo($evt['organizer']); + } + $mailer->assign('group', $globals->asso('nom')); + $mailer->assign('event', $evt['intitule']); + $mailer->assign('subs', $subs); + $mailer->assign('moments', $evt['moments']); + $mailer->assign('name', S::user()->fullName('promo')); + $mailer->send(); + } } $page->assign('event', get_event_detail($eid)); } @@ -390,7 +403,7 @@ class XnetEventsModule extends PLModule 'short_name' => $short_name, ); - $trivial = array('intitule', 'descriptif', 'noinvite', + $trivial = array('intitule', 'descriptif', 'noinvite', 'subscription_notification', 'show_participants', 'accept_nonmembre', 'uid'); foreach ($trivial as $k) { $evt[$k] = Post::v($k); @@ -411,18 +424,18 @@ class XnetEventsModule extends PLModule XDB::execute('INSERT INTO group_events (eid, asso_id, uid, intitule, paiement_id, descriptif, debut, fin, show_participants, short_name, deadline_inscription, noinvite, - accept_nonmembre) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}) + accept_nonmembre, subscription_notification) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}) ON DUPLICATE KEY UPDATE asso_id = VALUES(asso_id), uid = VALUES(uid), intitule = VALUES(intitule), paiement_id = VALUES(paiement_id), descriptif = VALUES(descriptif), debut = VALUES(debut), fin = VALUES(fin), show_participants = VALUES(show_participants), short_name = VALUES(short_name), deadline_inscription = VALUES(deadline_inscription), noinvite = VALUES(noinvite), - accept_nonmembre = VALUES(accept_nonmembre)', + accept_nonmembre = VALUES(accept_nonmembre), subscription_notification = VALUES(subscription_notification)', $evt['eid'], $evt['asso_id'], $evt['uid'], $evt['intitule'], $evt['paiement_id'], $evt['descriptif'], $evt['debut'], $evt['fin'], $evt['show_participants'], $evt['short_name'], $evt['deadline_inscription'], - $evt['noinvite'], $evt['accept_nonmembre']); + $evt['noinvite'], $evt['accept_nonmembre'], $evt['subscription_notification']); // if new event, get its id if (!$eid) { @@ -450,12 +463,14 @@ class XnetEventsModule extends PLModule Post::v('intitule')." - ".$globals->asso('nom'), Post::v('site'), $money_defaut, Post::v('confirmation'), 0, 999, - $globals->asso('id'), $eid); + $globals->asso('id'), $eid, Post::v('payment_public') == 'yes'); if ($p->accept()) { $p->submit(); } else { - $page->assign('paiement_message', Post::v('confirmation')); - $page->assign('paiement_site', Post::v('site')); + $page->assign('payment_message', Post::v('confirmation')); + $page->assign('payment_site', Post::v('site')); + $page->assign('payment_public', Post::v('payment_public') == 'yes'); + $page->assign('error', true); $error = true; } } @@ -472,9 +487,10 @@ class XnetEventsModule extends PLModule } // get a list of all the payment for this asso - $res = XDB::iterator("SELECT id, text - FROM payments - WHERE asso_id = {?}", $globals->asso('id')); + $res = XDB::iterator("SELECT id, text + FROM payments + WHERE asso_id = {?} AND NOT FIND_IN_SET('old', flags)", + $globals->asso('id')); $paiements = array(); while ($a = $res->next()) $paiements[$a['id']] = $a['text']; { $page->assign('paiements', $paiements); @@ -485,7 +501,7 @@ class XnetEventsModule extends PLModule $res = XDB::query( "SELECT eid, intitule, descriptif, debut, fin, uid, show_participants, paiement_id, short_name, - deadline_inscription, noinvite, accept_nonmembre + deadline_inscription, noinvite, accept_nonmembre, subscription_notification FROM group_events WHERE eid = {?}", $eid); $evt = $res->fetchOneAssoc(); @@ -493,7 +509,7 @@ class XnetEventsModule extends PLModule $res = XDB::query("SELECT stamp FROM requests WHERE type = 'paiements' AND data LIKE {?}", - PayReq::same_event($eid, $globals->asso('id'))); + PayReq::same_event($eid, $globals->asso('id'))); $stamp = $res->fetchOneCell(); if ($stamp) { $evt['paiement_id'] = -2; @@ -547,7 +563,7 @@ class XnetEventsModule extends PLModule SET paid = paid + {?} WHERE uid = {?} AND eid = {?} AND item_id = 1", $amount, $member->uid, $evt['eid']); - subscribe_lists_event($member->uid, $evt, 1, $amount); + subscribe_lists_event($member->uid, $evt['short_name'], 1, $amount); } // change the number of personns coming with a participant @@ -579,10 +595,10 @@ class XnetEventsModule extends PLModule WHERE uid = {?} AND eid = {?}", $member->uid, $evt['eid']); $u = 0; - subscribe_lists_event($member->uid, $evt, -1, $paid); + subscribe_lists_event($member->uid, $evt['short_name'], -1, $paid); } else { $u = $u['cnt'] ? $u['nb'] : null; - subscribe_lists_event($member->uid, $evt, ($u > 0 ? 1 : 0), $paid); + subscribe_lists_event($member->uid, $evt['short_name'], ($u > 0 ? 1 : 0), $paid); } } @@ -617,8 +633,7 @@ class XnetEventsModule extends PLModule GROUP BY p.uid', $evt['eid']); $ofs = Env::i('offset'); - $tot = (is_null($evt['nb_tot']) ? $evt['nb'] : $evt['nb_tot']); - $nbp = ceil($tot / NB_PER_PAGE); + $nbp = ceil($evt['user_count'] / NB_PER_PAGE); if ($nbp > 1) { $links = array(); if ($ofs) {