From d081d3a976fa402517428faa76415f71d924e643 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 6 Mar 2008 17:56:12 +0000
Subject: [PATCH] Added enhanced patch of sladame

---
 htdocs/comm/clients.php            | 23 ++++++++++++++++-------
 htdocs/comm/prospect/prospects.php | 14 +++++++++++---
 htdocs/fourn/liste.php             | 11 ++++++++++-
 htdocs/lib/functions.inc.php       |  2 +-
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php
index afeca7ea1be..45a7965bfe9 100644
--- a/htdocs/comm/clients.php
+++ b/htdocs/comm/clients.php
@@ -45,6 +45,13 @@ $search_ville=isset($_GET["search_ville"])?$_GET["search_ville"]:$_POST["search_
 $search_code=isset($_GET["search_code"])?$_GET["search_code"]:$_POST["search_code"];
 
 
+/*
+ * view
+ */
+ 
+llxHeader();
+
+
 $sql = "SELECT s.rowid, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm, s.code_client";
 if (!$user->rights->societe->client->voir) $sql .= ", sc.fk_soc, sc.fk_user";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
@@ -69,13 +76,15 @@ if ($socname)
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="s.nom";
 
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit +1, $offset);
+// Count total nb of records
+$nbtotalofrecords = 0;
+if (empty($conf->global->DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
 
-/*
- * Affichage liste
- */
- 
-llxHeader();
+$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit +1, $offset);
 
 $result = $db->query($sql);
 if ($result)
@@ -84,7 +93,7 @@ if ($result)
   
   $param = "&amp;search_nom=".$search_nom."&amp;search_code=".$search_code."&amp;search_ville=".$search_ville;
 
-  print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num);
+  print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
   
   $i = 0;
   
diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php
index 6560e033603..7ac32a11cc6 100644
--- a/htdocs/comm/prospect/prospects.php
+++ b/htdocs/comm/prospect/prospects.php
@@ -102,7 +102,15 @@ if ($socname)
     $sortorder = "ASC";
 }
 
-$sql .= " ORDER BY $sortfield $sortorder, s.nom ASC ";
+// Count total nb of records
+$nbtotalofrecords = 0;
+if (empty($conf->global->DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql .= " ORDER BY $sortfield $sortorder, s.nom ASC";
 $sql .= $db->plimit($conf->liste_limit+1, $offset);
 
 $resql = $db->query($sql);
@@ -123,7 +131,7 @@ if ($resql)
 
     if (isset($stcomm)) $urladd.="&amp;stcomm=".$stcomm;
 
-    print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"],$urladd,$sortfield,$sortorder,'',$num);
+    print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"],$urladd,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 
     $i = 0;
 
@@ -198,7 +206,7 @@ if ($resql)
         $i++;
     }
     
-    if ($num > $conf->liste_limit) print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"],$urladd,$sortfield,$sortorder,'',$num);
+    if ($num > $conf->liste_limit || $page > 0) print_barre_liste('', $page, $_SERVER["PHP_SELF"],$urladd,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
     
     print "</table>";
     $db->free($resql);
diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php
index ee5a8c56aac..5764cb0bb9f 100644
--- a/htdocs/fourn/liste.php
+++ b/htdocs/fourn/liste.php
@@ -90,6 +90,15 @@ if ($search_ville)
 {
   $sql .= " AND s.ville LIKE '%".$search_ville."%'";
 }
+
+// Count total nb of records
+$nbtotalofrecords = 0;
+if (empty($conf->global->DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
+
 $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
 
 $resql = $db->query($sql);
@@ -100,7 +109,7 @@ if ($resql)
 
   $uadd = "&amp;cat=".$_GET["cat"];
   
-  print_barre_liste($langs->trans("ListOfSuppliers"), $page, "liste.php", $uadd, $sortfield, $sortorder, '', $num);
+  print_barre_liste($langs->trans("ListOfSuppliers"), $page, "liste.php", $uadd, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
 
   print '<form action="liste.php?cat='.$_GET["cat"].'" method="GET">';
   print '<table class="liste" width="100%">';
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 8cb6c86ebb2..15fb70e32da 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -1743,7 +1743,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 			{
 				if($cpt==$page)
 				{
-					$pagelist.= "&nbsp;".($page+1);	
+					$pagelist.= "&nbsp;<u>".($page+1).'</u>';
 				}
 				else
 				{