Rename file for dropping old tables so that we can do remove them once we have update...

[platal.git] / modules / xnetevents.php

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index 7825c1c..96f563d 100644 (file)
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -249,13 +249,11 @@ class XnetEventsModule extends PLModule
         $telepaid= $evt['telepaid'] ? $evt['telepaid'] : 0;
         foreach ($subs as $j => $nb) {
             if ($nb >= 0) {
-                $tmp_flags = (Env::has('notify_payment') ? 'notify_payment' : '');
-                $tmp_paid  = ($j == 1 ? $paid - $telepaid : 0);
                 XDB::execute('INSERT INTO  group_event_participants (eid, uid, item_id, nb, flags, paid)
                                    VALUES  ({?}, {?}, {?}, {?}, {?}, {?})
-                  ON DUPLICATE KEY UPDATE  nb = {?}, flags = {?}, paid = {?}',
-                             $eid, S::v('uid'), $j, $nb, $tmp_flags, $tmp_paid,
-                             $nb, $tmp_flags, $tmp_paid);
+                  ON DUPLICATE KEY UPDATE  nb = VALUES(nb), flags = VALUES(flags), paid = VALUES(paid)',
+                             $eid, S::v('uid'), $j, $nb, (Env::has('notify_payment') ? 'notify_payment' : ''),
+                             ($j == 1 ? $paid - $telepaid : 0));
                 $updated = $eid;
             } else {
                 XDB::execute(
@@ -269,6 +267,25 @@ 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);
+
+            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));
     }
@@ -286,7 +303,7 @@ class XnetEventsModule extends PLModule
             return PL_NOT_FOUND;
         }
 
-        pl_content_headers("text/x-csv");
+        pl_cached_content_headers('text/x-csv', 1);
         $page->changeTpl('xnetevents/csv.tpl', NO_SKIN);
 
         $admin = may_update();
@@ -392,7 +409,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);
@@ -413,22 +430,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  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})
-              ON DUPLICATE KEY UPDATE  asso_id = {?}, uid = {?}, intitule = {?},
-                                       paiement_id = {?}, descriptif = {?}, debut = {?},
-                                       fin = {?}, show_participants = {?}, short_name = {?},
-                                       deadline_inscription = {?}, noinvite = {?}',
+                                                     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), 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['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['eid']);
+                         $evt['noinvite'], $evt['accept_nonmembre'], $evt['subscription_notification']);
 
             // if new event, get its id
             if (!$eid) {
@@ -443,9 +456,8 @@ class XnetEventsModule extends PLModule
                     $money_defaut += (float)$montant;
                     XDB::execute('INSERT INTO  group_event_items (eid, item_id, titre, details, montant)
                                        VALUES  ({?}, {?}, {?}, {?}, {?})
-                      ON DUPLICATE KEY UPDATE  titre = {?}, details = {?}, montant = {?}',
-                                 $eid, $i, Post::v('titre' . $i), Post::v('details' . $i), $montant,
-                                 Post::v('titre' . $i), Post::v('details' . $i), $montant);
+                      ON DUPLICATE KEY UPDATE  titre = VALUES(titre), details = VALUES(details), montant = VALUES(montant)',
+                                 $eid, $i, Post::v('titre' . $i), Post::v('details' . $i), $montant);
                 } else {
                     XDB::execute('DELETE FROM  group_event_items
                                         WHERE  eid = {?} AND item_id = {?}', $eid, $i);
@@ -492,7 +504,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();
@@ -571,9 +583,8 @@ class XnetEventsModule extends PLModule
                     $nb = max(intval($nb), 0);
                     XDB::execute('INSERT INTO  group_event_participants (eid, uid, item_id, nb, flags, paid)
                                        VALUES  ({?}, {?}, {?}, {?}, {?}, {?})
-                      ON DUPLICATE KEY UPDATE  nb = {?}, flags = {?}, paid = {?}',
-                                 $evt['eid'], $member->uid, $id, $nb, '', ($id == 1 ? $paid : 0),
-                                 $nb, '', ($id == 1 ? $paid : 0));
+                      ON DUPLICATE KEY UPDATE  nb = VALUES(nb), flags = VALUES(flags), paid = VALUES(paid)',
+                                 $evt['eid'], $member->uid, $id, $nb, '', ($id == 1 ? $paid : 0));
                 }
 
                 $res = XDB::query('SELECT  COUNT(uid) AS cnt, SUM(nb) AS nb