X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents%2Fxnetevents.inc.php;h=4f7727f152ea26bb190373e1aea129a5f6f54a77;hb=9981ccc71af6da6dc7f970d6c882f22966d72f4f;hp=d2725d47d2fd8b104cde5a4f2c26d01be1cb8fb7;hpb=00112b2e8cd1e6e37d06135e6279380f7e2aaa73;p=platal.git diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index d2725d4..4f7727f 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -1,6 +1,6 @@ asso('id'); } - $res = XDB::query( - "SELECT SUM(nb) AS nb_tot, COUNT(DISTINCT ep.uid) AS nb, e.*, - IF(e.deadline_inscription, e.deadline_inscription >= LEFT(NOW(), 10), 1) AS inscr_open, - LEFT(10, e.debut) AS first_day, LEFT(10, e.fin) AS last_day, - LEFT(NOW(), 10) AS now, ei.titre, - al.vid AS absent_list, pl.vid AS participant_list, - bl.vid AS payed_list, ul.vid AS booked_unpayed_list, - a.nom, a.prenom, a.promo, aa.alias - FROM #groupex#.evenements AS e - INNER JOIN #x4dat#.auth_user_md5 AS a ON a.user_id = e.organisateur_uid - INNER JOIN #x4dat#.aliases AS aa ON (aa.type = 'a_vie' AND aa.id = a.user_id) - INNER JOIN #groupex#.evenements_items AS ei ON (e.eid = ei.eid) - LEFT JOIN #groupex#.evenements_participants AS ep ON (e.eid = ep.eid AND ei.item_id = ep.item_id) - LEFT JOIN #x4dat#.virtual AS al ON (al.type = 'evt' AND al.alias = CONCAT(short_name, {?})) - LEFT JOIN #x4dat#.virtual AS pl ON (pl.type = 'evt' AND pl.alias = CONCAT(short_name, {?})) - LEFT JOIN #x4dat#.virtual AS bl ON (bl.type = 'evt' AND bl.alias = CONCAT(short_name, {?})) - LEFT JOIN #x4dat#.virtual AS ul ON (ul.type = 'evt' AND ul.alias = CONCAT(short_name, {?})) - WHERE (e.eid = {?} OR e.short_name = {?}) AND ei.item_id = {?} AND e.asso_id = {?} - GROUP BY ei.item_id", - '-absents@' . $globals->xnet->evts_domain, - '-participants@' . $globals->xnet->evts_domain, - '-paye@' . $globals->xnet->evts_domain, - '-participants-non-paye@' . $globals->xnet->evts_domain, - $eid, $eid, $item_id ? $item_id : 1, $asso_id); - - $evt = $res->fetchOneAssoc(); + if (!$item_id) { + $where = ''; + $group_by = 'e.eid'; + } else { + $where = XDB::format(' AND ei.item_id = {?}', $item_id); + $group_by = 'ei.item_id'; + } + $evt = XDB::fetchOneAssoc('SELECT SUM(nb) AS nb_tot, COUNT(DISTINCT ep.uid) AS nb, e.*, SUM(IF(nb > 0, 1, 0)) AS user_count, + IF(e.deadline_inscription, + e.deadline_inscription >= LEFT(NOW(), 10), + 1) AS inscr_open, + LEFT(e.debut, 10) AS first_day, LEFT(e.fin, 10) AS last_day, + LEFT(NOW(), 10) AS now, + ei.titre, e.subscription_notification + FROM group_events AS e + INNER JOIN group_event_items AS ei ON (e.eid = ei.eid) + LEFT JOIN group_event_participants AS ep ON(e.eid = ep.eid AND ei.item_id = ep.item_id) + WHERE (e.eid = {?} OR e.short_name = {?}) AND e.asso_id = {?}' . $where . ' + GROUP BY ' . $group_by, + $eid, $eid, $asso_id); if (!$evt) { return null; @@ -63,28 +57,27 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) // smart calculation of the total number if (!$item_id) { - $res = XDB::query( - "SELECT MAX(nb) - FROM #groupex#.evenements AS e - INNER JOIN #groupex#.evenements_items AS ei ON (e.eid = ei.eid) - LEFT JOIN #groupex#.evenements_participants AS ep - ON (e.eid = ep.eid AND ei.item_id = ep.item_id) - WHERE e.eid = {?} - GROUP BY ep.uid", $evt['eid']); + $res = XDB::query('SELECT MAX(nb) + FROM group_events AS e + INNER JOIN group_event_items AS ei ON (e.eid = ei.eid) + LEFT JOIN group_event_participants AS ep ON (e.eid = ep.eid AND ei.item_id = ep.item_id) + WHERE e.eid = {?} + GROUP BY ep.uid', $evt['eid']); $evt['nb_tot'] = array_sum($res->fetchColumn()); $evt['titre'] = ''; $evt['item_id'] = 0; + $evt['csv_name'] = urlencode($evt['intitule']); + } else { + $evt['csv_name'] = urlencode($evt['intitule'] . '.' . $evt['titre']); } - $res = XDB::query( - "SELECT titre, details, montant, ei.item_id, nb, ep.paid, FIND_IN_SET('notify_payment', ep.flags) AS notify_payment - 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'), $evt['eid']); - $evt['moments'] = $res->fetchAllAssoc(); - + $evt['moments'] = XDB::fetchAllAssoc('SELECT titre, details, montant, ei.item_id, nb, + ep.paid, FIND_IN_SET(\'notify_payment\', ep.flags) AS notify_payment + 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 uid = {?}) + WHERE ei.eid = {?}', + S::i('uid'), $evt['eid']); $evt['topay'] = 0; $evt['paid'] = 0; $evt['notify_payment'] = false; @@ -93,110 +86,79 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) if ($m['montant']) { $evt['money'] = true; } - $evt['paid'] = $m['paid']; + $evt['paid'] += $m['paid']; $evt['notify_payment'] = $evt['notify_payment'] || $m['notify_payment']; } - $req = XDB::query( - "SELECT montant - FROM {$globals->money->mpay_tprefix}transactions AS t - WHERE ref = {?} AND uid = {?}", $evt['paiement_id'], S::v('uid')); - $montants = $req->fetchColumn(); - - $evt['telepaid'] = 0; - foreach ($montants as $m) { - $p = strtr(substr($m, 0, strpos($m, 'EUR')), ',', '.'); - $evt['paid'] += trim($p); - $evt['telepaid'] += trim($p); - } + $montant = XDB::fetchOneCell('SELECT SUM(amount) AS sum_amount + FROM payment_transactions AS t + WHERE ref = {?} AND uid = {?}', + $evt['paiement_id'], S::v('uid')); + $evt['telepaid'] = $montant; + $evt['paid'] += $montant; + $evt['organizer'] = User::getSilent($evt['uid']); make_event_date($evt); + $evt['show_participants'] = ($evt['show_participants'] && $GLOBALS['IS_XNET_SITE'] && (is_member() || may_update())); + return $evt; } // }}} // {{{ function get_event_participants() -function get_event_participants(&$evt, $item_id, $tri, $limit = '') { +function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = null, $offset = 0) +{ global $globals; - if (Env::has('initiale')) { - $where = 'AND IF(u.nom IS NULL, m.nom, - IF(u.nom_usage<>"", u.nom_usage, u.nom)) - LIKE "'.addslashes(Env::v('initiale')).'%"'; - } else { - $where = ''; - } - $eid = $evt['eid']; $money = $evt['money'] && (function_exists('may_update')) && may_update(); $pay_id = $evt['paiement_id']; - $query = - "SELECT IF(m.origine != 'X',m.nom,IF(u.nom_usage<>'', u.nom_usage, u.nom)) AS nom, - IF(m.origine != 'X',m.prenom,u.prenom) AS prenom, - IF(m.origine != 'X','extérieur',u.promo) AS promo, - IF(m.origine != 'X' OR u.perms = 'pending',m.email,a.alias) AS email, - IF(m.origine != 'X',m.sexe,FIND_IN_SET('femme', u.flags)) AS femme, - m.perms='admin' AS admin, - (m.origine = 'X' OR m.origine IS NULL) AS x, - ep.uid, SUM(ep.paid) AS paid, SUM(ep.nb) AS nb, - FIND_IN_SET('notify_payment', ep.flags) AS notify_payment - 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 #x4dat#.auth_user_md5 AS u ON ( u.user_id = ep.uid ) - LEFT JOIN #x4dat#.aliases AS a ON ( a.id = ep.uid AND a.type='a_vie' ) - WHERE ep.eid = {?} - ".(($item_id)?" AND item_id = $item_id":"")." - $where - GROUP BY ep.uid - ORDER BY $tri $limit"; + $append = $item_id ? XDB::format(' AND ep.item_id = {?}', $item_id) : ''; + $query = XDB::fetchAllAssoc('uid', 'SELECT ep.uid, SUM(ep.paid) AS paid, SUM(ep.nb) AS nb, + FIND_IN_SET(\'notify_payment\', ep.flags) AS notify_payment + FROM group_event_participants AS ep + WHERE ep.eid = {?} AND nb > 0 ' . $append . ' + GROUP BY ep.uid', $eid); + $uf = new UserFilter(new PFC_True(), $tri); + $users = User::getBulkUsersWithUIDs($uf->filter(array_keys($query), new PlLimit($limit, $offset))); + $tab = array(); + foreach ($users as $user) { + $uid = $user->id(); + $tab[$uid] = $query[$uid]; + $tab[$uid]['user'] = $user; + } if ($item_id) { - $res = XDB::query($query, $eid); - return $res->fetchAllAssoc(); + return $tab; } - $res = XDB::iterator($query, $eid); - $tab = array(); - $user = 0; - $evt['adminpaid'] = 0; $evt['telepaid'] = 0; $evt['topay'] = 0; $evt['paid'] = 0; - while ($u = $res->next()) { - if ($u['nb'] == 0) { - continue; - } - $u['adminpaid'] = $u['paid']; + foreach ($tab as $uid=>&$u) { + $u['adminpaid'] = (float)$u['paid']; $u['montant'] = 0; if ($money && $pay_id) { - $res_ = XDB::query( - "SELECT montant - FROM {$globals->money->mpay_tprefix}transactions AS t - WHERE ref = {?} AND uid = {?}", - $pay_id, $u['uid']); - $montants = $res_->fetchColumn(); - foreach ($montants as $m) { - $p = strtr(substr($m, 0, strpos($m, "EUR")), ",", "."); - $u['paid'] += trim($p); - } + $montant = XDB::fetchOneCell('SELECT SUM(amount) + FROM payment_transactions AS t + WHERE ref = {?} AND uid = {?}', + $pay_id, $uid); + $u['paid'] += $montant; } $u['telepayment'] = $u['paid'] - $u['adminpaid']; - $res_ = XDB::iterator( - "SELECT ep.nb, ep.item_id, ei.montant - FROM #groupex#.evenements_participants AS ep - INNER JOIN #groupex#.evenements_items AS ei ON (ei.eid = ep.eid AND ei.item_id = ep.item_id) - WHERE ep.eid = {?} AND ep.uid = {?}", - $eid, $u['uid']); + $res_ = XDB::iterator('SELECT ep.nb, ep.item_id, ei.montant + FROM group_event_participants AS ep + INNER JOIN group_event_items AS ei ON (ei.eid = ep.eid AND ei.item_id = ep.item_id) + WHERE ep.eid = {?} AND ep.uid = {?}', + $eid, $uid); while ($i = $res_->next()) { $u[$i['item_id']] = $i['nb']; $u['montant'] += $i['montant']*$i['nb']; } - $tab[] = $u; $evt['telepaid'] += $u['telepayment']; $evt['adminpaid'] += $u['adminpaid']; $evt['paid'] += $u['paid']; @@ -207,71 +169,69 @@ function get_event_participants(&$evt, $item_id, $tri, $limit = '') { // }}} // {{{ function subscribe_lists_event() -function subscribe_lists_event($participate, $uid, $evt, $paid, $payment = null) +/** Subscribes user to various event related mailing lists. + * + * @param $uid: user's id. + * @param short_name: event's short_name, which corresponds to the beginning of the emails. + * @param participate: indicates if the user takes part at the event or not; + * -1 means he did not answer, 0 means no, and 1 means yes. + * @param paid: has the user already payed anything? + * 0 means no, a positive amount means yes. + * @param payment: is this function called from a payment page? + * If true, only payment related lists should be updated. + */ +function subscribe_lists_event($uid, $short_name, $participate, $paid, $payment = false) { global $globals; - $page =& Platal::page(); - - $participant_list = $evt['participant_list']; - $absent_list = $evt['absent_list']; - $unpayed_list = $evt['booked_unpayed_list']; - $payed_list = $evt['payed_list']; + require_once 'emails.inc.php'; - $user = User::getSilent($uid); - if ($user) { - $email = $user->forlifeEmail(); - } else { - $res = XDB::query("SELECT email - FROM #groupex#.membres - WHERE uid = {?} AND asso_id = {?}", - $uid, $globals->asso('id')); - $email = $res->fetchOneCell(); + if (is_null($short_name)) { + return; } - function subscribe($list, $email) - { - if ($list && $email) { - XDB::execute("REPLACE INTO virtual_redirect - VALUES ({?},{?})", - $list, $email); + /** If $payment is not null, we do not retrieve the value of $participate, + * thus we do not alter participant and absent lists. + */ + if ($payment === true) { + if ($paid > 0) { + delete_from_list_alias($uid, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); + add_to_list_alias($uid, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); } - } - - function unsubscribe($list, $email) - { - if ($list && $email) { - XDB::execute("DELETE FROM virtual_redirect - WHERE vid = {?} AND redirect = {?}", - $list, $email); - } - } - - if (is_null($payment)) { - if (is_null($participate)) { - unsubscribe($participant_list, $email); - subscribe($absent_list, $email); - } elseif ($participate) { - subscribe($participant_list, $email); - unsubscribe($absent_list, $email); - } else { - unsubscribe($participant_list, $email); - unsubscribe($absent_list, $email); - } - } - if ($paid > 0) { - unsubscribe($unpayed_list, $email); - subscribe($payed_list, $email); } else { - unsubscribe($payed_list, $email); - subscribe($unpayed_list, $email); + switch ($participate) { + case -1: + delete_from_list_alias($uid, $short_name . $globals->xnet->participant_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); + add_to_list_alias($uid, $short_name . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); + break; + case 0: + delete_from_list_alias($uid, $short_name . $globals->xnet->participant_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); + break; + case 1: + add_to_list_alias($uid, $short_name . $globals->xnet->participant_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); + if ($paid > 0) { + delete_from_list_alias($uid, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); + add_to_list_alias($uid, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); + } else { + add_to_list_alias($uid, $short_name . $globals->xnet->unpayed_list, $globals->xnet->evts_domain, 'event'); + delete_from_list_alias($uid, $short_name . $globals->xnet->payed_list, $globals->xnet->evts_domain, 'event'); + } + break; + } } } // }}} // {{{ function event_change_shortname() -function event_change_shortname(&$page, $eid, $old, $new) +function event_change_shortname($page, $eid, $old, $new) { global $globals; + require_once 'emails.inc.php'; if (is_null($old)) { $old = ''; @@ -283,7 +243,7 @@ function event_change_shortname(&$page, $eid, $old, $new) et qu'il ne contient que des lettres non accentuées, des chiffres ou les caractères - et ."); return $old; - } elseif ($new && ctype_digit($new)) { + } elseif ($new && (is_int($new) || ctype_digit($new))) { $page->trigError("Le raccourci demandé ne peut être accepté car il ne contient que des chiffres. Rajoute-lui par exemple une lettre."); @@ -293,7 +253,7 @@ function event_change_shortname(&$page, $eid, $old, $new) //vérifier que l'alias n'est pas déja pris if ($new && $old != $new) { $res = XDB::query('SELECT COUNT(*) - FROM #groupex#.evenements + FROM group_events WHERE short_name = {?}', $new); if ($res->fetchOneCell() > 0) { @@ -308,13 +268,13 @@ function event_change_shortname(&$page, $eid, $old, $new) if ($old && $new) { // if had a previous shortname change the old lists - foreach (array('-absents@', '-participants@', '-paye@', '-participants-non-paye@') as $v) { - $v .= $globals->xnet->evts_domain; - XDB::execute("UPDATE virtual - SET alias = {?} - WHERE type = 'evt' AND alias = {?}", - $new . $v, $old . $v); + foreach (explode(',', $globals->xnet->event_lists) as $suffix) { + XDB::execute('UPDATE email_virtual + SET email = {?} + WHERE type = \'event\' AND email = {?}', + $new . $suffix, $old . $suffix); } + return $new; } @@ -322,53 +282,41 @@ function event_change_shortname(&$page, $eid, $old, $new) // if we have a first new short_name create the lists $lastid = array(); $where = array( - '-participants@' => 'ep.nb > 0', - '-paye@' => 'ep.paid > 0', - '-participants-non-paye@' => 'ep.nb > 0 AND ep.paid = 0' + $globals->xnet->participant_list => 'g.nb > 0', + $globals->xnet->payed_list => '(g.paid > 0 OR p.amount > 0)', + $globals->xnet->unpayed_list => 'g.nb > 0 AND g.paid = 0 AND p.amount IS NULL' ); - foreach (array('-absents@', '-participants@', '-paye@', '-participants-non-paye@') as $v) { - XDB::execute("INSERT INTO virtual - SET type = 'evt', alias = {?}", - $new . $v . $globals->xnet->evts_domain); - - $lastid[$v] = XDB::insertId(); + foreach (array($globals->xnet->participant_list, $globals->xnet->payed_list, $globals->xnet->unpayed_list) as $suffix) { + $uids = XDB::fetchColumn('SELECT g.uid + FROM group_event_participants AS g + INNER JOIN group_events AS e ON (g.eid = e.eid) + LEFT JOIN payment_transactions AS p ON (e.paiement_id = p.ref AND g.uid = p.uid) + WHERE g.eid = {?} AND ' . $where[$suffix], + $eid); + foreach ($uids as $uid) { + add_to_list_alias($uid, $new . $suffix, $globals->xnet->evts_domain, 'event'); + } } - foreach (array('-participants@', '-paye@', '-participants-non-paye@') as $v) { - XDB::execute("INSERT IGNORE INTO virtual_redirect ( - SELECT {?} AS vid, IF(a.alias IS NULL, m.email, CONCAT(a.alias, {?})) AS redirect - FROM #groupex#.evenements_participants AS ep - LEFT JOIN #groupex#.membres AS m ON (ep.uid = m.uid) - LEFT JOIN #x4dat#.auth_user_md5 AS u ON (u.user_id = ep.uid) - LEFT JOIN #x4dat#.aliases AS a ON (a.id = ep.uid AND a.type = 'a_vie') - WHERE ep.eid = {?} AND " . $where[$v] . " - GROUP BY ep.uid)", - $lastid[$v], '@' . $globals->mail->domain, $eid); + $uids = XDB::fetchColumn('SELECT m.uid + FROM group_members AS m + LEFT JOIN group_event_participants AS e ON (e.uid = m.uid AND e.eid = {?}) + WHERE m.asso_id = {?} AND e.uid IS NULL', + $eid, $globals->asso('id')); + foreach ($uids as $uid) { + add_to_list_alias($uid, $new . $globals->xnet->absent_list, $globals->xnet->evts_domain, 'event'); } - XDB::execute("INSERT IGNORE INTO virtual_redirect ( - SELECT {?} AS vid, IF(a.alias IS NULL, m.email, CONCAT(a.alias, {?})) AS redirect - FROM #groupex#.membres AS m - LEFT JOIN #groupex#.evenements_participants AS ep ON (ep.uid = m.uid AND ep.eid = {?}) - LEFT JOIN #x4dat#.auth_user_md5 AS u ON (u.user_id = m.uid) - LEFT JOIN #x4dat#.aliases AS a ON (a.id = m.uid AND a.type = 'a_vie') - WHERE m.asso_id = {?} AND ep.uid IS NULL - GROUP BY m.uid)", - $lastid['-absents@'], '@' . $globals->mail->domain, $eid, $globals->asso('id')); return $new; } if ($old && !$new) { // if we delete the old short name, delete the lists - foreach (array('-absents@', '-participants@', '-paye@', '-participants-non-paye@') as $v) { - $v .= $globals->xnet->evts_domain; - XDB::execute("DELETE virtual, virtual_redirect - FROM virtual - LEFT JOIN virtual_redirect USING(vid) - WHERE virtual.alias = {?}", - $infos['short_name'] . $v); + foreach (explode(',', $globals->xnet->event_lists) as $suffix) { + delete_list_alias($old . $suffix, $globals->xnet->evts_domain); } + return $new; } @@ -382,9 +330,8 @@ function make_event_date(&$e) { $start = strtotime($e['debut']); $end = strtotime($e['fin']); - $first_day = strtotime($e['first_day']); - $last_day = strtotime($e['last_day']); - unset($e['debut'], $e['fin'], $e['first_day'], $e['last_day']); + $first_day = $e['first_day']; + $last_day = $e['last_day']; $date = ""; if ($start && $end != $start) {