X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp%2Ffeed.inc.php;h=0e98197a998c670aa15951a10032d3ab4b65d7ab;hb=c9566e01c2add8f12a858abe0fbb0bc6b8e3c0d4;hp=d179c9ec74b2af6d77e12cb378f4c564897ba6f7;hpb=4f247453ac4a734953df893117b72168c60dd22e;p=platal.git

diff --git a/modules/xnetgrp/feed.inc.php b/modules/xnetgrp/feed.inc.php
index d179c9e..0e98197 100644
--- a/modules/xnetgrp/feed.inc.php
+++ b/modules/xnetgrp/feed.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -23,7 +23,7 @@ class UserFilterIterator implements PlIterator
 {
     private $it;
     private $user;
-    public function __construct(PlIterator &$it, PlUser &$user)
+    public function __construct(PlIterator $it, PlUser $user)
     {
         $this->it =& $it;
         $this->user =& $user;
@@ -67,27 +67,27 @@ class XnetGrpEventFeed extends PlFeed
                             $url,
                             'L\'actualité du groupe ' . $name,
                             $url . '/logo',
-                            'xnetgrp/feed.tpl');
+                            'xnetgrp/announce-rss.tpl');
     }
 
-    protected function fetch(PlUser &$user)
+    protected function fetch(PlUser $user)
     {
         global $globals;
         if (!is_null($user)) {
             return new UserFilterIterator(
-                   XDB::iterator("SELECT  a.id, a.titre AS title, a.texte, a.contacts,
-                                          a.create_date AS publication,
-                                          FIND_IN_SET('photo', a.flags) AS photo,
-                                          CONCAT({?}, '/#art', a.id) AS link
-                                    FROM  groupex.announces AS a
-                                   WHERE  peremption >= NOW() AND a.asso_id = {?}",
+                   XDB::iterator("SELECT  id, titre AS title, texte, contacts,
+                                          create_date AS publication,
+                                          FIND_IN_SET('photo', flags) AS photo,
+                                          CONCAT({?}, '/#art', id) AS link
+                                    FROM  group_announces
+                                   WHERE  expiration >= NOW() AND asso_id = {?}",
                                    $this->link, $globals->asso('id'), $user));
         } else {
-            return  XDB::iterator("SELECT  a.id, a.titre AS title, a.texte, a.create_date AS publication,
-                                           CONCAT({?}, '/#art', a.id) AS link,
+            return  XDB::iterator("SELECT  id, titre AS title, texte, create_date AS publication,
+                                           CONCAT({?}, '/#art', id) AS link,
                                            NULL AS photo, NULL AS contacts
-                                     FROM  groupex.announces AS a
-                                    WHERE  FIND_IN_SET('public', a.flags) AND peremption >= NOW() AND a.asso_id = {?}",
+                                     FROM  group_announces
+                                    WHERE  FIND_IN_SET('public', flags) AND expiration >= NOW() AND asso_id = {?}",
                                   $this->link, $globals->asso('id'));
         }
     }