From d5caceceb1b896de7def0a61eccc382d808b5ff0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 26 Nov 2006 07:10:57 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20La=20navigation=20page=20suivante=20sur?=
 =?UTF-8?q?=20la=20liste=20des=20adh=E9rents=20en=20fonctionnait=20pas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/adherents/liste.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php
index c66aa256974..78f731d8295 100644
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.php
@@ -48,7 +48,7 @@ $sortorder=$_GET["sortorder"];
 $sortfield=$_GET["sortfield"];
 $page=$_GET["page"];
 $filter=$_GET["filter"];
-$statut=isset($_GET["statut"])?$_GET["statut"]:1;
+$statut=isset($_GET["statut"])?$_GET["statut"]:'';
 
 if (! $sortorder) {  $sortorder="ASC"; }
 if (! $sortfield) {  $sortfield="d.nom"; }
@@ -89,7 +89,8 @@ if ($filter == 'outofdate')
 {
     $sql.=" AND datefin < sysdate()";
 }
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset);
+$sql.= " ORDER BY $sortfield $sortorder";
+$sql.= " ".$db->plimit($conf->liste_limit+1, $offset);
 
 $result = $db->query($sql);
 if ($result) 
@@ -116,11 +117,12 @@ if ($result)
         $titre.=" (".$objp->type.")";
     }
 
-    print_barre_liste($titre, $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield",$sortfield,$sortorder,'',$num);
+    $param="";
+    if (isset($_GET["statut"])) $param.="&statut=$statut";
+    print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num);
 
     print "<table class=\"noborder\" width=\"100%\">";
 
-    $param="&page=$page".(isset($_GET["statut"])?"&statut=$statut":"");
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),"liste.php","d.nom",$param,"","",$sortfield);
     print_liste_field_titre($langs->trans("Type"),"liste.php","t.libelle",$param,"","",$sortfield);
@@ -204,11 +206,15 @@ if ($result)
         print "</tr>";
         $i++;
     }
-    print "</table><br>\n";
+    print "</table>\n";
 
-    print "<table class=\"noborder\" width=\"100%\">";
-    print_barre_liste("", $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield",$sortfield,$sortorder,'',$num);
-    print "</table><br>\n";
+	if ($num > $conf->liste_limite)
+	{
+	    print "<table class=\"noborder\" width=\"100%\">";
+	    print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield",$sortfield,$sortorder,'',$num);
+	    print "</table><br>\n";
+	}
+	print "<br>";
 }
 else
 {