X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=b16829e7dbe2ac95be2ea6ea425ac004c8726097;hb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;hp=f5cd0f4389444d9cbcae5be24eb0f0da14588d86;hpb=0783a5ed4d3409bcd7a7e1d908696159999810c8;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index f5cd0f4..b16829e 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -1,6 +1,6 @@ asso('id')); @@ -73,63 +73,61 @@ 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')); } $page->assign('archive', $archive); - $evenements = XDB::iterator( - "SELECT e.*, LEFT(10, e.debut) AS first_day, LEFT(10, e.fin) AS last_day, - IF(e.deadline_inscription, e.deadline_inscription >= LEFT(NOW(), 10), - 1) AS inscr_open, e.deadline_inscription, - u.nom, u.prenom, u.promo, a.alias, - MAX(ep.nb) IS NOT NULL AS inscrit, MAX(ep.paid) AS paid - FROM groupex.evenements AS e - INNER JOIN x4dat.auth_user_md5 AS u ON u.user_id = e.organisateur_uid - INNER JOIN x4dat.aliases AS a ON (a.type = 'a_vie' AND a.id = u.user_id) - LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) - WHERE asso_id = {?} - AND archive = " . ($archive ? "1 " : "0 ") - . "GROUP BY e.eid - ORDER BY inscr_open DESC, debut DESC", S::v('uid'), $globals->asso('id')); + $evenements = XDB::iterator('SELECT e.*, LEFT(10, e.debut) AS first_day, LEFT(10, e.fin) AS last_day, + IF(e.deadline_inscription, + e.deadline_inscription >= LEFT(NOW(), 10), + 1) AS inscr_open, + e.deadline_inscription, + MAX(ep.nb) IS NOT NULL AS inscrit, MAX(ep.paid) AS paid + 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', + S::i('uid'), $globals->asso('id'), $archive ? 1 : 0); $evts = array(); $undisplayed_events = 0; @@ -142,14 +140,12 @@ class XnetEventsModule extends PLModule } $e['show_participants'] = ($e['show_participants'] && (is_member() || may_update())); - $res = XDB::query( - "SELECT titre, details, montant, ei.item_id, nb, ep.paid - FROM groupex.evenements_items AS ei - LEFT JOIN groupex.evenements_participants AS ep - ON (ep.eid = ei.eid AND ep.item_id = ei.item_id AND uid = {?}) - WHERE ei.eid = {?}", - S::v('uid'), $e['eid']); - $e['moments'] = $res->fetchAllAssoc(); + $e['moments'] = XDB::fetchAllAssoc('SELECT titre, details, montant, ei.item_id, nb, ep.paid + 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']); $e['topay'] = 0; $e['paid'] = $e['moments'][0]['paid']; @@ -231,7 +227,7 @@ class XnetEventsModule extends PLModule if (!isset($pers[$j]) || !is_numeric($pers[$j]) || $pers[$j] < 0) { - $page->trigError('Tu dois choisir un nombre d\'invités correct !'); + $page->trigError("Tu dois choisir un nombre d'invités correct !"); return; } $subs[$j] = 1 + $pers[$j]; @@ -240,11 +236,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; } @@ -256,14 +252,14 @@ class XnetEventsModule extends PLModule foreach ($subs as $j => $nb) { if ($nb >= 0) { XDB::execute( - "REPLACE INTO groupex.evenements_participants + "REPLACE INTO group_event_participants VALUES ({?}, {?}, {?}, {?}, {?}, {?})", $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; @@ -272,7 +268,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($total, S::i('uid'), $evt, $paid); } $page->assign('event', get_event_detail($eid)); } @@ -290,15 +286,12 @@ class XnetEventsModule extends PLModule return PL_NOT_FOUND; } - header('Content-type: text/x-csv; encoding=UTF-8'); - header('Pragma: '); - header('Cache-Control: '); - + pl_content_headers("text/x-csv"); $page->changeTpl('xnetevents/csv.tpl', NO_SKIN); $admin = may_update(); - $tri = (Env::v('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo'); + $tri = (Env::v('order') == 'alpha' ? UserFilter::sortByPromo() : UserFilter::sortByName()); $page->assign('participants', get_event_participants($evt, $item_id, $tri)); @@ -334,12 +327,12 @@ class XnetEventsModule extends PLModule $page->assign('admin', may_update()); if (may_update()) { - $page->assign('participants', get_event_participants($evt, null, 'promo, nom, prenom')); + $page->assign('participants', get_event_participants($evt, null, UserFilter::sortByPromo())); } $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) @@ -349,7 +342,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()) { @@ -360,7 +353,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()) { @@ -417,7 +410,7 @@ class XnetEventsModule extends PLModule } // Store the modifications in the database - XDB::execute('REPLACE INTO groupex.evenements + XDB::execute('REPLACE INTO group_events SET eid={?}, asso_id={?}, organisateur_uid={?}, intitule={?}, paiement_id = {?}, descriptif = {?}, debut = {?}, fin = {?}, show_participants = {?}, short_name = {?}, @@ -444,12 +437,12 @@ class XnetEventsModule extends PLModule $montant = strtr(Post::v('montant'.$i), ',', '.'); $money_defaut += (float)$montant; XDB::execute(" - REPLACE INTO groupex.evenements_items + REPLACE INTO group_event_items VALUES ({?}, {?}, {?}, {?}, {?})", $eid, $i, Post::v('titre'.$i), Post::v('details'.$i), $montant); } else { - XDB::execute("DELETE FROM groupex.evenements_items + XDB::execute("DELETE FROM group_event_items WHERE eid = {?} AND item_id = {?}", $eid, $i); } } @@ -472,7 +465,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); } @@ -493,10 +486,10 @@ 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, organisateur_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 @@ -512,10 +505,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()) { @@ -552,18 +545,17 @@ class XnetEventsModule extends PLModule // 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) + 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']); } // 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']); @@ -572,19 +564,19 @@ class XnetEventsModule extends PLModule foreach ($nbs as $id => $nb) { $nb = max(intval($nb), 0); - XDB::execute("REPLACE INTO groupex.evenements_participants + XDB::execute("REPLACE INTO group_event_participants VALUES ({?}, {?}, {?}, {?}, {?}, {?})", $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 + 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); + subscribe_lists_event($u, $member['uid'], $evt, $paid); } $evt = get_event_detail($eid, $item_id); @@ -597,63 +589,25 @@ class XnetEventsModule extends PLModule $page->assign('moments', $evt['moments']); } - $tri = (Env::v('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo'); - $whereitemid = is_null($item_id) ? '' : "AND ep.item_id = $item_id"; - $res = XDB::iterRow( - 'SELECT UPPER(SUBSTRING(IF(u.nom IS NULL, m.nom, - IF(u.nom_usage<>"", u.nom_usage, u.nom)), 1, 1)), - COUNT(DISTINCT ep.uid) - FROM groupex.evenements_participants AS ep - INNER JOIN groupex.evenements AS e ON (ep.eid = e.eid) - LEFT JOIN groupex.membres AS m ON ( ep.uid = m.uid AND e.asso_id = m.asso_id) - LEFT JOIN auth_user_md5 AS u ON ( u.user_id = ep.uid ) - WHERE ep.eid = {?} '.$whereitemid . ' - GROUP BY UPPER(SUBSTRING(IF(u.nom IS NULL,m.nom,u.nom), 1, 1))', $evt['eid']); - - $alphabet = array(); - $nb_tot = 0; - while (list($char, $nb) = $res->next()) { - $alphabet[ord($char)] = $char; - $nb_tot += $nb; - if (Env::has('initiale') && $char == strtoupper(Env::v('initiale'))) { - $tot = $nb; - } - } - ksort($alphabet); - $page->assign('alphabet', $alphabet); - if ($evt['paiement_id']) { - $res = XDB::iterator( - "SELECT IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom, u.prenom, - u.promo, a.alias AS email, t.montant - FROM {$globals->money->mpay_tprefix}transactions AS t - INNER JOIN auth_user_md5 AS u ON(t.uid = u.user_id) - INNER JOIN aliases AS a ON (a.id = t.uid AND a.type='a_vie' ) - LEFT JOIN groupex.evenements_participants AS ep ON(ep.uid = t.uid AND ep.eid = {?}) - WHERE t.ref = {?} AND ep.uid IS NULL", - $evt['eid'], $evt['paiement_id']); - $page->assign('oublis', $res->total()); - $page->assign('oubliinscription', $res); - } - - $absents = XDB::iterator("SELECT p.uid, - IF(m.origine = 'X', IF(u.nom_usage != '', u.nom_usage, u.nom), m.nom) AS nom, - IF(m.origine = 'X', u.prenom, u.prenom) AS prenom, - IF(m.origine = 'X', u.promo, m.origine) AS promo, - IF(m.origine = 'X', FIND_IN_SET('femme', u.flags), m.sexe) AS sexe, - IF(m.origine = 'X', a.alias, m.email) AS email - FROM groupex.evenements_participants AS p - INNER JOIN groupex.membres AS m USING(uid) - LEFT JOIN groupex.evenements_participants AS p2 ON (p2.uid = m.uid AND p2.eid = p.eid - AND p2.nb != 0) - LEFT JOIN auth_user_md5 AS u ON (u.user_id = m.uid) - LEFT JOIN aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie') - WHERE p.eid = {?} AND p2.eid IS NULL - " . (Env::v('initiale') ? " AND IF(u.nom IS NULL, m.nom, - IF(u.nom_usage<>'', u.nom_usage, u.nom)) LIKE '" . Env::v('initiale') . "%'" - : "") . " - GROUP BY m.uid - ORDER BY nom, prenom, promo", $evt['eid']); + $infos = User::getBulkUsersWithUIDs( + XDB::fetchAllAssoc('SELECT t.uid, t.montant + FROM ' . $globals->money->mpay_tprefix . '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'); + $page->assign('oublis', count($infos)); + $page->assign('oubliinscription', $infos); + } + + $absents = User::getBulkUsersFromDB('SELECT 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); @@ -672,11 +626,10 @@ class XnetEventsModule extends PLModule $page->assign('links', $links); } - $page->assign('absents', $absents); $page->assign('participants', - get_event_participants($evt, $item_id, $tri, - "LIMIT ".($ofs*NB_PER_PAGE).", ".NB_PER_PAGE)); + get_event_participants($evt, $item_id, UserFilter::sortByName(), + NB_PER_PAGE, $ofs * NB_PER_PAGE)); } }