X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents%2Fxnetevents.inc.php;h=c60b938622745786692358fdf4adeb46f9603d51;hb=e48b1c7608e5d3c833395646715cecfba834f9cc;hp=feabfdb694a9bd51ae274f1527c16bb1b38783ff;hpb=cecdf74795e71ed038411915dad5e0dff6ea51fa;p=platal.git diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index feabfdb..c60b938 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 start_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, - pyl.vid AS payed_list, bl.vid AS booked_unpayed_list - 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) - LEFT JOIN virtual AS al ON(al.type = \'evt\' AND al.alias = CONCAT(short_name, {?})) - LEFT JOIN virtual AS pl ON(pl.type = \'evt\' AND pl.alias = CONCAT(short_name, {?})) - LEFT JOIN virtual AS pyl ON(pyl.type = \'evt\' AND pyl.alias = CONCAT(short_name, {?})) - LEFT JOIN virtual AS bl ON(bl.type = \'evt\' AND bl.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(); + $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(10, e.debut) AS start_day, LEFT(10, e.fin) 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 ei.item_id = {?} AND e.asso_id = {?} + GROUP BY ei.item_id', + $eid, $eid, $item_id ? $item_id : 1, $asso_id); if (!$evt) { return null; @@ -90,27 +80,25 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) $evt['notify_payment'] = $evt['notify_payment'] || $m['notify_payment']; } - $montants = XDB::fetchColumn('SELECT amount + $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'] = 0; - foreach ($montants as $m) { - $p = strtr(substr($m, 0, strpos($m, 'EUR')), ',', '.'); - $evt['paid'] += trim($p); - $evt['telepaid'] += trim($p); - } + $evt['telepaid'] = $montant; + $evt['paid'] += $montant; $evt['organizer'] = User::getSilent($evt['uid']); make_event_date($evt); + $evt['show_participants'] = ($evt['show_participants'] && (is_member() || may_update())); + return $evt; } // }}} // {{{ function get_event_participants() -function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = null) +function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = null, $offset = 0) { global $globals; @@ -125,7 +113,7 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = 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($count, $offset))); + $users = User::getBulkUsersWithUIDs($uf->filter(array_keys($query), new PlLimit($limit, $offset))); $tab = array(); foreach ($users as $user) { $uid = $user->id(); @@ -145,14 +133,11 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = $u['adminpaid'] = $u['paid']; $u['montant'] = 0; if ($money && $pay_id) { - $montants = XDB::fetchColumn('SELECT amount + $montant = XDB::fetchOneCell('SELECT SUM(amount) FROM payment_transactions AS t WHERE ref = {?} AND uid = {?}', $pay_id, $uid); - foreach ($montants as $m) { - $p = strtr(substr($m, 0, strpos($m, "EUR")), ",", "."); - $u['paid'] += trim($p); - } + $u['paid'] += $montant; } $u['telepayment'] = $u['paid'] - $u['adminpaid']; $res_ = XDB::iterator('SELECT ep.nb, ep.item_id, ei.montant @@ -177,7 +162,7 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = /** Subscribes user to various event related mailing lists. * * @param $uid: user's id. - * @param evt: events data, in particular ids of the lists at stake. + * @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? @@ -185,32 +170,13 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = * @param payment: is this function called from a payment page? * If true, only payment related lists should be updated. */ -function subscribe_lists_event($uid, $evt, $participate, $paid, $payment = false) +function subscribe_lists_event($uid, $short_name, $participate, $paid, $payment = false) { - $participant_list = $evt['participant_list']; - $absent_list = $evt['absent_list']; - $unpayed_list = $evt['booked_unpayed_list']; - $payed_list = $evt['payed_list']; - - $user = User::getSilent($uid); - $email = $user->forlifeEmail(); - - function subscribe($list, $email) - { - if ($list && $email) { - XDB::execute('REPLACE INTO virtual_redirect - VALUES ({?}, {?})', - $list, $email); - } - } + global $globals; + require_once 'emails.inc.php'; - function unsubscribe($list, $email) - { - if ($list && $email) { - XDB::execute('DELETE FROM virtual_redirect - WHERE vid = {?} AND redirect = {?}', - $list, $email); - } + if (is_null($short_name)) { + return; } /** If $payment is not null, we do not retrieve the value of $participate, @@ -218,32 +184,32 @@ function subscribe_lists_event($uid, $evt, $participate, $paid, $payment = false */ if ($payment === true) { if ($paid > 0) { - unsubscribe($unpayed_list, $email); - subscribe($payed_list, $email); + 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 { switch ($participate) { case -1: - unsubscribe($participant_list, $email); - unsubscribe($unpayed_list, $email); - unsubscribe($payed_list, $email); - subscribe($absent_list, $email); + 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: - unsubscribe($participant_list, $email); - unsubscribe($absent_list, $email); - unsubscribe($unpayed_list, $email); - unsubscribe($payed_list, $email); + 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: - subscribe($participant_list, $email); - unsubscribe($absent_list, $email); + 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) { - unsubscribe($unpayed_list, $email); - subscribe($payed_list, $email); + 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 { - subscribe($unpayed_list, $email); - unsubscribe($payed_list, $email); + 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; } @@ -252,9 +218,10 @@ function subscribe_lists_event($uid, $evt, $participate, $paid, $payment = false // }}} // {{{ 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 = ''; @@ -291,13 +258,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; } @@ -305,52 +272,38 @@ 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 => 'nb > 0', + $globals->xnet->payed_list => 'paid > 0', + $globals->xnet->unpayed_list => 'nb > 0 AND paid = 0' ); - 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 uid + FROM group_event_participants + WHERE 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(al.alias IS NULL, a.email, CONCAT(al.alias, {?})) AS redirect - FROM group_event_participants AS ep - LEFT JOIN accounts AS a ON (ep.uid = a.uid) - LEFT JOIN aliases AS al ON (al.uid = a.uid AND al.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(al.alias IS NULL, a.email, CONCAT(al.alias, {?})) AS redirect - FROM group_members AS m - LEFT JOIN accounts AS a ON (a.uid = m.uid) - LEFT JOIN aliases AS al ON (al.uid = a.uid AND al.type = 'a_vie') - LEFT JOIN group_event_participants AS ep ON (ep.uid = m.uid AND ep.eid = {?}) - 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; }