X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=64ca542f327a3350f702292bff9356b62f2d1f49;hb=12262f1306059765d8625a6752364679c8625d31;hp=889346e0077b9b1133af4d520e64bca1f3e3b65b;hpb=89274a92006f2e3d3124667cd77525f7d01f8012;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 889346e..64ca542 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -1,6 +1,6 @@ asso('id')); @@ -73,43 +73,42 @@ class XnetEventsModule extends PLModule if ($action == 'del') { // deletes the event mailing aliases if ($tmp[1]) { - XDB::execute( - "DELETE FROM virtual WHERE type = 'evt' AND alias LIKE {?}", - $tmp[1].'-absents@%'); - XDB::execute( - "DELETE FROM virtual WHERE type = 'evt' AND alias LIKE {?}", - $tmp[1].'-participants@%'); + foreach (array('-absents@', '-participants@', '-paye@', '-participants-non-paye@') as $v) { + XDB::execute("DELETE FROM virtual + WHERE type = 'evt' AND alias LIKE {?}", + $tmp[1] . $v . '%'); + } } // deletes the event items - XDB::execute("DELETE FROM groupex.evenements_items WHERE eid = {?}", $eid); + XDB::execute('DELETE FROM group_event_items + WHERE eid = {?}', $eid); // deletes the event participants - XDB::execute("DELETE FROM groupex.evenements_participants - WHERE eid = {?}", $eid); + XDB::execute('DELETE FROM group_event_participants + WHERE eid = {?}', $eid); // deletes the event - XDB::execute("DELETE FROM groupex.evenements - WHERE eid = {?} AND asso_id = {?}", - $eid, $globals->asso('id')); + XDB::execute('DELETE FROM group_events + WHERE eid = {?} AND asso_id = {?}', + $eid, $globals->asso('id')); // delete the requests for payments - require_once 'validations.inc.php'; - XDB::execute("DELETE FROM requests - WHERE type = 'paiements' AND data LIKE {?}", - PayReq::same_event($eid, $globals->asso('id'))); + XDB::execute("DELETE FROM requests + WHERE type = 'paiements' AND data LIKE {?}", + PayReq::same_event($eid, $globals->asso('id'))); $globals->updateNbValid(); } if ($action == 'archive') { - XDB::execute("UPDATE groupex.evenements + XDB::execute("UPDATE group_events SET archive = 1 WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); } if ($action == 'unarchive') { - XDB::execute("UPDATE groupex.evenements + XDB::execute("UPDATE group_events SET archive = 0 WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); @@ -122,8 +121,8 @@ class XnetEventsModule extends PLModule 1) AS inscr_open, e.deadline_inscription, MAX(ep.nb) IS NOT NULL AS inscrit, MAX(ep.paid) AS paid - FROM groupex.evenements AS e - LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) + FROM group_events AS e + LEFT JOIN group_event_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) WHERE asso_id = {?} AND archive = {?} GROUP BY e.eid ORDER BY inscr_open DESC, debut DESC', @@ -141,8 +140,8 @@ class XnetEventsModule extends PLModule $e['show_participants'] = ($e['show_participants'] && (is_member() || may_update())); $e['moments'] = XDB::fetchAllAssoc('SELECT titre, details, montant, ei.item_id, nb, ep.paid - FROM groupex.evenements_items AS ei - LEFT JOIN groupex.evenements_participants AS ep + FROM group_event_items AS ei + LEFT JOIN group_event_participants AS ep ON (ep.eid = ei.eid AND ep.item_id = ei.item_id AND ep.uid = {?}) WHERE ei.eid = {?}', S::i('uid'), $e['eid']); @@ -154,8 +153,8 @@ class XnetEventsModule extends PLModule } $query = XDB::query( - "SELECT montant - FROM {$globals->money->mpay_tprefix}transactions AS t + "SELECT amount + FROM payment_transactions AS t WHERE ref = {?} AND uid = {?}", $e['paiement_id'], S::v('uid')); $montants = $query->fetchColumn(); @@ -203,7 +202,8 @@ class XnetEventsModule extends PLModule } global $globals; - $res = XDB::query("SELECT stamp FROM requests + $res = XDB::query("SELECT stamp + FROM requests WHERE type = 'paiements' AND data LIKE {?}", PayReq::same_event($evt['eid'], $globals->asso('id'))); $page->assign('validation', $res->numRows()); @@ -224,10 +224,8 @@ 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) - { - $page->trigError('Tu dois choisir un nombre d\'invités correct !'); + if (!isset($pers[$j]) || !is_numeric($pers[$j]) || $pers[$j] < 0) { + $page->trigError("Tu dois choisir un nombre d'invités correct !"); return; } $subs[$j] = 1 + $pers[$j]; @@ -236,11 +234,11 @@ class XnetEventsModule extends PLModule // impossible to unsubscribe if you already paid sthing if (!array_sum($subs) && $evt['paid'] != 0) { - $page->trigError("Impossible de te désinscrire complètement ". - "parce que tu as fait un paiement par ". - "chèque ou par liquide. Contacte un ". - "administrateur du groupe si tu es sûr de ". - "ne pas venir"); + $page->trigError("Impossible de te désinscrire complètement " . + "parce que tu as fait un paiement par " . + "chèque ou par liquide. Contacte un " . + "administrateur du groupe si tu es sûr de " . + "ne pas venir."); return; } @@ -251,15 +249,15 @@ class XnetEventsModule extends PLModule $telepaid= $evt['telepaid'] ? $evt['telepaid'] : 0; foreach ($subs as $j => $nb) { if ($nb >= 0) { - XDB::execute( - "REPLACE INTO groupex.evenements_participants - VALUES ({?}, {?}, {?}, {?}, {?}, {?})", - $eid, S::v('uid'), $j, $nb, Env::has('notify_payment') ? 'notify_payment' : '', - $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 = 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( - "DELETE FROM groupex.evenements_participants + "DELETE FROM group_event_participants WHERE eid = {?} AND uid = {?} AND item_id = {?}", $eid, S::v("uid"), $j); $updated = $eid; @@ -268,7 +266,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($total, S::i('uid'), $evt); + subscribe_lists_event(S::i('uid'), $evt, ($total > 0 ? 1 : 0), 0); } $page->assign('event', get_event_detail($eid)); } @@ -286,10 +284,7 @@ class XnetEventsModule extends PLModule return PL_NOT_FOUND; } - header('Content-type: text/x-csv; encoding=UTF-8'); - header('Pragma: '); - header('Cache-Control: '); - + pl_cached_content_headers('text/x-csv', 1); $page->changeTpl('xnetevents/csv.tpl', NO_SKIN); $admin = may_update(); @@ -335,7 +330,7 @@ class XnetEventsModule extends PLModule $page->register_function('display_ical', 'display_ical'); $page->assign_by_ref('e', $evt); - header('Content-Type: text/calendar; charset=utf-8'); + pl_content_headers("text/calendar"); } function handler_edit(&$page, $eid = null) @@ -345,7 +340,7 @@ class XnetEventsModule extends PLModule // get eid if the the given one is a short name if (!is_null($eid) && !is_numeric($eid)) { $res = XDB::query("SELECT eid - FROM groupex.evenements + FROM group_events WHERE asso_id = {?} AND short_name = {?}", $globals->asso('id'), $eid); if ($res->numRows()) { @@ -356,7 +351,7 @@ class XnetEventsModule extends PLModule // check the event is in our group if (!is_null($eid)) { $res = XDB::query("SELECT short_name - FROM groupex.evenements + FROM group_events WHERE eid = {?} AND asso_id = {?}", $eid, $globals->asso('id')); if ($res->numRows()) { @@ -396,12 +391,12 @@ class XnetEventsModule extends PLModule ); $trivial = array('intitule', 'descriptif', 'noinvite', - 'show_participants', 'accept_nonmembre', 'organisateur_uid'); + 'show_participants', 'accept_nonmembre', 'uid'); foreach ($trivial as $k) { $evt[$k] = Post::v($k); } if (!$eid) { - $evt['organisateur_uid'] = S::v('uid'); + $evt['uid'] = S::v('uid'); } if (Post::v('deadline')) { @@ -413,45 +408,44 @@ class XnetEventsModule extends PLModule } // Store the modifications in the database - XDB::execute('REPLACE INTO groupex.evenements - SET eid={?}, asso_id={?}, organisateur_uid={?}, intitule={?}, - paiement_id = {?}, descriptif = {?}, debut = {?}, - fin = {?}, show_participants = {?}, short_name = {?}, - 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['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 = 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)', + $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']); // 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 groupex.evenements_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 = VALUES(titre), details = VALUES(details), montant = VALUES(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); + XDB::execute('DELETE FROM group_event_items + WHERE eid = {?} AND item_id = {?}', $eid, $i); } } // request for a new payment if (Post::v('paiement_id') == -1 && $money_defaut >= 0) { - require_once 'validations.inc.php'; $p = new PayReq(S::user(), Post::v('intitule')." - ".$globals->asso('nom'), Post::v('site'), $money_defaut, @@ -468,7 +462,7 @@ class XnetEventsModule extends PLModule // events with no sub-event: add a sub-event with no name if ($nb_moments == 0) { - XDB::execute("INSERT INTO groupex.evenements_items + XDB::execute("INSERT INTO group_event_items VALUES ({?}, {?}, '', '', 0)", $eid, 1); } @@ -479,7 +473,7 @@ class XnetEventsModule extends PLModule // get a list of all the payment for this asso $res = XDB::iterator("SELECT id, text - FROM {$globals->money->mpay_tprefix}paiements + FROM payments WHERE asso_id = {?}", $globals->asso('id')); $paiements = array(); while ($a = $res->next()) $paiements[$a['id']] = $a['text']; { @@ -489,16 +483,16 @@ class XnetEventsModule extends PLModule // when modifying an old event retreive the old datas if ($eid) { $res = XDB::query( - "SELECT eid, intitule, descriptif, debut, fin, organisateur_uid, - show_participants, paiement_id, short_name, - deadline_inscription, noinvite, accept_nonmembre - FROM groupex.evenements + "SELECT eid, intitule, descriptif, debut, fin, uid, + show_participants, paiement_id, short_name, + deadline_inscription, noinvite, accept_nonmembre + FROM group_events WHERE eid = {?}", $eid); $evt = $res->fetchOneAssoc(); // find out if there is already a request for a payment for this event - require_once 'validations.inc.php'; - $res = XDB::query("SELECT stamp FROM requests - WHERE type = 'paiements' AND data LIKE {?}", + $res = XDB::query("SELECT stamp + FROM requests + WHERE type = 'paiements' AND data LIKE {?}", PayReq::same_event($eid, $globals->asso('id'))); $stamp = $res->fetchOneCell(); if ($stamp) { @@ -508,10 +502,10 @@ class XnetEventsModule extends PLModule $page->assign('evt', $evt); // get all the different moments infos $res = XDB::iterator( - "SELECT item_id, titre, details, montant - FROM groupex.evenements_items AS ei - INNER JOIN groupex.evenements AS e ON(e.eid = ei.eid) - WHERE e.eid = {?} + "SELECT item_id, titre, details, montant + FROM group_event_items AS ei + INNER JOIN group_events AS e ON(e.eid = ei.eid) + WHERE e.eid = {?} ORDER BY item_id", $eid); $items = array(); while ($item = $res->next()) { @@ -541,46 +535,55 @@ class XnetEventsModule extends PLModule if (may_update() && Post::v('adm')) { S::assert_xsrf_token(); - $member = get_infos(Post::v('mail')); + $member = User::getSilent(Post::v('mail')); if (!$member) { $page->trigError("Membre introuvable"); } // change the price paid by a participant if (Env::v('adm') == 'prix' && $member) { - XDB::execute("UPDATE groupex.evenements_participants - SET paid = IF(paid + {?} > 0, paid + {?}, 0) + $amount = strtr(Env::v('montant'), ',', '.'); + XDB::execute("UPDATE group_event_participants + SET paid = paid + {?} WHERE uid = {?} AND eid = {?} AND item_id = 1", - strtr(Env::v('montant'), ',', '.'), - strtr(Env::v('montant'), ',', '.'), - $member['uid'], $evt['eid']); + $amount, $member->uid, $evt['eid']); + subscribe_lists_event($member->uid, $evt, 1, $amount); } // change the number of personns coming with a participant if (Env::v('adm') == 'nbs' && $member) { $res = XDB::query("SELECT paid - FROM groupex.evenements_participants + FROM group_event_participants WHERE uid = {?} AND eid = {?}", - $member['uid'], $evt['eid']); + $member->uid, $evt['eid']); $paid = intval($res->fetchOneCell()); $nbs = Post::v('nb', array()); foreach ($nbs as $id => $nb) { $nb = max(intval($nb), 0); - XDB::execute("REPLACE INTO groupex.evenements_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 = 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 - FROM groupex.evenements_participants - WHERE uid = {?} AND eid = {?} - GROUP BY uid", - $member['uid'], $evt['eid']); + $res = XDB::query('SELECT COUNT(uid) AS cnt, SUM(nb) AS nb + FROM group_event_participants + WHERE uid = {?} AND eid = {?} + GROUP BY uid', + $member->uid, $evt['eid']); $u = $res->fetchOneAssoc(); - $u = $u['cnt'] ? $u['nb'] : null; - subscribe_lists_event($u, $member['uid'], $evt); + if ($u['cnt'] == 1 && $paid == 0 && Post::v('cancel')) { + XDB::execute("DELETE FROM group_event_participants + WHERE uid = {?} AND eid = {?}", + $member->uid, $evt['eid']); + $u = 0; + subscribe_lists_event($member->uid, $evt, -1, $paid); + } else { + $u = $u['cnt'] ? $u['nb'] : null; + subscribe_lists_event($member->uid, $evt, ($u > 0 ? 1 : 0), $paid); + } } $evt = get_event_detail($eid, $item_id); @@ -593,12 +596,11 @@ class XnetEventsModule extends PLModule $page->assign('moments', $evt['moments']); } - $page->assign('alphabet', array()); if ($evt['paiement_id']) { $infos = User::getBulkUsersWithUIDs( - XDB::fetchAllAssoc('SELECT t.uid, t.montant - FROM ' . $globals->money->mpay_tprefix . 'transactions AS t - LEFT JOIN groupex.evenements_participants AS ep ON(ep.uid = t.uid AND ep.eid = {?}) + XDB::fetchAllAssoc('SELECT t.uid, t.amount + FROM payment_transactions AS t + LEFT JOIN group_event_participants AS ep ON(ep.uid = t.uid AND ep.eid = {?}) WHERE t.ref = {?} AND ep.uid IS NULL', $evt['eid'], $evt['paiement_id']), 'uid', 'user'); @@ -607,16 +609,16 @@ class XnetEventsModule extends PLModule } $absents = User::getBulkUsersFromDB('SELECT p.uid - FROM groupex.evenements_participants AS p - LEFT JOIN groupex.evenements_participants AS p2 ON (p2.uid = p.uid + FROM group_event_participants AS p + LEFT JOIN group_event_participants AS p2 ON (p2.uid = p.uid AND p2.eid = p.eid AND p2.nb != 0) WHERE p.eid = {?} AND p2.eid IS NULL GROUP BY p.uid', $evt['eid']); - $ofs = Env::i('offset'); - $tot = (Env::v('initiale') ? $tot : $nb_tot); - $nbp = ceil($tot / NB_PER_PAGE); + $ofs = Env::i('offset'); + $tot = (is_null($evt['nb_tot']) ? $evt['nb'] : $evt['nb_tot']); + $nbp = ceil($tot / NB_PER_PAGE); if ($nbp > 1) { $links = array(); if ($ofs) { @@ -625,7 +627,7 @@ class XnetEventsModule extends PLModule for ($i = 1 ; $i <= $nbp; $i++) { $links[(string)$i] = $i - 1; } - if ($ofs < $nbp) { + if ($ofs < $nbp - 1) { $links['suivant'] = $ofs+1; } $page->assign('links', $links);