From e04221974671a042b5f97d28fcf211a47c6162d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Wed, 17 Nov 2010 23:46:53 +0100 Subject: [PATCH] Fixes events updates (Closes #1343, #1350, #1349, #1348). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- modules/xnetevents.php | 67 ++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 6e4c418..7825c1c 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -224,9 +224,7 @@ class XnetEventsModule extends PLModule // retreive ohter field when more than one person if ($subs[$j] == 2) { - if (!isset($pers[$j]) || !is_numeric($pers[$j]) - || $pers[$j] < 0) - { + if (!isset($pers[$j]) || !is_numeric($pers[$j]) || $pers[$j] < 0) { $page->trigError("Tu dois choisir un nombre d'invités correct !"); return; } @@ -251,11 +249,13 @@ class XnetEventsModule extends PLModule $telepaid= $evt['telepaid'] ? $evt['telepaid'] : 0; foreach ($subs as $j => $nb) { if ($nb >= 0) { - XDB::execute( - "REPLACE INTO group_event_participants - VALUES ({?}, {?}, {?}, {?}, {?}, {?})", - $eid, S::v('uid'), $j, $nb, Env::has('notify_payment') ? 'notify_payment' : '', - $j == 1 ? $paid - $telepaid : 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); $updated = $eid; } else { XDB::execute( @@ -410,40 +410,45 @@ class XnetEventsModule extends PLModule } // Store the modifications in the database - XDB::execute('REPLACE INTO group_events - SET eid = {?}, asso_id = {?}, uid = {?}, intitule = {?}, - paiement_id = {?}, descriptif = {?}, debut = {?}, - fin = {?}, show_participants = {?}, short_name = {?}, - deadline_inscription = {?}, noinvite = {?}, - accept_nonmembre = {?}', + 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 = {?}', $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['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']); // if new event, get its id if (!$eid) { $eid = XDB::insertId(); } - $nb_moments = 0; - $money_defaut = 0; - foreach ($moments as $i) { - if (Post::v('titre'.$i)) { + if (Post::v('titre' . $i)) { $nb_moments++; - $montant = strtr(Post::v('montant'.$i), ',', '.'); + $montant = strtr(Post::v('montant' . $i), ',', '.'); $money_defaut += (float)$montant; - XDB::execute(" - REPLACE INTO group_event_items - VALUES ({?}, {?}, {?}, {?}, {?})", - $eid, $i, Post::v('titre'.$i), - Post::v('details'.$i), $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); } else { - XDB::execute("DELETE FROM group_event_items - WHERE eid = {?} AND item_id = {?}", $eid, $i); + XDB::execute('DELETE FROM group_event_items + WHERE eid = {?} AND item_id = {?}', $eid, $i); } } // request for a new payment @@ -564,9 +569,11 @@ class XnetEventsModule extends PLModule foreach ($nbs as $id => $nb) { $nb = max(intval($nb), 0); - XDB::execute('REPLACE INTO group_event_participants - VALUES ({?}, {?}, {?}, {?}, {?}, {?})', - $evt['eid'], $member->uid, $id, $nb, '', $id == 1 ? $paid : 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)); } $res = XDB::query('SELECT COUNT(uid) AS cnt, SUM(nb) AS nb -- 2.1.4