From 90b728a86a6416262cf6b37e78e72fbec8de1724 Mon Sep 17 00:00:00 2001
From: Erik Groener <erik.groener@aareon.nl>
Date: Fri, 8 Feb 2019 10:57:48 +0000
Subject: [PATCH] PCHD#54646 Standaard met * zoeken

svn path=/Website/trunk/; revision=40865
---
 APPL/FAC/fac.inc       |  2 +-
 APPL/Shared/Shared.inc | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/APPL/FAC/fac.inc b/APPL/FAC/fac.inc
index 950b2bf1cf..0a8804c3f4 100644
--- a/APPL/FAC/fac.inc
+++ b/APPL/FAC/fac.inc
@@ -148,7 +148,7 @@ fac = {  myfunctionssqlstring:
                        var fieldarr = [];
                        for (var j in pfieldstrarr)
                        {
-                           fieldarr.push(pfieldstrarr[j] + " LIKE "+ safe.quoted_sql_wild("%"+conditions[i] + "%"));
+                           fieldarr.push(pfieldstrarr[j] + " LIKE "+ safe.quoted_sql_wild2(conditions[i]));
                        }
                        resarr.push("(" + fieldarr.join(" OR ") + ")");
                    }
diff --git a/APPL/Shared/Shared.inc b/APPL/Shared/Shared.inc
index b7ac16ffbb..104a5bc096 100644
--- a/APPL/Shared/Shared.inc
+++ b/APPL/Shared/Shared.inc
@@ -1189,6 +1189,21 @@ safe = {
             return "NULL";
         return safe.quoted_sql(tekst.toUpperCase().replace(/\*/g, "%"), maxlen);
     },
+
+    quoted_sql_wild2: function (tekst)
+    {
+        if (tekst == null)
+            return "NULL";
+        var zoektekst = tekst.toUpperCase();
+        switch (S("use_wildcard_with_suggests"))
+        {
+            case 0: break; // geen wildcard gebruiken
+            case 1: zoektekst = zoektekst + "%"; break;
+            case 2: zoektekst = "%" + zoektekst + "%"; break;
+        }
+        return safe.quoted_sql(zoektekst);
+    },
+
     // converteer alle waarden in arr naar integer.
     // waar dat niet lukt worden ze gewoon verwijderd(?)
     int_array: function (arr)