X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=bf975e1345c16dced4d47501656b91c5f8ab80e2;hb=f67c8d9a660207c5be75d4d079b7f740e5318a6c;hp=8af4c898f95e25592ba157c0217f994f074e139a;hpb=d53c12097f4e82ad4657de86f199699973dee29f;p=platal.git

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index 8af4c89..bf975e1 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_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'),
         );
     }
 
@@ -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');
                 }
             }
 
@@ -266,7 +265,7 @@ 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');
@@ -566,7 +565,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
@@ -598,10 +597,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);
                 }
             }