X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=4db47105b17ef34e76b1777b9bb07da0be48d607;hb=ee22a54bf773690602e572529fa26c30917ba5c2;hp=43fa0a5d831fba25e7544aa46ce2960d65b3dd76;hpb=00ca0ad5370df5be4a0272364fb16a4385ffabfe;p=platal.git

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index 43fa0a5..4db4710 100644
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -154,8 +154,8 @@ class XnetEventsModule extends PLModule
             }
 
             $query = XDB::query(
-                "SELECT montant
-                   FROM {$globals->money->mpay_tprefix}transactions AS t
+                "SELECT amount
+                   FROM payment_transactions AS t
                  WHERE ref = {?} AND uid = {?}", $e['paiement_id'], S::v('uid'));
             $montants = $query->fetchColumn();
 
@@ -477,7 +477,7 @@ class XnetEventsModule extends PLModule
 
         // get a list of all the payment for this asso
         $res = XDB::iterator("SELECT id, text
-                                FROM {$globals->money->mpay_tprefix}paiements
+                                FROM payments
                                WHERE asso_id = {?}", $globals->asso('id'));
         $paiements = array();
         while ($a = $res->next()) $paiements[$a['id']] = $a['text']; {
@@ -540,7 +540,7 @@ class XnetEventsModule extends PLModule
         if (may_update() && Post::v('adm')) {
             S::assert_xsrf_token();
 
-            $member = get_infos(Post::v('mail'));
+            $member = User::getSilent(Post::v('mail'));
             if (!$member) {
                 $page->trigError("Membre introuvable");
             }
@@ -551,7 +551,7 @@ class XnetEventsModule extends PLModule
                                  SET paid = paid + {?}
                                WHERE uid = {?} AND eid = {?} AND item_id = 1",
                         strtr(Env::v('montant'), ',', '.'),
-                        $member['uid'], $evt['eid']);
+                        $member->uid, $evt['eid']);
             }
 
             // change the number of personns coming with a participant
@@ -559,7 +559,7 @@ class XnetEventsModule extends PLModule
                 $res = XDB::query("SELECT paid
                                      FROM group_event_participants
                                     WHERE uid = {?} AND eid = {?}",
-                                  $member['uid'], $evt['eid']);
+                                  $member->uid, $evt['eid']);
 
                 $paid = intval($res->fetchOneCell());
                 $nbs  = Post::v('nb', array());
@@ -568,17 +568,24 @@ class XnetEventsModule extends PLModule
                     $nb = max(intval($nb), 0);
                     XDB::execute("REPLACE INTO group_event_participants
                                         VALUES ({?}, {?}, {?}, {?}, {?}, {?})",
-                                  $evt['eid'], $member['uid'], $id, $nb, '', $id == 1 ? $paid : 0);
+                                  $evt['eid'], $member->uid, $id, $nb, '', $id == 1 ? $paid : 0);
                 }
 
                 $res = XDB::query("SELECT COUNT(uid) AS cnt, SUM(nb) AS nb
                                      FROM group_event_participants
                                     WHERE uid = {?} AND eid = {?}
                                  GROUP BY uid",
-                                            $member['uid'], $evt['eid']);
+                                            $member->uid, $evt['eid']);
                 $u = $res->fetchOneAssoc();
-                $u = $u['cnt'] ? $u['nb'] : null;
-                subscribe_lists_event($u, $member['uid'], $evt, $paid);
+                if ($u['cnt'] == 1 && $paid == 0 && Post::v('cancel')) {
+                    XDB::execute("DELETE FROM group_event_participants
+                                        WHERE uid = {?} AND eid = {?}",
+                                    $member->uid, $evt['eid']);
+                    $u = 0;
+                } else {
+                    $u = $u['cnt'] ? $u['nb'] : null;
+                }
+                subscribe_lists_event($u, $member->uid, $evt, $paid);
             }
 
             $evt = get_event_detail($eid, $item_id);
@@ -593,8 +600,8 @@ class XnetEventsModule extends PLModule
 
         if ($evt['paiement_id']) {
             $infos = User::getBulkUsersWithUIDs(
-                            XDB::fetchAllAssoc('SELECT  t.uid, t.montant
-                                                  FROM  ' . $globals->money->mpay_tprefix . 'transactions AS t
+                            XDB::fetchAllAssoc('SELECT  t.uid, t.amount
+                                                  FROM  payment_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']),
@@ -611,9 +618,9 @@ class XnetEventsModule extends PLModule
                                               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);
-        $nbp   = ceil($tot / NB_PER_PAGE);
+        $ofs = Env::i('offset');
+        $tot = (is_null($evt['nb_tot']) ? $evt['nb'] : $evt['nb_tot']);
+        $nbp = ceil($tot / NB_PER_PAGE);
         if ($nbp > 1) {
             $links = array();
             if ($ofs) {
@@ -622,7 +629,7 @@ class XnetEventsModule extends PLModule
             for ($i = 1 ; $i <= $nbp; $i++) {
                 $links[(string)$i] = $i - 1;
             }
-            if ($ofs < $nbp) {
+            if ($ofs < $nbp - 1) {
                 $links['suivant'] = $ofs+1;
             }
             $page->assign('links', $links);
@@ -631,7 +638,7 @@ class XnetEventsModule extends PLModule
         $page->assign('absents', $absents);
         $page->assign('participants',
                       get_event_participants($evt, $item_id, UserFilter::sortByName(),
-                                             NB_PER_PAGE, $ofs * NB_PER_PAGE));
+                                             new PLLimit(NB_PER_PAGE), $ofs * NB_PER_PAGE));
     }
 }