X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents%2Fxnetevents.inc.php;h=91bb45e3377db0f3c0bac6d7848db8aae5230712;hb=853ff307303faf861396c4e22dbaa56114366751;hp=57cffaf4d09afaae83d8f0170d8e72a9b6d0b54a;hpb=d1e6167749fdad08c81e23d09e1bbbf76e3b989b;p=platal.git diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index 57cffaf..91bb45e 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -1,6 +1,6 @@ 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(); @@ -56,9 +61,9 @@ 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) + 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()); @@ -68,8 +73,8 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) $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 groupex.evenements_items AS ei - LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = ei.eid AND ep.item_id = ei.item_id + 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']); @@ -85,8 +90,8 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) $evt['notify_payment'] = $evt['notify_payment'] || $m['notify_payment']; } - $montants = XDB::fetchColumn('SELECT montant - FROM ' . $globals->money->mpay_tprefix . 'transactions AS t + $montants = XDB::fetchColumn('SELECT amount + FROM payment_transactions AS t WHERE ref = {?} AND uid = {?}', $evt['paiement_id'], S::v('uid')); $evt['telepaid'] = 0; @@ -112,14 +117,14 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $count = $money = $evt['money'] && (function_exists('may_update')) && may_update(); $pay_id = $evt['paiement_id']; - $append = $item_id ? XDB::foramt(' AND ep.item_id = {?}', $item_id) : ''; + $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 groupex.evenements_participants AS ep + FROM group_event_participants AS ep WHERE ep.eid = {?} AND nb > 0 ' . $append . ' GROUP BY ep.uid', $eid); - $uf = new UserFilter(new UFC_True(), $tri); - $users = User::getBulkUsersWithUIDs($uf->filter(array_keys($query), $count, $offset)); + $uf = new UserFilter(new PFC_True(), $tri); + $users = User::getBulkUsersWithUIDs($uf->filter(array_keys($query), new PlLimit($count, $offset))); $tab = array(); foreach ($users as $user) { $uid = $user->id(); @@ -139,8 +144,8 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $count = $u['adminpaid'] = $u['paid']; $u['montant'] = 0; if ($money && $pay_id) { - $montants = XDB::fetchColumn('SELECT montant - FROM ' . $globals->money->mpay_tprefix . 'transactions AS t + $montants = XDB::fetchColumn('SELECT amount + FROM payment_transactions AS t WHERE ref = {?} AND uid = {?}', $pay_id, $uid); foreach ($montants as $m) { @@ -150,8 +155,8 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $count = } $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) + 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()) { @@ -168,30 +173,32 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $count = // }}} // {{{ function subscribe_lists_event() -function subscribe_lists_event($participate, $uid, $evt) +/** 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 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, $evt, $participate, $paid, $payment = false) { - global $globals; - $page =& Platal::page(); - - $participant_list = $evt['participant_list']; - $absent_list = $evt['absent_list']; + $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); - 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(); - } + $email = $user->forlifeEmail(); function subscribe($list, $email) { if ($list && $email) { - XDB::execute("REPLACE INTO virtual_redirect - VALUES ({?},{?})", + XDB::execute('REPLACE INTO virtual_redirect + VALUES ({?}, {?})', $list, $email); } } @@ -199,21 +206,46 @@ function subscribe_lists_event($participate, $uid, $evt) function unsubscribe($list, $email) { if ($list && $email) { - XDB::execute("DELETE FROM virtual_redirect - WHERE vid = {?} AND redirect = {?}", + XDB::execute('DELETE FROM virtual_redirect + WHERE vid = {?} AND redirect = {?}', $list, $email); } } - if (is_null($participate)) { - unsubscribe($participant_list, $email); - subscribe($absent_list, $email); - } elseif ($participate) { - subscribe($participant_list, $email); - unsubscribe($absent_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) { + unsubscribe($unpayed_list, $email); + subscribe($payed_list, $email); + } } else { - unsubscribe($participant_list, $email); - unsubscribe($absent_list, $email); + switch ($participate) { + case -1: + unsubscribe($participant_list, $email); + unsubscribe($unpayed_list, $email); + unsubscribe($payed_list, $email); + subscribe($absent_list, $email); + break; + case 0: + unsubscribe($participant_list, $email); + unsubscribe($absent_list, $email); + unsubscribe($unpayed_list, $email); + unsubscribe($payed_list, $email); + break; + case 1: + subscribe($participant_list, $email); + unsubscribe($absent_list, $email); + if ($paid > 0) { + unsubscribe($unpayed_list, $email); + subscribe($payed_list, $email); + } else { + subscribe($unpayed_list, $email); + unsubscribe($payed_list, $email); + } + break; + } } } // }}} @@ -233,7 +265,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."); @@ -243,7 +275,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) { @@ -258,56 +290,65 @@ function event_change_shortname(&$page, $eid, $old, $new) if ($old && $new) { // if had a previous shortname change the old lists - foreach (array('-absents@', '-participants@') as $v) { + 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); + XDB::execute("UPDATE virtual + SET alias = {?} + WHERE type = 'evt' AND alias = {?}", + $new . $v, $old . $v); } return $new; } if (!$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' + ); + + 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(); + } - XDB::execute("INSERT INTO virtual SET type = 'evt', alias = {?}", - $new.'-participants@'.$globals->xnet->evts_domain); - - $lastid = XDB::insertId(); - XDB::execute('INSERT IGNORE INTO virtual_redirect ( - SELECT {?} AS vid, IF(al.alias IS NULL, a.email, CONCAT(al.alias, {?})) AS redirect - FROM groupex.evenements_participants AS ep - LEFT JOIN accounts AS a ON (ep.uid = a.uid) - LEFT JOIN aliases AS al ON (al.id = a.uid AND al.type = \'a_vie\') - WHERE ep.eid = {?} AND ep.nb > 0 - GROUP BY ep.uid)', - $lastid, '@'.$globals->mail->domain, $eid); - - XDB::execute("INSERT INTO virtual SET type = 'evt', alias = {?}", - $new.'-absents@'.$globals->xnet->evts_domain); - - $lastid = XDB::insertId(); + 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); + } XDB::execute("INSERT IGNORE INTO virtual_redirect ( SELECT {?} AS vid, IF(al.alias IS NULL, a.email, CONCAT(al.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 accounts AS a ON (a.uid = m.uid) - LEFT JOIN aliases AS al ON (al.id = a.uid AND al.type = 'a_vie') + 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, "@".$globals->mail->domain, $eid, $globals->asso('id')); + $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@') as $v) { + 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); + XDB::execute("DELETE virtual, virtual_redirect + FROM virtual + LEFT JOIN virtual_redirect USING(vid) + WHERE virtual.alias = {?}", + $infos['short_name'] . $v); } return $new; }