From e14069654a64b00afcec4d312c81c827d3c5f411 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 14 Feb 2010 16:14:00 +0100
Subject: [PATCH] Fix some errors on X.net.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 modules/xnet.php               | 24 ++++++++++++------------
 modules/xnetgrp.php            |  4 ++--
 templates/xnetgrp/annuaire.tpl |  2 +-
 templates/xnetgrp/edit.tpl     |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/xnet.php b/modules/xnet.php
index aafe36e..0d11b05 100644
--- a/modules/xnet.php
+++ b/modules/xnet.php
@@ -142,34 +142,34 @@ class XnetModule extends PLModule
         $page->setType('plan');
 
         $res = XDB::iterator(
-                'SELECT  dom.id, dom.nom as domnom, asso.diminutif, asso.nom
-                   FROM  group_dom
-             INNER JOIN  groups ON dom.id = asso.dom
-                  WHERE  FIND_IN_SET("GroupesX", dom.cat) AND FIND_IN_SET("GroupesX", asso.cat)
-               ORDER BY  dom.nom, asso.nom');
+                'SELECT  dom.id, dom.nom as domnom, groups.diminutif, groups.nom
+                   FROM  group_dom AS dom
+             INNER JOIN  groups ON dom.id = groups.dom
+                  WHERE  FIND_IN_SET("GroupesX", dom.cat) AND FIND_IN_SET("GroupesX", groups.cat)
+               ORDER BY  dom.nom, groups.nom');
         $groupesx = array();
         while ($tmp = $res->next()) { $groupesx[$tmp['id']][] = $tmp; }
         $page->assign('groupesx', $groupesx);
 
         $res = XDB::iterator(
-                'SELECT  dom.id, dom.nom as domnom, asso.diminutif, asso.nom
-                   FROM  group_dom
-             INNER JOIN  groups ON dom.id = asso.dom
-                  WHERE  FIND_IN_SET("Binets", dom.cat) AND FIND_IN_SET("Binets", asso.cat)
-               ORDER BY  dom.nom, asso.nom');
+                'SELECT  dom.id, dom.nom as domnom, groups.diminutif, groups.nom
+                   FROM  group_dom AS dom
+             INNER JOIN  groups ON dom.id = groups.dom
+                  WHERE  FIND_IN_SET("Binets", dom.cat) AND FIND_IN_SET("Binets", groups.cat)
+               ORDER BY  dom.nom, groups.nom');
         $binets = array();
         while ($tmp = $res->next()) { $binets[$tmp['id']][] = $tmp; }
         $page->assign('binets', $binets);
 
         $res = XDB::iterator(
-                'SELECT  asso.diminutif, asso.nom
+                'SELECT  diminutif, nom
                    FROM  groups
                   WHERE  cat LIKE "%Promotions%"
                ORDER BY  diminutif');
         $page->assign('promos', $res);
 
         $res = XDB::iterator(
-                'SELECT  asso.diminutif, asso.nom
+                'SELECT  diminutif, nom
                    FROM  groups
                   WHERE  FIND_IN_SET("Institutions", cat)
                ORDER BY  diminutif');
diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 248b4a1..e56eb83 100644
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -324,7 +324,7 @@ class XnetGrpModule extends PLModule
         } else {
             $uf = $globals->asso()->getMembers(null, $se);
         }
-        $users = $uf->getUsers(NB_PER_PAGE, $ofs * NB_PER_PAGE);
+        $users = $uf->getUsers(new PlLimit(NB_PER_PAGE, $ofs * NB_PER_PAGE));
         $count = $uf->getTotalCount();
 
         $page->assign('pages', floor(($count + NB_PER_PAGE - 1) / NB_PER_PAGE));
@@ -694,7 +694,7 @@ class XnetGrpModule extends PLModule
                 $cond->addChild(new UFC_Promo('=', UserFilter::GRADE_ING, Env::i('promo')));
             }
             $uf = new UserFilter($cond);
-            $users = $uf->getUsers(30);
+            $users = $uf->getUsers(new PlLimit(30));
             if ($uf->getTotalCount() > 30) {
                 $page->assign('too_many', true);
                 $users = array();
diff --git a/templates/xnetgrp/annuaire.tpl b/templates/xnetgrp/annuaire.tpl
index 6170e15..1ecffae 100644
--- a/templates/xnetgrp/annuaire.tpl
+++ b/templates/xnetgrp/annuaire.tpl
@@ -34,7 +34,7 @@ Le groupe {$asso->nom} compte {$nb_tot} membres&nbsp;:
       Ajouter un membre
     </a>
   </li>
-  {if $asso.has_ml}
+  {if $asso->has_ml}
   <li>
     <a href="{$platal->ns}admin/annuaire">
       {icon name=wand title="Synchroniser"} 
diff --git a/templates/xnetgrp/edit.tpl b/templates/xnetgrp/edit.tpl
index 0363add..08e98f6 100644
--- a/templates/xnetgrp/edit.tpl
+++ b/templates/xnetgrp/edit.tpl
@@ -78,7 +78,7 @@
     </tr>
     <tr>
       <td class="titre center" colspan="2">
-        <label><input type="checkbox" value="1" name="ax" {if $asso.ax}checked="checked"{/if} />
+        <label><input type="checkbox" value="1" name="ax" {if $asso->ax}checked="checked"{/if} />
         groupe agréé par l'AX</label>
       </td>
     </tr>
-- 
2.1.4