admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCHD#54646 Standaard met * zoeken

Browse Source 
svn path=/Website/trunk/; revision=40865
This commit is contained in:
Erik Groener
2019-02-08 10:57:48 +00:00
parent d80efff7ef
commit 90b728a86a
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/FAC/fac.inc
View File

@@ -148,7 +148,7 @@ fac = { myfunctionssqlstring:
var fieldarr = []; var fieldarr = [];
for (var j in pfieldstrarr) 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 ") + ")"); resarr.push("(" + fieldarr.join(" OR ") + ")");
} }

15
APPL/Shared/Shared.inc
View File

@@ -1189,6 +1189,21 @@ safe = {
return "NULL"; return "NULL";
return safe.quoted_sql(tekst.toUpperCase().replace(/\*/g, "%"), maxlen); 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. // converteer alle waarden in arr naar integer.
// waar dat niet lukt worden ze gewoon verwijderd(?) // waar dat niet lukt worden ze gewoon verwijderd(?)
int_array: function (arr) int_array: function (arr)