Implements a url-shortener (Closes #1042).

[platal.git] / modules / xnetgrp / feed.inc.php

diff --git a/modules/xnetgrp/feed.inc.php b/modules/xnetgrp/feed.inc.php
index b049f6a..0e98197 100644 (file)
--- a/modules/xnetgrp/feed.inc.php
+++ b/modules/xnetgrp/feed.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 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;
@@ -70,7 +70,7 @@ class XnetGrpEventFeed extends PlFeed
                             'xnetgrp/announce-rss.tpl');
     }
 
-    protected function fetch(PlUser &$user)
+    protected function fetch(PlUser $user)
     {
         global $globals;
         if (!is_null($user)) {
@@ -80,14 +80,14 @@ class XnetGrpEventFeed extends PlFeed
                                           FIND_IN_SET('photo', flags) AS photo,
                                           CONCAT({?}, '/#art', id) AS link
                                     FROM  group_announces
-                                   WHERE  peremption >= NOW() AND asso_id = {?}",
+                                   WHERE  expiration >= NOW() AND asso_id = {?}",
                                    $this->link, $globals->asso('id'), $user));
         } else {
             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  group_announces
-                                    WHERE  FIND_IN_SET('public', flags) AND peremption >= NOW() AND asso_id = {?}",
+                                    WHERE  FIND_IN_SET('public', flags) AND expiration >= NOW() AND asso_id = {?}",
                                   $this->link, $globals->asso('id'));
         }
     }