From 0fd968e9c77ed20fa8bac7b3c89a2df314bcfeee Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Wed, 1 Dec 2021 20:53:07 +0000 Subject: [PATCH] FCLT#69658 jQuery-mobile en diakrieten in url parameters svn path=/Website/branches/v2021.1/; revision=53967 --- APPL/PDA/cnt_list.asp | 4 ++-- APPL/PDA/ins_list.asp | 4 ++-- APPL/PDA/mld_list.asp | 6 +++--- APPL/PDA/orders_list.asp | 4 ++-- APPL/PDA/productsearch.asp | 2 +- APPL/Shared/Shared.inc | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/APPL/PDA/cnt_list.asp b/APPL/PDA/cnt_list.asp index 98dbbff560..f910b4bbaf 100644 --- a/APPL/PDA/cnt_list.asp +++ b/APPL/PDA/cnt_list.asp @@ -23,7 +23,7 @@ <% -var grp_sel = getQParamUTF("grp_sel", ""); +var grp_sel = getQParamUTF8("grp_sel", ""); var qrc = getQParamInt("qrc", 0) != 0; var subject = L("lcl_mobile_contracten"); var mantel_key = getQParamInt("mantel_key", -1); @@ -65,7 +65,7 @@ var autfunction = (urole == "fe" ? "WEB_CNTUSE" : "WEB_CNTMAN"); { var url = ""; if (grp_sel == "" && cntnum == "") - url = "../pda/cnt_list.asp?grp_sel=" + safe.urlUTF(oRs("ins_discipline_omschrijving").Value) + transitParam; + url = "../pda/cnt_list.asp?grp_sel=" + safe.urlUTF8(oRs("ins_discipline_omschrijving").Value) + transitParam; else url = "../pda/contract.asp?cnt_key=" + oRs("cnt_contract_key").Value; return url; diff --git a/APPL/PDA/ins_list.asp b/APPL/PDA/ins_list.asp index 322447373f..3746431335 100644 --- a/APPL/PDA/ins_list.asp +++ b/APPL/PDA/ins_list.asp @@ -88,7 +88,7 @@ var mld_key = getQParamInt("mld_key", -1); var afd_key = getQParamInt("afd_key", -1); var prs_key = getQParamInt("prs_key", -1); var ins_parent_key = getQParamInt("ins_parent_key", -1); -var grp_sel = getQParamUTF("grp", ""); +var grp_sel = getQParamUTF8("grp", ""); var all_grp = getQParam("cnd", (S("cnd_gebreken_srtdisc_key") > -1 ? "1" : "0")) == "1"; var qrc = getQParamInt("qrc", 0) != 0; @@ -149,7 +149,7 @@ else var url = ""; if (grp_sel == "" && !all_grp) { - url = "../pda/ins_list.asp?urole=" + urole + "&grp=" + encodeURIComponent(oRs(fronto ? "ins_groep_oms" : "ins_srtgroep_omschrijving").Value) + (ruimte_key>-1 ? "&ruimte_key="+ ruimte_key : ""); + url = "../pda/ins_list.asp?urole=" + urole + "&grp=" + safe.urlUTF8(oRs(fronto ? "ins_groep_oms" : "ins_srtgroep_omschrijving").Value) + (ruimte_key>-1 ? "&ruimte_key="+ ruimte_key : ""); } else { diff --git a/APPL/PDA/mld_list.asp b/APPL/PDA/mld_list.asp index 93332c950d..3c7d4b64a4 100644 --- a/APPL/PDA/mld_list.asp +++ b/APPL/PDA/mld_list.asp @@ -26,7 +26,7 @@ perform=false; // ???? JGL: MLD.INC gebruikt deze illegaal globaal TODO! frontend=false; var mld_key = getQParamInt("mld_key", -1, true); // Meldingnr -var searchtekst = getQParamUTF("searchtekst", "", true); // Searchtekst +var searchtekst = getQParamUTF8("searchtekst", "", true); // Searchtekst var ruimte_key = getQParamInt("ruimte_key", -1); var res_ruimte_key = getQParamInt("res_ruimte_key", -1); var rsv_ruimte_key = getQParamInt("rsv_ruimte_key", -1); // Lijst tonen van alle meldingen met dezelfde rsv_ruimte_key (reservering). @@ -91,7 +91,7 @@ var qrc = getQParamInt("qrc", 0) != 0; var meldbron_key = getQParamInt("meldbronkey", 7); var deelsrtcont_key = getQParamInt("deelsrtcont_key", -1); // nieuwe melding vanuit een controletaak -var grp_sel = getQParamUTF("grp", ""); +var grp_sel = getQParamUTF8("grp", ""); var disc_sql_prefix = disc_type == 2 ? "md2" : "md"; var subject = L("lcl_mobile_meldingen"); @@ -486,7 +486,7 @@ var canAdd = addparams && addparams.ALGwritelevel; + "&fase=" + fase + "&actiecodeFE=" + actiecodeFE + (actiecodeATT == "on" ? "&actiecodeATT=" + actiecodeATT : "") - + "&searchtekst=" + safe.urlUTF(searchtekst) + + "&searchtekst=" + safe.urlUTF8(searchtekst) for (flagkey=0; flagkey < S("mld_melding_flags"); flagkey++) { diff --git a/APPL/PDA/orders_list.asp b/APPL/PDA/orders_list.asp index 733268ef78..c5972d9651 100644 --- a/APPL/PDA/orders_list.asp +++ b/APPL/PDA/orders_list.asp @@ -27,7 +27,7 @@ <% var qrc = getQParamInt("qrc", 0) != 0; var mld_key = getQParamInt("mld_key", -1); -var grp_sel = getQParamUTF("grp", ""); +var grp_sel = getQParamUTF8("grp", ""); var own = getQParamInt("own", 0) == 1; var klus = getQParamInt("klus", 0) == 1; var disc_type = getQParamInt("grpby", 1); // 1 = Vakgroep (default), 2 = Behandelteam @@ -359,7 +359,7 @@ if (!hasParamFlag) { var col = (listmode == 2 ? "naam" : (listmode == 3 ? "plaatsmelding" : "")); if (col != "") - url = "../pda/orders_list.asp?grp=" + safe.urlUTF(oRs(col).Value) + (own? "&own=1" : "") + (klus? "&klus=1" : ""); + url = "../pda/orders_list.asp?grp=" + safe.urlUTF8(oRs(col).Value) + (own? "&own=1" : "") + (klus? "&klus=1" : ""); for (flagkey=0; flagkey < S("mld_opdracht_flags"); flagkey++) { url += ((getQParam("flag" + flagkey, "off") == "on") ? "&flag" + flagkey + "=on" : ""); diff --git a/APPL/PDA/productsearch.asp b/APPL/PDA/productsearch.asp index e6d364bcc3..07ee7922aa 100644 --- a/APPL/PDA/productsearch.asp +++ b/APPL/PDA/productsearch.asp @@ -21,7 +21,7 @@ <% var qrc = getQParamInt("qrc", 0) != 0; var urole = getQParamSafe("urole", "fe"); -var searchstr = getQParamUTF("s", ""); +var searchstr = getQParamUTF8("s", ""); var emptyitemsearch = getQParamInt("emptyitemsearch", 0); var locatie_key = getQParamInt("locatie_key", user.alg_locatie_key({withcurrent:true})); // Locatie diff --git a/APPL/Shared/Shared.inc b/APPL/Shared/Shared.inc index 17e7f4745e..0487f9b9a6 100644 --- a/APPL/Shared/Shared.inc +++ b/APPL/Shared/Shared.inc @@ -473,8 +473,8 @@ function getQParam(pName, defVal) { return _get_Param(Request.Querystring, pName, defVal); } -// Nodig binnen jQuery mobile. Gebruik tegenhanger safe.urlUTF -function getQParamUTF(pName, defVal) +// Nodig binnen jQuery mobile. Gebruik tegenhanger safe.urlUTF8 +function getQParamUTF8(pName, defVal) { return unescape(decodeURIComponent(escape(getQParam(pName, defVal)))); } @@ -1258,7 +1258,7 @@ safe = { { return Server.URLencode(safe.nvl(waarde)); }, - urlUTF: function (waarde) // Nodig binnen jQuery mobile. Gebruik tegenhanger getQParamUTF + urlUTF8: function (waarde) // Nodig binnen jQuery mobile. Gebruik tegenhanger getQParamUTF8 { return encodeURIComponent(safe.nvl(waarde)); },