From 7e0a1651319ddd4869f8306b3eb095ab775f236b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jul 2017 20:33:25 +0200
Subject: [PATCH] Fix some pb in search using phone
---
htdocs/contact/list.php | 76 ++++++++++---------------------
htdocs/core/lib/functions.lib.php | 2 +-
htdocs/societe/list.php | 53 +++++++++++----------
3 files changed, 53 insertions(+), 78 deletions(-)
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 1293a258fab..a0f7ae9a87d 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -48,12 +48,14 @@ if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'contact', $contactid,'');
$sall=GETPOST('sall', 'alphanohtml');
+$search_cti=preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml'))); // Phone number without any special chars
+$search_phone=GETPOST("search_phone");
+
$search_firstlast_only=GETPOST("search_firstlast_only");
$search_lastname=GETPOST("search_lastname");
$search_firstname=GETPOST("search_firstname");
$search_societe=GETPOST("search_societe");
$search_poste=GETPOST("search_poste");
-$search_phone=GETPOST("search_phone");
$search_phone_perso=GETPOST("search_phone_perso");
$search_phone_pro=GETPOST("search_phone_pro");
$search_phone_mobile=GETPOST("search_phone_mobile");
@@ -272,53 +274,25 @@ if ($search_categ > 0) $sql.= " AND cc.fk_categorie = ".$db->escape($search_ca
if ($search_categ == -2) $sql.= " AND cc.fk_categorie IS NULL";
if ($search_categ_thirdparty > 0) $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ_thirdparty);
if ($search_categ_thirdparty == -2) $sql.= " AND cs.fk_categorie IS NULL";
-if ($search_categ_supplier > 0) $sql.= " AND cs2.fk_categorie = ".$db->escape($search_categ_supplier);
-if ($search_categ_supplier == -2) $sql.= " AND cs2.fk_categorie IS NULL";
-
-if ($search_firstlast_only) {
- $sql .= natural_search(array('p.lastname','p.firstname'), $search_firstlast_only);
-}
-if ($search_lastname) { // filter on lastname
- $sql .= natural_search('p.lastname', $search_lastname);
-}
-if ($search_firstname) { // filter on firstname
- $sql .= natural_search('p.firstname', $search_firstname);
-}
-if ($search_societe) { // filtre sur la societe
- $sql .= natural_search('s.nom', $search_societe);
-}
-if (strlen($search_poste)) { // filtre sur la societe
- $sql .= natural_search('p.poste', $search_poste);
-}
-if (strlen($search_phone))
-{
- $sql .= " AND (p.phone LIKE '%".$db->escape($search_phone)."%' OR p.phone_perso LIKE '%".$db->escape($search_phone)."%' OR p.phone_mobile LIKE '%".$db->escape($search_phone)."%')";
-}
-if (strlen($search_phone_perso))
-{
- $sql .= " AND p.phone_perso LIKE '%".$db->escape($search_phone_perso)."%'";
-}
-if (strlen($search_phone_pro))
-{
- $sql .= " AND p.phone LIKE '%".$db->escape($search_phone_pro)."%'";
-}
-if (strlen($search_phone_mobile))
-{
- $sql .= " AND p.phone_mobile LIKE '%".$db->escape($search_phone_mobile)."%'";
-}
-if (strlen($search_fax))
-{
- $sql .= " AND p.fax LIKE '%".$db->escape($search_fax)."%'";
-}
-if (strlen($search_email)) // filtre sur l'email
-{
- $sql .= " AND p.email LIKE '%".$db->escape($search_email)."%'";
-}
-if (strlen($search_skype)) // filtre sur skype
-{
- $sql .= " AND p.skype LIKE '%".$db->escape($search_skype)."%'";
-}
-if ($search_status != '' && $search_status >= 0) $sql .= " AND p.statut = ".$db->escape($search_status);
+if ($search_categ_supplier > 0) $sql.= " AND cs2.fk_categorie = ".$db->escape($search_categ_supplier);
+if ($search_categ_supplier == -2) $sql.= " AND cs2.fk_categorie IS NULL";
+
+if ($sall) $sql.= natural_search(array_keys($fieldstosearchall), $sall);
+if (strlen($search_phone)) $sql.= natural_search(array('p.phone', 'p.phone_perso', 'p.phone_mobile'), $search_phone);
+if (strlen($search_cti)) $sql.= natural_search(array('p.phone', 'p.phone_perso', 'p.phone_mobile'), $search_cti);
+if (strlen($search_firstlast_only)) $sql.= natural_search(array('p.lastname', 'p.firstname'), $search_firstlast_only);
+
+if ($search_lastname) $sql.= natural_search('p.lastname', $search_lastname);
+if ($search_firstname) $sql.= natural_search('p.firstname', $search_firstname);
+if ($search_societe) $sql.= natural_search('s.nom', $search_societe);
+if (strlen($search_poste)) $sql.= natural_search('p.poste', $search_poste);
+if (strlen($search_phone_perso)) $sql.= natural_search('p.phone_perso', $search_phone_perso);
+if (strlen($search_phone_pro)) $sql.= natural_search('p.phone', $search_phone);
+if (strlen($search_phone_mobile)) $sql.= natural_search('p.phone_mobile', $search_phone_mobile);
+if (strlen($search_fax)) $sql.= natural_search('p.phone_fax', $search_fax);
+if (strlen($search_skype)) $sql.= natural_search('p.skype', $search_skype);
+if (strlen($search_email)) $sql.= natural_search('p.email', $search_email);
+if ($search_status != '' && $search_status >= 0) $sql.= " AND p.statut = ".$db->escape($search_status);
if ($type == "o") // filtre sur type
{
$sql .= " AND p.fk_soc IS NULL";
@@ -335,10 +309,6 @@ else if ($type == "p") // filtre sur type
{
$sql .= " AND s.client IN (2, 3)";
}
-if ($sall)
-{
- $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-}
if (! empty($socid))
{
$sql .= " AND s.rowid = ".$socid;
@@ -391,7 +361,7 @@ $num = $db->num_rows($result);
$arrayofselected=is_array($toselect)?$toselect:array();
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
+if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($sall != '' || $seearch_cti != ''))
{
$obj = $db->fetch_object($resql);
$id = $obj->rowid;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index de07281696a..34439edab0b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6173,7 +6173,7 @@ function dol_getmypid()
* or like "keyword1|keyword2" = We want record field like keyword1 OR field like keyword2
* If param $mode is 1, can contains an operator <, > or = like "<10" or ">=100.5 < 1000"
* If param $mode is 2, can contains a list of id separated by comma like "1,3,4"
- * @param integer $mode 0=value is list of keywords, 1=value is a numeric test (Example ">5.5 <10"), 2=value is a list of id separated with comma (Example '1,3,4')
+ * @param integer $mode 0=value is list of keyword strings, 1=value is a numeric test (Example ">5.5 <10"), 2=value is a list of id separated with comma (Example '1,3,4')
* @param integer $nofirstand 1=Do not output the first 'AND'
* @return string $res The statement to append to the SQL query
*/
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index f7a479b8ddf..6896685f4fc 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -49,6 +49,8 @@ if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user,'societe',$socid,'');
$search_all=trim(GETPOST('sall', 'alphanohtml'));
+$search_cti=preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml'))); // Phone number without any special chars
+
$search_nom=trim(GETPOST("search_nom"));
$search_alias=trim(GETPOST("search_alias"));
$search_nom_only=trim(GETPOST("search_nom_only"));
@@ -401,39 +403,42 @@ if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql.= "
$sql.= " WHERE s.fk_stcomm = st.id";
$sql.= " AND s.entity IN (".getEntity('societe').")";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
-if ($search_sale) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+if ($socid) $sql.= " AND s.rowid = ".$socid;
+if ($search_sale) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
-if ($search_sale) $sql.= " AND sc.fk_user = ".$db->escape($search_sale);
-if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ);
-if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
-if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
-if ($search_nom) $sql.= natural_search("s.nom",$search_nom);
-if ($search_alias) $sql.= natural_search("s.name_alias",$search_alias);
-if ($search_nom_only) $sql.= natural_search("s.nom",$search_nom_only);
+if ($search_sale) $sql.= " AND sc.fk_user = ".$db->escape($search_sale);
+if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ);
+if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
+
+if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
+if (strlen($search_cti)) $sql.= natural_search('s.phone', $search_cti);
+
+if ($search_nom) $sql.= natural_search("s.nom",$search_nom);
+if ($search_alias) $sql.= natural_search("s.name_alias",$search_alias);
+if ($search_nom_only) $sql.= natural_search("s.nom",$search_nom_only);
if ($search_customer_code) $sql.= natural_search("s.code_client",$search_customer_code);
if ($search_supplier_code) $sql.= natural_search("s.code_fournisseur",$search_supplier_code);
if ($search_account_customer_code) $sql.= natural_search("s.code_compta",$search_account_customer_code);
if ($search_account_supplier_code) $sql.= natural_search("s.code_compta_fournisseur",$search_account_supplier_code);
-if ($search_town) $sql.= natural_search("s.town",$search_town);
-if ($search_zip) $sql.= natural_search("s.zip",$search_zip);
-if ($search_state) $sql.= natural_search("state.nom",$search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_email) $sql.= natural_search("s.email",$search_email);
-if ($search_phone) $sql.= natural_search("s.phone",$search_phone);
-if ($search_url) $sql.= natural_search("s.url",$search_url);
-if ($search_idprof1) $sql.= natural_search("s.siren",$search_idprof1);
-if ($search_idprof2) $sql.= natural_search("s.siret",$search_idprof2);
-if ($search_idprof3) $sql.= natural_search("s.ape",$search_idprof3);
-if ($search_idprof4) $sql.= natural_search("s.idprof4",$search_idprof4);
-if ($search_idprof5) $sql.= natural_search("s.idprof5",$search_idprof5);
-if ($search_idprof6) $sql.= natural_search("s.idprof6",$search_idprof6);
+if ($search_town) $sql.= natural_search("s.town",$search_town);
+if (strlen($search_zip)) $sql.= natural_search("s.zip",$search_zip);
+if ($search_state) $sql.= natural_search("state.nom",$search_state);
+if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
+if ($search_email) $sql.= natural_search("s.email",$search_email);
+if (strlen($search_phone)) $sql.= natural_search("s.phone", $search_phone);
+if ($search_url) $sql.= natural_search("s.url",$search_url);
+if (strlen($search_idprof1)) $sql.= natural_search("s.siren",$search_idprof1);
+if (strlen($search_idprof2)) $sql.= natural_search("s.siret",$search_idprof2);
+if (strlen($search_idprof3)) $sql.= natural_search("s.ape",$search_idprof3);
+if (strlen($search_idprof4)) $sql.= natural_search("s.idprof4",$search_idprof4);
+if (strlen($search_idprof5)) $sql.= natural_search("s.idprof5",$search_idprof5);
+if (strlen($search_idprof6)) $sql.= natural_search("s.idprof6",$search_idprof6);
// Filter on type of thirdparty
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!='' && $search_status >= 0) $sql .= " AND s.status = ".$db->escape($search_status);
-if (!empty($conf->barcode->enabled) && $search_barcode) $sql.= " AND s.barcode LIKE '%".$db->escape($search_barcode)."%'";
+if (!empty($conf->barcode->enabled) && $search_barcode) $sql.= natural_search("s.barcode", $search_barcode);
if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
if ($search_levels) $sql .= " AND s.fk_prospectlevel IN (".$search_levels.')';
if ($search_stcomm != '' && $search_stcomm != -2) $sql.= natural_search("s.fk_stcomm",$search_stcomm,2);
@@ -478,7 +483,7 @@ $num = $db->num_rows($resql);
$arrayofselected=is_array($toselect)?$toselect:array();
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && $action != 'list')
+if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($search_all != '' || $search_cti != '') && $action != 'list')
{
$obj = $db->fetch_object($resql);
$id = $obj->rowid;
--
GitLab