From 0df42bc5eacefb3673ec80230e01942636d6d5af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Oct 2015 19:37:49 +0200
Subject: [PATCH] FIX Filter on status of thirdparty list and bad encoding of
 url

---
 htdocs/comm/prospect/list.php |  1 +
 htdocs/societe/list.php       | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 5d795775eb4..7259cff218e 100644
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -468,6 +468,7 @@ if ($resql)
 	$reshook=$hookmanager->executeHooks('printFieldListSearch',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
+	// Status
     print '<td class="liste_titre" align="right">';
     print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
     print '</td>';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 281746fe824..b97fd8397d4 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -55,6 +55,7 @@ $search_categ=trim(GETPOST("search_categ"));
 $mode=GETPOST("mode");
 $modesearch=GETPOST("mode_search");
 $search_type=trim(GETPOST('search_type'));
+$search_status=GETPOST("search_status",'int');
 
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
@@ -172,8 +173,11 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_idprof3='';
 	$search_idprof4='';
 	$search_type='';
+	$search_status='';
 }
 
+if ($search_status=='') $search_status=1; // always display active thirdparty first
+
 if ($socname)
 {
 	$search_nom=$socname;
@@ -234,6 +238,7 @@ if ($search_idprof6)  $sql .= " AND s.idprof6 LIKE '%".$db->escape($search_idpro
 if ($search_type > 0 && in_array($search_type,array('1,3','2,3'))) $sql .= " AND s.client IN (".$db->escape($search_type).")";
 if ($search_type > 0 && in_array($search_type,array('4')))         $sql .= " AND s.fournisseur = 1";
 if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0";
+if ($search_status!='') $sql .= " AND s.status = ".$db->escape($search_status);
 if (!empty($conf->barcode->enabled) && $sbarcode) $sql.= " AND s.barcode LIKE '%".$db->escape($sbarcode)."%'";
 // Add where from hooks
 $parameters=array();
@@ -257,13 +262,14 @@ if ($resql)
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	$params = "&amp;socname=".htmlspecialchars($socname)."&amp;search_nom=".htmlspecialchars($search_nom)."&amp;search_town=".htmlspecialchars($search_town);
-	$params.= ($sbarcode?"&amp;sbarcode=".htmlspecialchars($sbarcode):"");
-	$params.= '&amp;search_idprof1='.htmlspecialchars($search_idprof1);
-	$params.= '&amp;search_idprof2='.htmlspecialchars($search_idprof2);
-	$params.= '&amp;search_idprof3='.htmlspecialchars($search_idprof3);
-	$params.= '&amp;search_idprof4='.htmlspecialchars($search_idprof4);
-
+	$params = "&amp;socname=".urlencode($socname)."&amp;search_nom=".urlencode($search_nom)."&amp;search_town=".urlencode($search_town);
+	$params.= ($sbarcode?"&amp;sbarcode=".urlencode($sbarcode):"");
+	$params.= '&amp;search_idprof1='.urlencode($search_idprof1);
+	$params.= '&amp;search_idprof2='.urlencode($search_idprof2);
+	$params.= '&amp;search_idprof3='.urlencode($search_idprof3);
+	$params.= '&amp;search_idprof4='.urlencode($search_idprof4);
+    if ($search_status != '') $params.='&amp;search_status='.urlencode($search_status);
+    
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies');
 
     // Show delete result message
@@ -391,7 +397,9 @@ if ($resql)
     print $hookmanager->resPrint;
 
     // Status
-    print '<td></td>';
+    print '<td class="liste_titre" align="right">';
+    print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
+    print '</td>';
 
 	print '<td class="liste_titre" align="right">';
 	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';