X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fxnetevents%2Fxnetevents.inc.php;h=8e069dc8b98eca5332c19b3256be09d7e1744f25;hb=16d2c88314364b5e79936f4262d453dff03abdad;hp=fe8fc4a132c7ee4251b5cf05b05d4cb659f20352;hpb=353f2d2b11c4e3c6c0bc3553813368b6f42fa9c6;p=platal.git diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index fe8fc4a..8e069dc 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -1,6 +1,6 @@ xnet->evts_domain, @@ -58,9 +62,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()); @@ -70,8 +74,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']); @@ -87,8 +91,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; @@ -97,6 +101,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) $evt['paid'] += trim($p); $evt['telepaid'] += trim($p); } + $evt['organizer'] = User::getSilent($evt['uid']); make_event_date($evt); @@ -106,7 +111,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) // }}} // {{{ function get_event_participants() -function get_event_participants(&$evt, $item_id, array $tri = array(), $count = null, $offset = null) +function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = null) { global $globals; @@ -114,14 +119,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(); @@ -141,8 +146,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) { @@ -152,8 +157,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()) { @@ -170,32 +175,32 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $count = // }}} // {{{ 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 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']; $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('INSERT IGNORE INTO virtual_redirect + VALUES ({?}, {?})', $list, $email); } } @@ -203,31 +208,47 @@ function subscribe_lists_event($participate, $uid, $evt, $paid, $payment = null) 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($payment)) { - if (is_null($participate)) { + /** 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 { + switch ($participate) { + case -1: unsubscribe($participant_list, $email); + unsubscribe($unpayed_list, $email); + unsubscribe($payed_list, $email); subscribe($absent_list, $email); - } elseif ($participate) { - subscribe($participant_list, $email); - unsubscribe($absent_list, $email); - } else { + 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; } } - if ($paid > 0) { - unsubscribe($unpayed_list, $email); - subscribe($payed_list, $email); - } else { - unsubscribe($payed_list, $email); - subscribe($unpayed_list, $email); - } } // }}} @@ -246,7 +267,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."); @@ -256,7 +277,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) { @@ -301,19 +322,19 @@ function event_change_shortname(&$page, $eid, $old, $new) 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 #groupex#.evenements_participants AS ep - LEFT JOIN #x4dat#.accounts AS a ON (ep.uid = a.uid) - LEFT JOIN #x4dat#.aliases AS al ON (al.id = a.uid AND al.type = 'a_vie') + 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 #x4dat#.accounts AS a ON (a.uid = m.uid) - LEFT JOIN #x4dat#.aliases AS al ON (al.id = a.uid AND al.type = 'a_vie') - LEFT JOIN #groupex#.evenements_participants AS ep ON (ep.uid = m.uid AND ep.eid = {?}) + 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'));