Fix xnetevents deadline check.

[platal.git] / modules / xnetevents / xnetevents.inc.php

diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index 558686b..415fefe 100644 (file)
--- a/modules/xnetevents/xnetevents.inc.php
+++ b/modules/xnetevents/xnetevents.inc.php
@@ -37,17 +37,18 @@ function get_event_order($asso_id)
 /* get the events of the given group ordered by the standard order for the group
  * @param $asso_id: group's id
  * @param $order: order to paste the events (asc or desc)
+ * @param $archive: whether to get the archived events (1) or the actuals (0)
  */
-function get_events($asso_id, $order)
+function get_events($asso_id, $order, $archive)
 {
     if ($order != 'asc' && $order != 'desc') {
         $order = 'desc';
     }
     $evts = XDB::fetchAllAssoc('eid', "SELECT ge.eid, ge.uid, ge.intitule, ge.debut, ge.fin, ge.show_participants, ge.deadline_inscription, ge.accept_nonmembre, ge.paiement_id
                                          FROM group_events as ge
-                                        WHERE asso_id = {?}
+                                        WHERE asso_id = {?} and archive = {?}
                                      ORDER BY ge.debut $order",
-                                              $asso_id);
+                                              $asso_id, $archive);
     return $evts;
 }
 // }}}
@@ -56,18 +57,25 @@ function get_events($asso_id, $order)
 /* get event details
  * @param $eid: event's id
  */
-function get_event($eid)
+function get_event(&$eid)
 {
+    if (!is_numeric($eid)) {
+        $id = XDB::fetchOneCell("SELECT eid
+                                   FROM group_events
+                                  WHERE short_name = {?}",
+                                        $eid);
+        $eid = $id;
+    }
     $evt = XDB::fetchOneAssoc('SELECT ge.uid, ge.intitule, ge.descriptif, ge.debut, ge.fin, ge.deadline_inscription, ge.accept_nonmembre, ge.paiement_id
                                          FROM group_events as ge
                                         WHERE eid = {?}',
                                         $eid);
-    if (!is_null($evt['deadline_inscription']) && strtotime($evt['deadline_inscription']) < time()) {
+    if (!is_null($evt['deadline_inscription']) && strtotime($evt['deadline_inscription']) <= time()) {
         $evt['inscr_open'] = false;
     } else {
         $evt['inscr_open'] = true;
     }
-    $evt['organizer'] = User::getSilent($evt['uid'])->profile();
+    $evt['organizer'] = User::getSilent($evt['uid']);
     $evt['date'] = make_event_date($evt['debut'], $evt['fin']);
 
     return $evt;
@@ -120,7 +128,7 @@ function get_event_telepaid($eid, $uid)
    $telepaid = XDB::fetchOneCell('SELECT SUM(pt.amount)
                                     FROM payment_transactions AS pt
                                LEFT JOIN group_events as ge ON (ge.paiement_id = pt.ref)
-                                   WHERE ge.eid = {?} AND pt.uid = {?}', 
+                                   WHERE pt.status = "confirmed" AND ge.eid = {?} AND pt.uid = {?}',
                                          $eid, $uid);
     return $telepaid;
 }
@@ -197,7 +205,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null)
 
     $montant = XDB::fetchOneCell('SELECT  SUM(amount) AS sum_amount
                                     FROM  payment_transactions AS t
-                                   WHERE  ref = {?} AND uid = {?}',
+                                   WHERE  status = "confirmed" AND ref = {?} AND uid = {?}',
                                    $evt['paiement_id'], S::v('uid'));
     $evt['telepaid'] = $montant;
     $evt['paid'] += $montant;
@@ -250,7 +258,7 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit =
         if ($money && $pay_id) {
             $montant = XDB::fetchOneCell('SELECT  SUM(amount)
                                             FROM  payment_transactions AS t
-                                           WHERE  ref = {?} AND uid = {?}',
+                                           WHERE  status = "confirmed" AND ref = {?} AND uid = {?}',
                                          $pay_id, $uid);
             $u['paid'] += $montant;
         }
@@ -300,10 +308,8 @@ function subscribe($uid, $eid, $subs = array())
     foreach ($items as $item_id => $details) {
         // check if there is an old subscription
         if (array_key_exists($item_id, $old_subs)) {
-            echo 'prev exists  ';
             // compares new and old subscription
             if ($old_subs[$item_id]['nb'] != $subs[$item_id]) {
-                echo 'different  ';
                 if ($subs[$item_id] != 0) {
                     echo "je m'inscris  ";
                     XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid)
@@ -313,7 +319,6 @@ function subscribe($uid, $eid, $subs = array())
                     $participate = true;
                     $paid_updated = true;
                 } else { // we do not store non-subscription to event items
-                    echo "je me desinscris  ";
                     XDB::execute('DELETE FROM group_event_participants
                                         WHERE eid = {?} AND uid = {?} AND item_id = {?}',
                                               $eid, $uid, $item_id);
@@ -321,9 +326,7 @@ function subscribe($uid, $eid, $subs = array())
                 $updated = true;
             }
         } else { // if no old subscription
-            echo 'no prev  ';
             if ($subs[$item_id] != 0) {
-                echo 'subscribe  ';
                 XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid)
                                    VALUES ({?}, {?}, {?}, {?}, {?}, {?})',
                                           $eid, $uid, $item_id, $subs[$item_id], '', 0);
@@ -347,7 +350,6 @@ function subscribe($uid, $eid, $subs = array())
     */
     // if subscription is updated, we have to update the event aliases
     if ($updated) {
-        echo "inscription mise a jour  ";
         $short_name = get_event_detail($eid)['short_name'];
         subscribe_lists_event($uid, $short_name, ($participate ? 1 : -1), 0);
     }