From 31dd9343a9e80c5ab2a9d9ea0fef531b5b76b03a Mon Sep 17 00:00:00 2001 From: Koen Reefman Date: Tue, 8 Aug 2023 06:12:54 +0000 Subject: [PATCH] FCLT#78796 Voorkom te lange querystring en verstuur de 'te-evalueren bb-codes' met een $.post mee in de body + ook bb-codes kunnen strippen (voor de chat overzichtslijst). svn path=/Website/trunk/; revision=61390 --- APPL/CHAT/Chatter.asp | 2 +- APPL/CHAT/ChatterAccept.asp | 12 ++++++++++-- APPL/MSG/fac_edit_nieuws.asp | 2 +- APPL/Shared/get_shared_info.asp | 26 ++++++++++++++++---------- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/APPL/CHAT/Chatter.asp b/APPL/CHAT/Chatter.asp index 259be27e5c..c4db91d66e 100644 --- a/APPL/CHAT/Chatter.asp +++ b/APPL/CHAT/Chatter.asp @@ -189,7 +189,7 @@ var msg = $("textarea#chat").val(); if (msg) { $("textarea#chat").val(""); - $.getJSON("../Shared/get_shared_info.asp", { + $.post("../Shared/get_shared_info.asp", { req_info: "eval_bb_code", fcltlinks: 1, input: msg diff --git a/APPL/CHAT/ChatterAccept.asp b/APPL/CHAT/ChatterAccept.asp index ba4988b279..7eb4153e26 100644 --- a/APPL/CHAT/ChatterAccept.asp +++ b/APPL/CHAT/ChatterAccept.asp @@ -48,7 +48,7 @@ Application.UnLock(); FcltMgr.openDetail( "appl/chat/Chatter.asp?chatsendid=" + wantId + "&prs_key=" + prs_key + "&message=" + escape(message) + "&accept=1&naam=" + naam, L("lcl_chatter_incoming").format(naam)); view_queue(); // op de achtergrond blijven refreshen } - function show_queue(data) + async function show_queue(data) { //$("#chatqueue").html("" + JSON.stringify(data, null, 4) + ""); var old_height = $("#chatqueue").height(); @@ -68,6 +68,14 @@ Application.UnLock(); for (var wantId in data.chat_queue.wanting) { var wanting = data.chat_queue.wanting[wantId]; + var stripped_message = ""; + await $.post("../Shared/get_shared_info.asp", { + req_info: "strip_bb_code", + input: wanting.message + }, function (json) { + stripped_message = json.stripped_input; + }).promise(); + if (ts && wanting.since > ts) notify_new += "\n" + I("fa-angle-right") + " " + safe.html(wanting.naam); var statustxt = ""; @@ -79,7 +87,7 @@ Application.UnLock(); var html_row = $("").append($("").text(wanting.naam)) <%=(dis_key < 0 ? '.append($("").text(wanting.dis_oms || ""))' : '')%> .append($("").text(toTimeString(new Date(wanting.since), true))) - .append($("").text(wanting.message)) + .append($("").text(stripped_message)) .append($("").text(statustxt)) .data("message", wanting.message) .data("wantid", wantId) diff --git a/APPL/MSG/fac_edit_nieuws.asp b/APPL/MSG/fac_edit_nieuws.asp index ac02b3c803..b1bf0a8cbd 100644 --- a/APPL/MSG/fac_edit_nieuws.asp +++ b/APPL/MSG/fac_edit_nieuws.asp @@ -144,7 +144,7 @@ if (allowHtml) { $('#pvtekst').html($('#ta_message').val()); FcltMgr.resized(); <% } else { %> - $.getJSON( + $.post( "../Shared/get_shared_info.asp", { req_info: "eval_bb_code", diff --git a/APPL/Shared/get_shared_info.asp b/APPL/Shared/get_shared_info.asp index 9348ad12c3..86bc4fb72d 100644 --- a/APPL/Shared/get_shared_info.asp +++ b/APPL/Shared/get_shared_info.asp @@ -22,26 +22,32 @@ var JSON_Result = true; <% -var req_info = getQParam("req_info"); +var req_info = getFParam("req_info"); var result = {}; switch (req_info) { - case "eval_bb_code": - { + case "eval_bb_code": { var params = { "file_params": { - "key": getQParamInt("key", -1), - "module": getQParam("module", "") + "key": getFParamInt("key", -1), + "module": getFParam("module", "") }, - "mldlink": getQParamInt("mldlink", 0) == 1, - "cntlink": getQParamInt("cntlink", 0) == 1, - "faqlink": getQParamInt("faqlink", 0) == 1, - "fcltlinks": getQParamInt("fcltlinks", 0) == 1 + "mldlink": getFParamInt("mldlink", 0) == 1, + "cntlink": getFParamInt("cntlink", 0) == 1, + "faqlink": getFParamInt("faqlink", 0) == 1, + "fcltlinks": getFParamInt("fcltlinks", 0) == 1 } result = { - "fclthtml": safe.fclthtml(getQParam("input"), params) + "fclthtml": safe.fclthtml(getFParam("input"), params) } + break; + } + case "strip_bb_code": { + result = { + "stripped_input": shared.stripbbcodes(getFParam("input")) + } + break; } } Response.Write(JSON.stringify(result));