From: Anne Limoges <anne.limoges_git@polytechnique.org>
Date: Sat, 8 Mar 2014 18:50:17 +0000 (+0100)
Subject: Fix archive events.
X-Git-Tag: xorg/1.1.13~15^2~13
X-Git-Url: http://git.polytechnique.org/?p=platal.git;a=commitdiff_plain;h=13fc173cb6291233f7dfefc84d808b631f37ee98

Fix archive events.
---

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index ba8fec5..5428ab0 100644
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -155,7 +155,7 @@ class XnetEventsModule extends PLModule
                           $order, $globals->asso('id'));
         }
         $order = get_event_order($globals->asso('id'));
-        $evts = get_events($globals->asso('id'), $order);
+        $evts = get_events($globals->asso('id'), $order, $archive);
         $page->assign('order', $order);
 
         $undisplayed_events = 0;
diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index 558686b..b649ee9 100644
--- 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;
 }
 // }}}