From 9e11332d8279e0b7cf9799a90947c57cfa0c4f68 Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Mon, 10 Nov 2014 13:25:20 +0000 Subject: [PATCH] Versie 5.4.3 Gold A patches svn path=/Website/trunk/; revision=23291 --- APPL/API/api.inc | 3 +- APPL/API/api_SOAP.asp | 4 +- APPL/API/api_XMLNode.asp | 6 +-- APPL/API/api_besordsoap.asp | 8 ++-- APPL/API/api_bessoap.asp | 26 +++++------ APPL/API/api_bezsoap.asp | 4 +- APPL/API/api_cntsoap.asp | 4 +- APPL/API/api_gen_import.asp | 2 +- APPL/API/api_inssoap.asp | 8 ++-- APPL/API/api_mldsoap.asp | 10 ++--- APPL/API/api_opdrsoap.asp | 10 ++--- APPL/API/api_ressoap.asp | 10 ++--- APPL/API2/api2.inc | 8 ++-- APPL/API2/model_invoicelines.inc | 23 ---------- APPL/API2/model_invoices.inc | 3 +- APPL/API2/model_issues.inc | 1 - APPL/BES/DynArtikelInfo.asp | 8 ++-- APPL/BES/bes_edit_bestelling_save.asp | 2 +- APPL/BES/voorraadInfo.asp | 4 +- APPL/BEZ/bez_edit_bezoekers_save.inc | 10 +++-- APPL/CAD/cad_tekening_list.inc | 2 +- APPL/CARE/custfunctions.wsc | 2 +- APPL/FAC/fac_edit_xsl_save.asp | 2 +- APPL/FAC/fac_verify.inc | 17 +++---- APPL/IMP/imp_shared.js | 4 +- APPL/INS/ins_inspect.asp | 3 +- APPL/INS/ins_inspect_list.asp | 2 + APPL/INS/ins_inspect_save.asp | 6 ++- APPL/INS/ins_list.inc | 3 ++ APPL/MLD/mld.inc | 2 +- APPL/MLD/mld_edit_opdr.asp | 1 - APPL/MLD/mld_show_opdr.js | 4 +- APPL/MLD/mld_stdmelding.asp | 44 +++++++++--------- APPL/MLD/mld_stdmelding_search_list.asp | 2 + APPL/MLD/opdr_close_confirm.asp | 2 +- APPL/MLD/opdr_close_save.asp | 2 +- APPL/MLD/order_mail.asp | 6 +-- APPL/PDA/order.asp | 2 +- APPL/PRS/pchange.asp | 5 +++ APPL/PRS/prs_edit_bedrijfadres.asp | 2 +- APPL/PRS/prs_edit_dienstlocs.asp | 21 ++++++--- APPL/PRS/prs_locdienst_list.asp | 60 +++++++++++++++++++------ APPL/PRS/prs_show_bedrijfadres.asp | 2 +- APPL/QVW/qv_ticket.inc | 2 +- APPL/RES/res_bez_oproep.asp | 3 +- APPL/RES/res_cat.inc | 2 +- APPL/RES/res_edit_objcat_save.asp | 3 +- APPL/RES/res_list.inc | 8 ++-- APPL/RES/res_multi_create.asp | 2 +- APPL/RES/res_plan.js | 6 +-- APPL/RES/res_show_rsv_ruimte.asp | 10 +++-- APPL/Shared/Login.inc | 3 +- APPL/Shared/Shared.inc | 7 +++ APPL/Shared/contactpersoonselector.inc | 7 ++- APPL/Shared/default.inc | 2 +- APPL/Shared/discxalg3d.inc | 2 +- APPL/Shared/header.inc | 12 ++++- APPL/Shared/iface.inc | 2 +- APPL/Shared/kenmerk_common.inc | 17 ++++--- APPL/Shared/locale.inc | 2 +- APPL/Shared/resultset_table_v2.inc | 9 ++-- APPL/Shared/save2db.inc | 35 +++++++++------ APPL/Shared/xml_converter.inc | 54 +++++----------------- APPL/SlnkDwf/ToonIMG.asp | 2 +- 64 files changed, 288 insertions(+), 252 deletions(-) diff --git a/APPL/API/api.inc b/APPL/API/api.inc index 5330d5fb2e..24f435bfb6 100644 --- a/APPL/API/api.inc +++ b/APPL/API/api.inc @@ -26,7 +26,8 @@ function API_func(APIname, APIKEY) var sql2 = "SELECT prs_perslid_key, prs_perslid_naam" + " FROM prs_perslid" - + " WHERE prs_perslid_apikey = " + safe.quoted_sql(APIKEY); + + " WHERE prs_perslid_apikey = " + safe.quoted_sql(APIKEY) + + " AND prs_perslid_verwijder IS NULL"; // Eigenlijk zou de trigger APIKEY moeten wissen bij verwijderen var oRs2 = Oracle.Execute(sql2); if (oRs2.Eof) { diff --git a/APPL/API/api_SOAP.asp b/APPL/API/api_SOAP.asp index 0c1212037e..92b86859e6 100644 --- a/APPL/API/api_SOAP.asp +++ b/APPL/API/api_SOAP.asp @@ -55,7 +55,7 @@ try var asJSON = getQParam("json","0")!="0"; - var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); xmlReq.load(Request); if (API.apidata.loglevel) __Log2File(xmlReq.xml, APIname + "_IN"); @@ -318,7 +318,7 @@ try // op van het resultaat,dus maar zonder de metadata, dus alleen de facilitor/[resultnode]/ if (stylesheet == null) { - var xmldoc = new ActiveXObject("Msxml2.DOMDocument.4.0"); + var xmldoc = new ActiveXObject("Msxml2.DOMDocument.6.0"); xmldoc.async = false; xmldoc.loadXML(xml_content); if (xmldoc.parseError.errorCode != 0) diff --git a/APPL/API/api_XMLNode.asp b/APPL/API/api_XMLNode.asp index 8e651c0086..c0d4bfbf39 100644 --- a/APPL/API/api_XMLNode.asp +++ b/APPL/API/api_XMLNode.asp @@ -44,7 +44,7 @@ var API = new API_func(APIname, APIKEY); Session("logging") = API.apidata.loglevel||0; - var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); xmlReq.load(Request); XML2TEMP(xmlReq.xml, "IN"); @@ -75,7 +75,7 @@ var oRsW = Oracle.Execute(whichSQL); var xml_nodes_arr = []; - var xml_nodes_dom = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var xml_nodes_dom = new ActiveXObject("MSXML2.DOMDocument.6.0"); var FCLTElement = xml_nodes_dom.createElement("facilitor"); var headerDone = false; @@ -104,7 +104,7 @@ __Log("XML '" + oRsW("xmlnode").Value + "' voor key " + oRsW("fac_tracking_refkey").Value + " is " + xml_content.length + " karakters"); xml_nodes_arr.push(xml_content); // Eén node - var xmldoc = new ActiveXObject("Msxml2.DOMDocument.4.0"); + var xmldoc = new ActiveXObject("Msxml2.DOMDocument.6.0"); xmldoc.async = false; xmldoc.loadXML(xml_content); xmldoc.setProperty("SelectionLanguage", "XPath"); diff --git a/APPL/API/api_besordsoap.asp b/APPL/API/api_besordsoap.asp index e1fa5b3b3c..9dd821e347 100644 --- a/APPL/API/api_besordsoap.asp +++ b/APPL/API/api_besordsoap.asp @@ -35,15 +35,15 @@ var sql = "-"; // De uiteindelijke update-sql var resultcode = -1; /* Zolang deze -1 is, is het nog goed. Uiteindelijk eindigt het met 0 (als goed). */ var resulttekst = ""; - var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); if (API.apidata.stylesheet) { - var iXsl = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0"); if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) ) { API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason); } - var inputXML = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0"); inputXML.load(Request); inputXML.transformNodeToObject(iXsl, xmlReq); } @@ -52,7 +52,7 @@ if (API.apidata.loglevel) __Log2File(xmlReq.xml, APIname + "_TUSSEN"); - var xmlResp = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"")) // The response diff --git a/APPL/API/api_bessoap.asp b/APPL/API/api_bessoap.asp index acf7f31a71..1bbe547bae 100644 --- a/APPL/API/api_bessoap.asp +++ b/APPL/API/api_bessoap.asp @@ -33,22 +33,22 @@ var API = new API_func(APIname, APIKEY); var tsql = "-"; // Voor tijdelijke statement(s) var sql = "-"; // De uiteindelijke insert/update-sql - var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); if (API.apidata.stylesheet) { - var iXsl = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0"); if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) ) { API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason); } - var inputXML = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0"); inputXML.load(Request); inputXML.transformNodeToObject(iXsl, xmlReq); } else xmlReq.load(Request); - var xmlResp = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"")) // The response. @@ -84,20 +84,20 @@ { var resultcode = -1; /* Zolang deze -1 is, is het nog goed. Uiteindelijk eindigt het met 0 (als goed). */ var resulttekst = ""; - + // Lees per node de (optionele) tags en waarden. var fields = []; // Bij te werken velden. var besid = bestellingen[i].getAttribute("key"); // Bij type=update/delete var besaction = bestellingen[i].getAttribute("type").toLowerCase(); var nwStatus = XMLval(bestellingen[i], "status"); - + if (besid == null) { // Voorkom problemen als key-attribuut ontbreekt! besid = ''; } var bestelling_key = parseInt(besid, 10); // En anders bepaald bij insert! - + user.checkAutorisation("WEB_BESUSE"); // Dit is nog ongeacht de reservering - + if (besaction == 'insert') { resultcode = 999; resulttekst = "Insert unsupported"; @@ -139,7 +139,7 @@ var oRs = Oracle.Execute(sql); if (!oRs.eof) { curStatus = oRs("bes_bestelling_status").value; - + // Feitelijke UPDATE status. // BESFIT: alleen vanuit status 2 if (nwStatus == "BESFIT") { @@ -209,13 +209,13 @@ resultcode = 3; resulttekst = "Ongeldige status "+nwStatus; } - + } else { resultcode = 4; resulttekst = "Ongedefinieerde huidige status"; } } // nwStatus != null - + if (resultcode == -1) { // nog steeds geen fouten resultcode = 0; // Ik heb gedaan wat ik moest en mocht doen voor deze bestelling. } @@ -245,7 +245,7 @@ datum: nowtxt, // TODO: Beter ook xml-datum??? besid: besid } - + var FCLTBody = xmlResp.createElement("bestelling"); // type=response FCLTBody.setAttribute('key', besid); FCLTBody.setAttribute('type', 'response'); @@ -265,7 +265,7 @@ //__DoLog("Ik gebruik stylesheet '"+API.apidata.stylesheet+"'"); if (API.apidata.stylesheet) { - var outputXML = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var outputXML = Server.CreateObject("MSXML2.DOMDocument.6.0"); xmlResp.transformNodeToObject(iXsl, outputXML); Response.ContentType = "text/xml"; Response.Write(outputXML.xml) diff --git a/APPL/API/api_bezsoap.asp b/APPL/API/api_bezsoap.asp index c0d23d2aa5..40deab067e 100644 --- a/APPL/API/api_bezsoap.asp +++ b/APPL/API/api_bezsoap.asp @@ -75,11 +75,11 @@ var APIKEY = getQParam("APIKEY"); var API = new API_func(APIname, APIKEY); // XML Omzetten naar equivalente JSON -// var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); +// var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); // xmlReq.load(Request); // The response. -var xmlResp = new ActiveXObject("MSXML2.DOMDocument.4.0"); +var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"")) var FCLTElement = xmlResp.createElement("facilitor"); diff --git a/APPL/API/api_cntsoap.asp b/APPL/API/api_cntsoap.asp index 2c9649ff10..0d851d3590 100644 --- a/APPL/API/api_cntsoap.asp +++ b/APPL/API/api_cntsoap.asp @@ -32,10 +32,10 @@ var sql = "-"; // De uiteindelijke insert/update-sql var resultcode = -1; /* Zolang deze -1 is, is het nog goed. Uiteindelijk eindigt het met 0 (als goed). */ var resulttekst = ""; - var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); xmlReq.load(Request); - var xmlResp = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"")) // The response. diff --git a/APPL/API/api_gen_import.asp b/APPL/API/api_gen_import.asp index ed14661322..10b1cc4b04 100644 --- a/APPL/API/api_gen_import.asp +++ b/APPL/API/api_gen_import.asp @@ -55,7 +55,7 @@ else var warn = res.warning; - var xmlResp = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"")); // The response diff --git a/APPL/API/api_inssoap.asp b/APPL/API/api_inssoap.asp index 45170621d8..f1523fa23a 100644 --- a/APPL/API/api_inssoap.asp +++ b/APPL/API/api_inssoap.asp @@ -44,15 +44,15 @@ var tsql = "-"; // Voor tijdelijke statement(s) var sql = "-"; // De uiteindelijke insert/update-sql - var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); if (API.apidata.stylesheet) { - var iXsl = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0"); if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) ) { API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason); } - var inputXML = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0"); inputXML.load(Request); inputXML.transformNodeToObject(iXsl, xmlReq); } @@ -61,7 +61,7 @@ if (API.apidata.loglevel) __Log2File(xmlReq.xml, APIname + "_TUSSEN"); - var xmlResp = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"")) // The response. diff --git a/APPL/API/api_mldsoap.asp b/APPL/API/api_mldsoap.asp index a4fac43063..0419eed485 100644 --- a/APPL/API/api_mldsoap.asp +++ b/APPL/API/api_mldsoap.asp @@ -36,15 +36,15 @@ var sql = "-"; // De uiteindelijke insert/update-sql var resultcode = -1; /* Zolang deze -1 is, is het nog goed. Uiteindelijk eindigt het met 0 (als goed). */ var resulttekst = ""; -var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); +var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); if (API.apidata.stylesheet) { - var iXsl = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0"); if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) ) { API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason); } - var inputXML = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0"); inputXML.load(Request); inputXML.transformNodeToObject(iXsl, xmlReq); } @@ -53,7 +53,7 @@ else if (API.apidata.loglevel) __Log2File(xmlReq.xml, APIname + "_IN"); -var xmlResp = new ActiveXObject("MSXML2.DOMDocument.4.0"); +var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"")) // The response. @@ -421,7 +421,7 @@ else Function HexDecode(ByVal vCode) Dim oXML, oNode - Set oXML = CreateObject("MSXML2.DOMDocument.4.0") + Set oXML = CreateObject("MSXML2.DOMDocument.6.0") Set oNode = oXML.CreateElement("hex") oNode.dataType = "bin.hex" ' Zeer snelle oplossing oNode.text = vCode diff --git a/APPL/API/api_opdrsoap.asp b/APPL/API/api_opdrsoap.asp index abe948535a..8e50417a0c 100644 --- a/APPL/API/api_opdrsoap.asp +++ b/APPL/API/api_opdrsoap.asp @@ -48,15 +48,15 @@ Session("logging") = API.apidata.loglevel||0; var tsql = "-"; // Voor tijdelijke statement. var sql = "-"; // De uiteindelijke insert/update-sql. -var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); +var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); if (API.apidata.stylesheet) { - var iXsl = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0"); if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) ) { API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason); } - var inputXML = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0"); inputXML.load(Request); if (inputXML.parseError.errorCode != 0) @@ -77,7 +77,7 @@ else if (API.apidata.loglevel) __Log2File(xmlReq.xml, APIname + "_TUSSEN"); -var xmlResp = new ActiveXObject("MSXML2.DOMDocument.4.0"); +var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"")) // The response. @@ -721,7 +721,7 @@ else Function HexDecode(ByVal vCode) Dim oXML, oNode - Set oXML = CreateObject("MSXML2.DOMDocument.4.0") + Set oXML = CreateObject("MSXML2.DOMDocument.6.0") Set oNode = oXML.CreateElement("hex") oNode.dataType = "bin.hex" ' Zeer snelle oplossing oNode.text = vCode diff --git a/APPL/API/api_ressoap.asp b/APPL/API/api_ressoap.asp index 8fe797212e..4b9d54a9b6 100644 --- a/APPL/API/api_ressoap.asp +++ b/APPL/API/api_ressoap.asp @@ -34,15 +34,15 @@ var API = new API_func(APIname, APIKEY); var tsql = "-"; // Voor tijdelijke statement(s) var sql = "-"; // De uiteindelijke insert/update-sql - var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); if (API.apidata.stylesheet) { - var iXsl = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0"); if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) ) { API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason); } - var inputXML = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0"); inputXML.load(Request); inputXML.transformNodeToObject(iXsl, xmlReq); } @@ -51,7 +51,7 @@ if (API.apidata.loglevel) __Log2File(xmlReq.xml, APIname + "_IN"); - var xmlResp = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"")) // The response. @@ -295,7 +295,7 @@ + " AND 1=1"; // Niet dirty, niet verwijderd, ...??? Oracle.Execute(sql); } - } + } // RESNOS-tracking toevoegen! shared.trackaction("RESNOS", rsv_ruimte_key); } diff --git a/APPL/API2/api2.inc b/APPL/API2/api2.inc index fc96433d36..4f60ae0cb5 100644 --- a/APPL/API2/api2.inc +++ b/APPL/API2/api2.inc @@ -6,7 +6,7 @@ Description: Functies voor API's Notes: Hier wordt van alles met de 'buitenwereld' gecommuniceerd. Doel is dat de model's puur op json-data hoeven te werken - + Status: Nog TODO's wegwerken */ @@ -861,7 +861,7 @@ api2 = { // TODO: Output XSL transform ondersteunen? if (getQParam("pretty","0")=="1") { - var style = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var style = new ActiveXObject("MSXML2.DOMDocument.6.0"); style.async = false; style.resolveExternals = false; style.load(Server.MapPath(rooturl + "/appl/shared/indent.xsl")); // De stylesheet laden. API's redeneren vanuit de root @@ -900,7 +900,7 @@ api2 = { // Streven: data == xml2json(json2xml(data)) json2xml: function _json2xml(data, rootname, record_name, single) { - var xmlDoc = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var xmlDoc = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlDoc.appendChild(xmlDoc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"")); var record2json = function(record, record_name) @@ -1104,7 +1104,7 @@ function RequestXML() { try { - var inputXML = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0"); inputXML.load(Request); } catch (e) diff --git a/APPL/API2/model_invoicelines.inc b/APPL/API2/model_invoicelines.inc index d366a749f5..e9485ab849 100644 --- a/APPL/API2/model_invoicelines.inc +++ b/APPL/API2/model_invoicelines.inc @@ -78,9 +78,6 @@ model_invoicelines = REST_GET: function _GET(params) { var scope = getQParamSafe("scope", "fe"); - var invoicedate_van = getQParamISODate("from", null); - var invoicedate_tot = getQParamISODate("to", null); - var autfunction = { fe : "WEB_FINUSE", fo : "WEB_FINFOF", bo : "WEB_FINBOF" } [scope]; params.authparams = user.checkAutorisation(autfunction, null, null, true); // pessimistisch @@ -105,25 +102,6 @@ model_invoicelines = query.wheres.push(sqlparent); } - if (invoicedate_van || invoicedate_tot) - { - var sqlrange = " fin_factuur_key IN " - + "(SELECT ff.fin_factuur_key" - + " FROM fin_factuur ff" - + " WHERE 1=1"; - if (invoicedate_van) - { - sqlrange += " AND fin_factuur_datum >= " + invoicedate_van.beginToSQL(); - } - - if (invoicedate_tot) - { - sqlrange += " fin_factuur_datum <= " + invoicedate_tot.endToSQL(); - } - sqlrange += ")"; - query.wheres.push(sqlrange); - } - var wheres = api2.sqlfilter(params, model_invoicelines); query.wheres = query.wheres.concat(wheres); @@ -153,7 +131,6 @@ model_invoicelines = var this_fin = fin.func_enabled_factuur(fin_factuur_key); user.auth_required_or_abort(this_fin.canChange); // Geen wijzigingen toestaan bij onvoldoende rechten. - user.auth_required_or_abort(this_fin.canFEwrite); // Als je mag wijzigen, dan Altijd fe vooralsnog var wheres = [" fin_factuurregel_key = " + finregel_key]; var finUpd = buildTrackingUpdate("fin_factuurregel", wheres.join(" AND " ), fields, { noValidateToken: true }); diff --git a/APPL/API2/model_invoices.inc b/APPL/API2/model_invoices.inc index 19cddf5270..207745124d 100644 --- a/APPL/API2/model_invoices.inc +++ b/APPL/API2/model_invoices.inc @@ -125,7 +125,6 @@ model_invoices = var fin_key = the_key; var this_fin = fin.func_enabled_factuur(fin_key); user.auth_required_or_abort(this_fin.canChange); // Geen wijzigingen toestaan bij onvoldoende rechten. - user.auth_required_or_abort(this_fin.canFEwrite); // Altijd fe vooralsnog // model_invoices._pre_analyze_fields(params, jsondata); var fields = api2.update_fields(params, model_invoices, jsondata); // Build updater @@ -154,7 +153,7 @@ model_invoices = REST_POST: function (params, jsondata) /* new invoice */ { var this_fin = fin.func_enabled_factuur(-1); - user.auth_required_or_abort(this_fin.canFEwrite); // Altijd fe vooralsnog + user.auth_required_or_abort(this_fin.canChange); // Geen wijzigingen toestaan bij onvoldoende rechten. params.isNew = true; // negeer eventuele bestaande keys diff --git a/APPL/API2/model_issues.inc b/APPL/API2/model_issues.inc index 8027c5212b..63fbe21dc1 100644 --- a/APPL/API2/model_issues.inc +++ b/APPL/API2/model_issues.inc @@ -17,7 +17,6 @@ - <% diff --git a/APPL/BES/DynArtikelInfo.asp b/APPL/BES/DynArtikelInfo.asp index d201581517..792a3c5ca5 100644 --- a/APPL/BES/DynArtikelInfo.asp +++ b/APPL/BES/DynArtikelInfo.asp @@ -40,7 +40,7 @@ DOCTYPE_Disable = 1; http_request.setOption(SXH_OPTION_SELECT_CLIENT_SSL_CERT, certificateName); } - var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0"); xmlReq.resolveExternals = false; // van mij hoef je geen DTD's te controleren xmlReq.validateOnParse = false; // van mij hoef je geen DTD's te controleren @@ -64,7 +64,7 @@ DOCTYPE_Disable = 1; // Transformeer met de leverancier specifieke stylesheet if (xslPath) { - var xslDoc = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var xslDoc = Server.CreateObject("MSXML2.DOMDocument.6.0"); __Log("Loading xslPath: " + Server.MapPath(custpath + "/" + xslPath)); xslDoc.resolveExternals = false; // van mij hoef je geen DTD's te controleren xslDoc.validateOnParse = false; // van mij hoef je geen DTD's te controleren @@ -83,7 +83,7 @@ DOCTYPE_Disable = 1; return null; } - var xmlResp = Server.CreateObject("Msxml2.DOMDocument.4.0"); + var xmlResp = Server.CreateObject("Msxml2.DOMDocument.6.0"); xmlResp.resolveExternals = false; // van mij hoef je geen DTD's te controleren xmlResp.validateOnParse = false; // van mij hoef je geen DTD's te controleren xmlResp.loadXML(http_request.ResponseText); // for parsing @@ -92,7 +92,7 @@ DOCTYPE_Disable = 1; // Transformeer met de leverancier specifieke stylesheet if (xslPath) { - var xslDoc = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var xslDoc = Server.CreateObject("MSXML2.DOMDocument.6.0"); __Log("Loading xslPath: " + Server.MapPath(custpath + "/" + xslPath)); xslDoc.resolveExternals = false; // van mij hoef je geen DTD's te controleren xslDoc.validateOnParse = false; // van mij hoef je geen DTD's te controleren diff --git a/APPL/BES/bes_edit_bestelling_save.asp b/APPL/BES/bes_edit_bestelling_save.asp index 380c77bc33..9a951b1a94 100644 --- a/APPL/BES/bes_edit_bestelling_save.asp +++ b/APPL/BES/bes_edit_bestelling_save.asp @@ -427,7 +427,7 @@ if (UseRemoteApproval) // if (!corsaResult) // strState = "Resultaat Corsa/Webservice: "+corsaError; // -// var xmlTableDef = Server.CreateObject("MSXML2.DOMDocument.4.0"); +// var xmlTableDef = Server.CreateObject("MSXML2.DOMDocument.6.0"); // var docNr = corsaCreateDoc(bes_key); // var caseID = corsaGetCase(docNr); // xmlTableDef = corsaVarTabGet(caseID); diff --git a/APPL/BES/voorraadInfo.asp b/APPL/BES/voorraadInfo.asp index e7a88778aa..2c0f503d4f 100644 --- a/APPL/BES/voorraadInfo.asp +++ b/APPL/BES/voorraadInfo.asp @@ -26,7 +26,7 @@ if (request != "stock") } -var objReq = new ActiveXObject("MSXML2.DOMDocument.4.0"); +var objReq = new ActiveXObject("MSXML2.DOMDocument.6.0"); objReq.load(Request); if (objReq.parseError.errorCode != 0) @@ -47,7 +47,7 @@ if (!objPart) // Partnummer is artikelnr var l_voorraad = bepaal_voorraad_van_artikel(objPart.text); -var xmlDoc = new ActiveXObject("MSXML2.DOMDocument.4.0"); +var xmlDoc = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlDoc.appendChild(xmlDoc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"UTF-8\"")) diff --git a/APPL/BEZ/bez_edit_bezoekers_save.inc b/APPL/BEZ/bez_edit_bezoekers_save.inc index 3385c486ae..b9bbb74235 100644 --- a/APPL/BEZ/bez_edit_bezoekers_save.inc +++ b/APPL/BEZ/bez_edit_bezoekers_save.inc @@ -247,11 +247,12 @@ function getPrkOmschrijving(key, keytype) + (keytype == "B" ? " AND rrd.bez_bezoekers_key = " + key : " AND rrd.res_rsv_deel_key = " + key); // keytype == "R" (res_rsv_deel_key) - oRsPOB = Oracle.Execute(sqlPOB); + var oRsPOB = Oracle.Execute(sqlPOB); + var txt; if (!oRsPOB.eof) - return oRsPOB("alg_plaatsaanduiding").value; - else - return null; + txt = oRsPOB("alg_plaatsaanduiding").value; + oRsPOB.Close(); + return txt; } // leest in principe uit Request.Form nummer bznum behalve als bznum==-1, dan uit params. @@ -474,6 +475,7 @@ function saveOneBezoeker(afspraak_key, rsv_ruimte_key, bznum, params) isNew: isNew, flexPath: "BEZ/B", tracking: true, + noFlexCleanup: true, module: "BEZ" }) } diff --git a/APPL/CAD/cad_tekening_list.inc b/APPL/CAD/cad_tekening_list.inc index e6b86029e9..b45e3bb45b 100644 --- a/APPL/CAD/cad_tekening_list.inc +++ b/APPL/CAD/cad_tekening_list.inc @@ -204,7 +204,7 @@ function tekening_list(pautfunction, params) return null; } - var slnkXML = Server.CreateObject("MSXML2.DOMDocument.4.0"); + var slnkXML = Server.CreateObject("MSXML2.DOMDocument.6.0"); var slnkProps = GetEplotPropertiesXML(teknaam, 0); if (!slnkProps) { diff --git a/APPL/CARE/custfunctions.wsc b/APPL/CARE/custfunctions.wsc index 347fdde9cc..1d41f26e67 100644 --- a/APPL/CARE/custfunctions.wsc +++ b/APPL/CARE/custfunctions.wsc @@ -341,7 +341,7 @@ function Get_OPTIMIZED_GoogleDistance(p_GoogleAPI_URL, p_locatie1, p_locatie2, p function GetGoogleDistance(p_GoogleAPI_URL, p_locatie1, p_locatie2, p_AdresArr, p_optimize, p_output_xmlfile) { - var objXMLHTTP = new ActiveXObject("MSXML2.ServerXMLHTTP.4.0"); + var objXMLHTTP = new ActiveXObject("MSXML2.ServerXMLHTTP.6.0"); l_waypoints = p_AdresArr.join("|"); if (p_optimize == 1){ l_waypoints = "optimize:true|" + l_waypoints; diff --git a/APPL/FAC/fac_edit_xsl_save.asp b/APPL/FAC/fac_edit_xsl_save.asp index 7295a9858c..991a75537d 100644 --- a/APPL/FAC/fac_edit_xsl_save.asp +++ b/APPL/FAC/fac_edit_xsl_save.asp @@ -62,7 +62,7 @@ if (revert) result = { success: true, message: preview?"":"Ok!" }; // Load the XML -var source = Server.CreateObject("MSXML2.DOMDocument.4.0"); +var source = Server.CreateObject("MSXML2.DOMDocument.6.0"); source.async = false; if( ! source.loadXML(xmltekst) ) { diff --git a/APPL/FAC/fac_verify.inc b/APPL/FAC/fac_verify.inc index 375d0a183a..12c6a7a81c 100644 --- a/APPL/FAC/fac_verify.inc +++ b/APPL/FAC/fac_verify.inc @@ -40,10 +40,11 @@ if (Request.Form("saveas").count > 0) if (Request.QueryString("put_log").Count > 0) { + var schedulelog = Request.QueryString("put_log") == "1"; var year = parseInt(Request.QueryString("year")); var month = parseInt(Request.QueryString("month")); - var logname = "putorders_" + custID + "_" + year + "_" + (month<10?"0":"") + month + ".log"; - var path = Request.QueryString("put_log") == "1"?"../../cust/" + custID + "/tasks/":"../../temp/" + var logname = "putorders" + (schedulelog?"":"I") + "_" + custID + "_" + year + "_" + (month<10?"0":"") + month + ".log"; + var path = schedulelog?"../../cust/" + custID + "/tasks/":"../../temp/"; zipfile(path, logname); } @@ -798,7 +799,7 @@ checker("SLNKDWF Installed", } ) -checker("MSXML2 4.0 Installed", +checker("MSXML2 4.0 Installed (deprecated 5.4.3 Gold A)", function () { try @@ -807,8 +808,8 @@ checker("MSXML2 4.0 Installed", } catch(e) { - return { result: resultcodes.error, - message: e.description + "
MSXML2 4.0 not available. Reports will be unavailable"}; + return { result: resultcodes.inform, + message: e.description + "
MSXML2 4.0 not available."}; } var txt = "Ok"; @@ -817,7 +818,7 @@ checker("MSXML2 4.0 Installed", } ) -checker("MSXML2 6.0 Installed (not required)", +checker("MSXML2 6.0 Installed (required since 5.4.3 Gold A)", function () { try @@ -826,8 +827,8 @@ checker("MSXML2 6.0 Installed (not required)", } catch(e) { - return { result: resultcodes.inform, - message: e.description + "
MSXML2 6.0 not available."}; + return { result: resultcodes.error, + message: e.description + "
MSXML2 6.0 not available. Reports will be unavailable"}; } var txt = "Ok"; diff --git a/APPL/IMP/imp_shared.js b/APPL/IMP/imp_shared.js index c532257a70..81b3934183 100644 --- a/APPL/IMP/imp_shared.js +++ b/APPL/IMP/imp_shared.js @@ -105,7 +105,7 @@ function impReadStream(fileStream, import_app_key, params) __Log("XML2STR: with XSL: " + xslfile); // Load the XML - var source = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var source = new ActiveXObject("MSXML2.DOMDocument.6.0"); source.async = false; source.resolveExternals = false; // van mij hoef je geen DTD's te controleren source.validateOnParse = false; // van mij hoef je geen DTD's te controleren @@ -118,7 +118,7 @@ function impReadStream(fileStream, import_app_key, params) } // Load the XSLT - var style = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var style = new ActiveXObject("MSXML2.DOMDocument.6.0"); style.async = false; style.resolveExternals = false; // van mij hoef je geen DTD's te controleren style.validateOnParse = false; // van mij hoef je geen DTD's te controleren diff --git a/APPL/INS/ins_inspect.asp b/APPL/INS/ins_inspect.asp index be4f5ab0ca..e657c425bc 100644 --- a/APPL/INS/ins_inspect.asp +++ b/APPL/INS/ins_inspect.asp @@ -107,7 +107,8 @@ user.anything_todo_or_abort(tobeinspected > 0); // We klagen niet over enkele we + " AND di.ins_deel_key = " + ingesloten[0] + " AND idsc.ins_deel_key(+) = " + ingesloten[0] + " AND COALESCE (xcp.ins_srtcontroledl_xcp_periode, di.ins_srtcontrole_periode) > 0" - + " AND di.ins_srtcontrole_key = " + ingeslotensc[0] + ")"; + + " AND di.ins_srtcontrole_key = " + ingeslotensc[0] + + " AND (xcp.ins_srtcontroledl_xcp_eind(+) IS NULL OR xcp.ins_srtcontroledl_xcp_eind(+) > TRUNC(SYSDATE, 'DD'))" + ")"; var oRs = Oracle.Execute(sql); eenheid = oRs("eenheid").Value; info = oRs("info").Value; diff --git a/APPL/INS/ins_inspect_list.asp b/APPL/INS/ins_inspect_list.asp index eb36aee2ff..1a933754ea 100644 --- a/APPL/INS/ins_inspect_list.asp +++ b/APPL/INS/ins_inspect_list.asp @@ -171,6 +171,7 @@ var authparams = user.checkAutorisation("WEB_INSUSE"); + " AND (COALESCE (xcp.ins_srtcontroledl_xcp_eind, di.ins_srtcontrole_eind) >= TRUNC(SYSDATE, 'DD')" + " OR COALESCE (xcp.ins_srtcontroledl_xcp_eind, di.ins_srtcontrole_eind) IS NULL)" + " AND di.ins_deel_key = " + ins_key + + " AND (xcp.ins_srtcontroledl_xcp_eind(+) IS NULL OR xcp.ins_srtcontroledl_xcp_eind(+) > TRUNC(SYSDATE, 'DD'))" + " UNION ALL" // Combineren met uitgevoerde inspecties op dit object + " SELECT 2 seq" @@ -203,6 +204,7 @@ var authparams = user.checkAutorisation("WEB_INSUSE"); + " AND idsc.ins_deel_key = di.ins_deel_key" + " AND idsc.prs_perslid_key = p.prs_perslid_key(+)" + " AND di.ins_deel_key = " + ins_key + + " AND (xcp.ins_srtcontroledl_xcp_eind(+) IS NULL OR xcp.ins_srtcontroledl_xcp_eind(+) > TRUNC(SYSDATE, 'DD'))" + " )" + " WHERE periode > 0" + " ORDER BY seq, ins_deelsrtcontrole_datum DESC, inspectie_org DESC, inspectie_next, ins_srtcontrole_omschrijving"; diff --git a/APPL/INS/ins_inspect_save.asp b/APPL/INS/ins_inspect_save.asp index f6b5c37d73..cdb04b476d 100644 --- a/APPL/INS/ins_inspect_save.asp +++ b/APPL/INS/ins_inspect_save.asp @@ -79,7 +79,8 @@ for (var i = 0; i < ins_key_arr.length; i++) + " AND di.ins_deel_key = " + ins_key_arr[i] + " AND idsc.ins_deel_key(+) = " + ins_key_arr[i] + " AND COALESCE (xcp.ins_srtcontroledl_xcp_periode, di.ins_srtcontrole_periode) > 0" - + " AND di.ins_srtcontrole_key = " + srtcont_key_arr[i] + ")" + + " AND di.ins_srtcontrole_key = " + srtcont_key_arr[i] + + " AND (xcp.ins_srtcontroledl_xcp_eind(+) IS NULL OR xcp.ins_srtcontroledl_xcp_eind(+) > TRUNC(SYSDATE, 'DD'))" + ")" + " ORDER BY ins_deelsrtcontrole_datum DESC"; var oRs = Oracle.Execute(sql); // Waarden moeten aanwezig zijn. Mocht dat niet zo zijn dan is er iets fout. @@ -191,7 +192,8 @@ if (insp_actie == 0) sql = "SELECT COALESCE((SELECT xcp.ins_srtcontroledl_xcp_eenheid" + " FROM ins_srtcontroledl_xcp xcp" + " WHERE ins_deel_key = " + ingesloten[i].ins_key - + " AND ins_srtcontrole_key = " + ingesloten[i].srtcont_key + ")" + + " AND ins_srtcontrole_key = " + ingesloten[i].srtcont_key + + " AND (xcp.ins_srtcontroledl_xcp_eind IS NULL OR xcp.ins_srtcontroledl_xcp_eind > TRUNC(SYSDATE, 'DD'))" + ")" + " , (SELECT isc.ins_srtcontrole_eenheid" + " FROM ins_srtcontrole isc" + " WHERE ins_srtcontrole_key = " + ingesloten[i].srtcont_key + ")) eenheid" diff --git a/APPL/INS/ins_list.inc b/APPL/INS/ins_list.inc index 7410af93a2..7e464325de 100644 --- a/APPL/INS/ins_list.inc +++ b/APPL/INS/ins_list.inc @@ -522,6 +522,7 @@ function ins_list (pautfunction, params) + " FROM ins_deelsrtcontrole idsc" + " WHERE idsc.ins_srtcontrole_key = di.ins_srtcontrole_key" + " AND idsc.ins_deel_key = di.ins_deel_key)" + + " AND (xcp.ins_srtcontroledl_xcp_eind(+) IS NULL OR xcp.ins_srtcontroledl_xcp_eind(+) > TRUNC(SYSDATE, 'DD'))" + " ORDER BY inspectie_date)" : " SELECT 1 rn" // inspecties die nog nooit zijn uitgevoerd + " , di.ins_deel_key" @@ -546,6 +547,7 @@ function ins_list (pautfunction, params) + " AND (di.ins_deel_key, di.ins_srtcontrole_key) NOT IN" + " (SELECT ins_deel_key, ins_srtcontrole_key" + " FROM ins_deelsrtcontrole)" + + " AND (xcp.ins_srtcontroledl_xcp_eind(+) IS NULL OR xcp.ins_srtcontroledl_xcp_eind(+) > TRUNC(SYSDATE, 'DD'))" + " UNION ALL" // Inspecties die al zijn uitgevoerd + " SELECT RANK ()" // volgnummertje toekennen + " OVER (" @@ -578,6 +580,7 @@ function ins_list (pautfunction, params) + " AND di.ins_deel_key = xcp.ins_deel_key(+)" + " AND idsc.ins_srtcontrole_key = di.ins_srtcontrole_key" + " AND idsc.ins_deel_key = di.ins_deel_key" + + " AND (xcp.ins_srtcontroledl_xcp_eind(+) IS NULL OR xcp.ins_srtcontroledl_xcp_eind(+) > TRUNC(SYSDATE, 'DD'))" + " ORDER BY inspectie_next)") + " WHERE rn = 1" + " AND periode > 0" diff --git a/APPL/MLD/mld.inc b/APPL/MLD/mld.inc index f68338dfdb..6cd377a37b 100644 --- a/APPL/MLD/mld.inc +++ b/APPL/MLD/mld.inc @@ -3093,7 +3093,7 @@ mld = {setmeldingstatus: { dbs: "mld_melding_t_uitvoertijd.tijdsduur", obj: "MLD_T_UITVOERTIJD", typ: "number", val: prio.uitvoertijd }, { dbs: "mld_melding_t_uitvoertijd.eenheid", - obj: "MLD_T_UITVOERTIJD", typ: "number", val: prio.eenheid }, + obj: "MLD_T_UITVOERTIJD", typ: "varchar", val: prio.eenheid }, { dbs: "mld_alg_locatie_key", typ: "key", val: locatiekey } ]); diff --git a/APPL/MLD/mld_edit_opdr.asp b/APPL/MLD/mld_edit_opdr.asp index e7e88de94f..09b33e7ac2 100644 --- a/APPL/MLD/mld_edit_opdr.asp +++ b/APPL/MLD/mld_edit_opdr.asp @@ -594,7 +594,6 @@ if (mld_opdr.kp_key == -1) endTime: 18, initEmpty: !mld_opdr.mld_opdr_plandatum, // initieel leeg, maar als plandatum aanwezig deze ook tonen. initTimeEmpty: !mld_opdr.mld_opdr_plandatum, // idem. - onChange: "DateChanged()", required: false } ); } diff --git a/APPL/MLD/mld_show_opdr.js b/APPL/MLD/mld_show_opdr.js index 631dabfa9e..048dba7067 100644 --- a/APPL/MLD/mld_show_opdr.js +++ b/APPL/MLD/mld_show_opdr.js @@ -98,7 +98,7 @@ function opdr_close() { if (kosten_verplicht_afm && opdr_kosten == 0) { - alert(L("lcl_mld_opdr_kosten_verplicht")); + alert(L("lcl_mld_opdr_kosten_verpl_afm")); return; } var url = "../mld/opdr_close_confirm.asp?opdr_key=" + opdr_key; @@ -111,7 +111,7 @@ function opdr_finish() { if (kosten_verplicht_afr && opdr_kosten == 0) { - alert(L("lcl_mld_opdr_kosten_verplicht")); + alert(L("lcl_mld_opdr_kosten_verpl_afr")); return; } if (confirm(L("lcl_mld_opdr_finish_1") + prefix + mld_key + "/" + volgnr + L("lcl_mld_opdr_finish_2"))) diff --git a/APPL/MLD/mld_stdmelding.asp b/APPL/MLD/mld_stdmelding.asp index 52198dc7bb..c0b2735057 100644 --- a/APPL/MLD/mld_stdmelding.asp +++ b/APPL/MLD/mld_stdmelding.asp @@ -114,10 +114,6 @@ else if (stdm_info.ins_srtinst_niveau == "S") { var fields = [ { dbs: "mld_ins_discipline_key", typ: "key", frm: "disc_key" }, { dbs: "mld_stdmelding_omschrijving", typ: "varchar", frm: "stdm_omschr" }, - { dbs: "mld_stdmelding_t_accepttijd.tijdsduur", - obj: "MLD_T_UITVOERTIJD", typ: "number", frm: "accepttijd" }, - { dbs: "mld_stdmelding_t_accepttijd.eenheid", - obj: "MLD_T_UITVOERTIJD", typ: "varchar", frm: "dayshours_urg" }, { dbs: "mld_stdmelding_notfrontend", typ: "check0", frm: "notfrontend" }, { dbs: "prs_kostensoort_key", typ: "key", frm: "kostensoort" }, { dbs: "alg_onrgoed_niveau", typ: "varchar", frm: "onrgoed_niveau" }, @@ -150,24 +146,28 @@ else if (stdm_info.ins_srtinst_niveau == "S") { dbs: "alg_org_obj_niveau", typ: "number", frm: "org_obj_niveau" }, { dbs: "mld_stdmelding_t_uitvoertijd.tijdsduur", obj: "MLD_T_UITVOERTIJD", typ: "number", frm: "uitvoertijd3" }, - { dbs: "mld_stdmelding_t_uitvtijd_pr1.tijdsduur", - obj: "MLD_T_UITVOERTIJD", typ: "number", frm: "uitvoertijd1" }, - { dbs: "mld_stdmelding_t_uitvtijd_pr2.tijdsduur", - obj: "MLD_T_UITVOERTIJD", typ: "number", frm: "uitvoertijd2" }, - { dbs: "mld_stdmelding_t_uitvtijd_pr4.tijdsduur", - obj: "MLD_T_UITVOERTIJD", typ: "number", frm: "uitvoertijd4" }, { dbs: "mld_stdmelding_t_uitvoertijd.eenheid", - obj: "MLD_T_UITVOERTIJD", typ: "varchar", frm: "dayshours3" }, - { dbs: "mld_stdmelding_t_uitvtijd_pr1.eenheid", - obj: "MLD_T_UITVOERTIJD", typ: "varchar", frm: "dayshours1" }, - { dbs: "mld_stdmelding_t_uitvtijd_pr2.eenheid", - obj: "MLD_T_UITVOERTIJD", typ: "varchar", frm: "dayshours2" }, - { dbs: "mld_stdmelding_t_uitvtijd_pr4.eenheid", - obj: "MLD_T_UITVOERTIJD", typ: "varchar", frm: "dayshours4" } + obj: "MLD_T_UITVOERTIJD", typ: "varchar", frm: "dayshours3" } ]; -/* - alg_onrgoed_obj_niveau varchar2(1 byte) -*/ + + + // Checken of het eenheden selectveld met dagen/uren bij "Acceptatietijd" niet readonly was en wel is meegegeven. + // Als dit eenheden selectieveld readonly was dan wordt deze niet opgeslagen en dan moet de tijdsduur ook niet opgeslagen worden. + // Geldt ook voor de uitvoertijden (kritisch, hoog en laag). Uitvoertijd normaal is verplicht en altijd aanwezig. + function add_time_field(dbsname, frm_tijd, frm_eenheid) + { + var dayshours = Request.Form(frm_eenheid).count > 0; + if (dayshours) + fields.push({ dbs: dbsname + ".tijdsduur", obj: "MLD_T_UITVOERTIJD", typ: "number", frm: frm_tijd }, + { dbs: dbsname + ".eenheid", obj: "MLD_T_UITVOERTIJD", typ: "varchar", frm: frm_eenheid }); + else // Leegmaken + fields.push({ dbs: dbsname + ".tijdsduur", obj: "MLD_T_UITVOERTIJD", typ: "number", val: null }, + { dbs: dbsname + ".eenheid", obj: "MLD_T_UITVOERTIJD", typ: "varchar", val: null }); + } + add_time_field("mld_stdmelding_t_accepttijd", "accepttijd", "dayshours_urg"); + add_time_field("mld_stdmelding_t_uitvtijd_pr1", "uitvoertijd1", "dayshours1"); + add_time_field("mld_stdmelding_t_uitvtijd_pr2", "uitvoertijd2", "dayshours2"); + add_time_field("mld_stdmelding_t_uitvtijd_pr4", "uitvoertijd4", "dayshours4"); // Objecten beperken tot: var disc = getFParamInt("disc", -1); @@ -503,7 +503,9 @@ else if (stdm_info.ins_srtinst_niveau == "S") disable: !stdm_info.accepttijd } } - myFIELD("accepttijd", "fldshort", L("lcl_mld_timetoaccept"), stdm_info.accepttijd, {maxlength: 3, datatype: "float", html: "onChange='onChangeAccepttijd();'", selector: selectparams}); + if (mode == "edit" || stdm_info.accepttijd) { //suppressEmpty + myFIELD("accepttijd", "fldshort", L("lcl_mld_timetoaccept"), stdm_info.accepttijd, {maxlength: 3, datatype: "float", html: "onChange='onChangeAccepttijd();'", selector: selectparams}); + } sql = "SELECT 1, " + safe.quoted_sql(L("lcl_mld_office_hours")) + " FROM DUAL" + " UNION SELECT 2, " + safe.quoted_sql(L("lcl_mld_opening_hours")) + " FROM DUAL" + " UNION SELECT 3, " + safe.quoted_sql(L("lcl_mld_24_7")) + " FROM DUAL" diff --git a/APPL/MLD/mld_stdmelding_search_list.asp b/APPL/MLD/mld_stdmelding_search_list.asp index a757304736..e3ae97f7b7 100644 --- a/APPL/MLD/mld_stdmelding_search_list.asp +++ b/APPL/MLD/mld_stdmelding_search_list.asp @@ -145,6 +145,8 @@ var authparams = user.checkAutorisation("WEB_MLDMGT"); function fnAcceptatietijd(oRs) { + if (oRs("acceptatietijd_tijdsduur").Value == null) + return ""; var acceptatietijd = oRs("acceptatietijd_tijdsduur").Value + (oRs("acceptatietijd_eenheid").Value == 'D'? L("lcl_mld_dagen") : L("lcl_mld_uur")); return acceptatietijd; diff --git a/APPL/MLD/opdr_close_confirm.asp b/APPL/MLD/opdr_close_confirm.asp index 517edc83dd..8ffa1e387c 100644 --- a/APPL/MLD/opdr_close_confirm.asp +++ b/APPL/MLD/opdr_close_confirm.asp @@ -42,7 +42,7 @@ if (opdr_key_arr.length == 1) var mld_opdr = mld.mld_opdr_info(opdr_key_arr[0]); var kosten_verplicht_afm = mld_opdr.typeopdr_matchtype != 4 && (mld_opdr.typeopdr_kosten_verplicht & 2 || (mld_opdr.typeopdr_kosten_verplicht == 0 && mld_opdr.opdrkosten_verplicht & 2)); var opdr_kosten = mld_opdr.t_cost; - user.auth_required_or_abort(!(kosten_verplicht_afm && opdr_kosten == 0) && this_opdr.canClose, L("lcl_mld_opdr_kosten_verplicht")); // Dan zijn we vlug klaar. + user.auth_required_or_abort(!(kosten_verplicht_afm && opdr_kosten == 0) && this_opdr.canClose, L("lcl_mld_opdr_kosten_verpl_afm")); // Dan zijn we vlug klaar. var sql = "SELECT o.mld_opdr_einddatum" + " , o.mld_melding_key" diff --git a/APPL/MLD/opdr_close_save.asp b/APPL/MLD/opdr_close_save.asp index a77b68d153..6eb83b32bb 100644 --- a/APPL/MLD/opdr_close_save.asp +++ b/APPL/MLD/opdr_close_save.asp @@ -68,7 +68,7 @@ if (opdr_key_arr.length == 1) var mld_opdr = mld.mld_opdr_info(opdr_key_arr[0]); var kosten_verplicht_afm = mld_opdr.typeopdr_matchtype != 4 && (mld_opdr.typeopdr_kosten_verplicht & 2 || (mld_opdr.typeopdr_kosten_verplicht == 0 && mld_opdr.opdrkosten_verplicht & 2)); var opdr_kosten = mld_opdr.t_cost; - user.auth_required_or_abort(!(kosten_verplicht_afm && opdr_kosten == 0) && this_opdr.canClose, L("lcl_mld_opdr_kosten_verplicht")); // Dan zijn we vlug klaar. + user.auth_required_or_abort(!(kosten_verplicht_afm && opdr_kosten == 0) && this_opdr.canClose, L("lcl_mld_opdr_kosten_verpl_afm")); // Dan zijn we vlug klaar. var sql = "SELECT o.mld_melding_key" + " , o.mld_opdr_einddatum" diff --git a/APPL/MLD/order_mail.asp b/APPL/MLD/order_mail.asp index 23f82d0aba..898096a4e3 100644 --- a/APPL/MLD/order_mail.asp +++ b/APPL/MLD/order_mail.asp @@ -27,10 +27,8 @@ var result = { key: opdr_key }; var puo_result = putorders.sendMLDorders(opdr_key); if (!puo_result) { - // Dan maar door putorders laten oppikken - var sql = "UPDATE mld_opdr SET mld_opdr_teverzenden = 1 WHERE mld_opdr_key = " + opdr_key; - Oracle.Execute(sql); - result.message = lcl_puo_order_failfirst; // In eerste instantie mislukt. Auto retry + // mld_opdr_teverzenden is al op 1 gezet door sendMLDorders, putorders schedule probeert wel weer + result.message = L("lcl_puo_order_failfirst"); // In eerste instantie mislukt. Auto retry } Response.Write(JSON.stringify(result)); diff --git a/APPL/PDA/order.asp b/APPL/PDA/order.asp index 3346dfe2ab..01dcc8a74f 100644 --- a/APPL/PDA/order.asp +++ b/APPL/PDA/order.asp @@ -208,7 +208,7 @@ else var opdr_kosten = isNaN($("#tot_kosten").val())? 0 : parseFloat($("#tot_kosten").val()); if (kosten_verplicht_afm && opdr_kosten == 0) { - alert(L("lcl_mld_opdr_kosten_verplicht")); + alert(L("lcl_mld_opdr_kosten_verpl_afm")); return; } $.post($("form[name=u2]")[0].action, $("[name=u2]").serialize(), null, "json"); diff --git a/APPL/PRS/pchange.asp b/APPL/PRS/pchange.asp index fca525aef4..0126f1ce67 100644 --- a/APPL/PRS/pchange.asp +++ b/APPL/PRS/pchange.asp @@ -111,6 +111,11 @@ var EXPIRED_PASSWORD_OK = true; } } + $(document).ready(function() + { + FcltMgr.resized(); + }); + diff --git a/APPL/PRS/prs_edit_bedrijfadres.asp b/APPL/PRS/prs_edit_bedrijfadres.asp index f53a2bc31a..51112bc07e 100644 --- a/APPL/PRS/prs_edit_bedrijfadres.asp +++ b/APPL/PRS/prs_edit_bedrijfadres.asp @@ -162,7 +162,7 @@ else + " UNION SELECT 2, " + safe.quoted_sql(L("lcl_No")) + " FROM DUAL" + " ORDER BY 1"; FCLTselector('flexfiles', sql, - { label: L("lcl_puoorder_flexfiles"), + { label: L("lcl_puo_order_flexfiles"), initKey: flexfiles||0 } ); diff --git a/APPL/PRS/prs_edit_dienstlocs.asp b/APPL/PRS/prs_edit_dienstlocs.asp index 0544176b6b..2e6fdbbd10 100644 --- a/APPL/PRS/prs_edit_dienstlocs.asp +++ b/APPL/PRS/prs_edit_dienstlocs.asp @@ -32,26 +32,35 @@ var dienst_key = getQParamInt("dienst_key"); // bedrijf key { var locs = getFParamIntArray("locExist", []); var gebs = getFParamIntArray("gebExist", []); - // Verwijderen oude waarden + // Verwijderen alle oude waarden. sql = "DELETE prs_bedrijfdienstlocatie" + " WHERE prs_bedrijf_key = " + bedrijf_key + " AND prs_dienst_key = " + dienst_key; Oracle.Execute(sql); - for (i in locs) - { + if (locs.length > 0 || gebs.length > 0) + { // Er zijn locaties en/of gebouwen geselecteerd. + for (i in locs) + { var loc_key = locs[i]; var sql = "INSERT INTO prs_bedrijfdienstlocatie (prs_bedrijf_key, prs_dienst_key, alg_locatie_key)" + " VALUES (" + bedrijf_key + ", " + dienst_key + ", " + loc_key + ")"; Oracle.Execute(sql); - } + } - for (i in gebs) - { + for (i in gebs) + { var bld_key = gebs[i]; var sql = "INSERT INTO prs_bedrijfdienstlocatie (prs_bedrijf_key, prs_dienst_key, alg_gebouw_key)" + " VALUES (" + bedrijf_key + ", " + dienst_key + ", " + bld_key + ")"; Oracle.Execute(sql); + } + } + else + { // Er zijn geen locaties of gebouwen geselecteerd. Dan nemen we 'Alle'. Anders moet je maar de gehele dienst(locatie) verwijderen. + var sql = "INSERT INTO prs_bedrijfdienstlocatie (prs_bedrijf_key, prs_dienst_key)" + + " VALUES (" + bedrijf_key + ", " + dienst_key + ")"; + Oracle.Execute(sql); } %><% diff --git a/APPL/PRS/prs_locdienst_list.asp b/APPL/PRS/prs_locdienst_list.asp index 90c31f0ae2..a310668815 100644 --- a/APPL/PRS/prs_locdienst_list.asp +++ b/APPL/PRS/prs_locdienst_list.asp @@ -55,23 +55,57 @@ function fnrowData(oRs) var authparams = user.checkAutorisation(autfunction); var canChange = (authparams.PRSwritelevel < 9); - var sql = "SELECT" - + " b.prs_bedrijf_key" - + ", prs_bedrijf_naam" - + ", " + lcl.xsqla('d.prs_dienst_omschrijving', 'd.prs_dienst_key') - + ", COALESCE(alg_locatie_omschrijving, " + safe.quoted_sql(L("lcl_all")) + ") alg_locatie_omschrijving" - + ", COALESCE(alg_gebouw_omschrijving, " + safe.quoted_sql(L("lcl_all")) + ") alg_gebouw_omschrijving" - + ", prs_bedrijfdienstlocatie_key" - + " FROM alg_v_aanweziglocatie l, alg_v_aanweziggebouw g, prs_dienst d, prs_bedrijfdienstlocatie dl, prs_bedrijf b" - + " WHERE dl.ALG_LOCATIE_KEY = l.ALG_LOCATIE_KEY(+)" - + " AND dl.alg_gebouw_key = g.alg_gebouw_key(+)" - + " AND d.PRS_DIENST_KEY = dl.PRS_DIENST_KEY" - + " AND dl.PRS_BEDRIJF_KEY = b.PRS_BEDRIJF_KEY" + // SELECT deel voor verwijzing naar locatie en naar gebouw. + // Alleen de alg_locatie_key is ingevuld of alleen de alg_gebouw_key of geen van beide. + var sql = "SELECT *" + + " FROM (SELECT b.prs_bedrijf_key" + + " , b.prs_bedrijf_naam" + + " , " + lcl.xsqla('d.prs_dienst_omschrijving', 'd.prs_dienst_key') + + " , COALESCE(l.alg_locatie_omschrijving, " + safe.quoted_sql(L("lcl_all")) + ") alg_locatie_omschrijving" + + " , 'Alle' alg_gebouw_omschrijving" + + " , dl.prs_bedrijfdienstlocatie_key" + + " , l.alg_locatie_upper" + + " , b.prs_bedrijf_naam_upper" + + " FROM alg_v_aanweziglocatie l" + + " , prs_dienst d" + + " , prs_bedrijfdienstlocatie dl" + + " , prs_bedrijf b" + + " WHERE dl.alg_locatie_key = l.alg_locatie_key(+)" + + " AND (dl.alg_locatie_key IS NULL OR l.alg_locatie_key IS NOT NULL)" + + " AND dl.alg_gebouw_key IS NULL" + + " AND d.prs_dienst_key = dl.prs_dienst_key" + + " AND dl.prs_bedrijf_key = b.prs_bedrijf_key" + (bedrijf_key != -1 ? " AND b.prs_bedrijf_key = " + bedrijf_key : "") + (dienst_key != -1 ? " AND d.prs_dienst_key = " + dienst_key : "") + (locatie_key != -1 ? " AND l.alg_locatie_key = " + locatie_key : "") + (dloc_key != -1 ? " AND dl.prs_bedrijfdienstlocatie_key = " + dloc_key : "") - + " ORDER BY b.prs_bedrijf_naam_upper, UPPER(" + lcl.xsql('d.prs_dienst_omschrijving', 'd.prs_dienst_key')+"), alg_locatie_upper"; + + " UNION " + + " SELECT b.prs_bedrijf_key" + + " , b.prs_bedrijf_naam" + + " , " + lcl.xsqla('d.prs_dienst_omschrijving', 'd.prs_dienst_key') + + " , COALESCE(l.alg_locatie_omschrijving, " + safe.quoted_sql(L("lcl_all")) + ") alg_locatie_omschrijving" + + " , COALESCE(g.alg_gebouw_omschrijving, " + safe.quoted_sql(L("lcl_all")) + ") alg_gebouw_omschrijving" + + " , dl.prs_bedrijfdienstlocatie_key" + + " , NULL" + + " , b.prs_bedrijf_naam_upper" + + " FROM alg_v_aanweziglocatie l" + + " , alg_v_aanweziggebouw g" + + " , prs_dienst d" + + " , prs_bedrijfdienstlocatie dl" + + " , prs_bedrijf b" + + " WHERE dl.alg_gebouw_key = g.alg_gebouw_key(+)" + + " AND g.alg_locatie_key = l.alg_locatie_key(+)" + + " AND (dl.alg_gebouw_key IS NULL OR g.alg_gebouw_key IS NOT NULL)" + + " AND dl.alg_locatie_key IS NULL" + + " AND (dl.alg_locatie_key IS NOT NULL OR dl.alg_gebouw_key IS NOT NULL)" // Zowel dl.alg_locatie_key als dl.alg_gebouw_key beiden NULL wordt opgepakt door eerste SELECT. + + " AND d.prs_dienst_key = dl.prs_dienst_key" + + " AND dl.prs_bedrijf_key = b.prs_bedrijf_key" + + (bedrijf_key != -1 ? " AND b.prs_bedrijf_key = " + bedrijf_key : "") + + (dienst_key != -1 ? " AND d.prs_dienst_key = " + dienst_key : "") + + (locatie_key != -1 ? " AND l.alg_locatie_key = " + locatie_key : "") + + (dloc_key != -1 ? " AND dl.prs_bedrijfdienstlocatie_key = " + dloc_key : "") + + ")" + + " ORDER BY prs_bedrijf_naam_upper, UPPER(" + lcl.xsql('prs_dienst_omschrijving', 'd.prs_dienst_key') + "), alg_locatie_upper"; var buttons = []; diff --git a/APPL/PRS/prs_show_bedrijfadres.asp b/APPL/PRS/prs_show_bedrijfadres.asp index 4392198739..6db3b46dbb 100644 --- a/APPL/PRS/prs_show_bedrijfadres.asp +++ b/APPL/PRS/prs_show_bedrijfadres.asp @@ -121,7 +121,7 @@ FCLTHeader.Requires({plugins:["jQuery"]}) ROFIELDTR("fld", L("lcl_prs_companies_xsl"), prs_xsl, {suppressEmpty:true}); ROFIELDTR("fld", L("lcl_prs_bedrijfadres_ext"), prs_ext, {suppressEmpty:true}); ROFIELDTR("fld", L("lcl_prs_bedrijfadres_bijlage"), bijlage, {suppressEmpty:true}); - ROCHECKBOXTR("fldcheck", L("lcl_puoorder_flexfiles"), flexfiles==0 && S("puo_order_flexfiles")==1 || flexfiles==1); + ROCHECKBOXTR("fldcheck", L("lcl_puo_order_flexfiles"), flexfiles==0 && S("puo_order_flexfiles")==1 || flexfiles==1); ROFIELDTR("fld", L("lcl_prs_bedrijfadres_bijlage"), bijlage, {suppressEmpty:true}); BLOCK_END(); diff --git a/APPL/QVW/qv_ticket.inc b/APPL/QVW/qv_ticket.inc index 0da0181fda..563a22cdb3 100644 --- a/APPL/QVW/qv_ticket.inc +++ b/APPL/QVW/qv_ticket.inc @@ -92,7 +92,7 @@ function get_qv_ticket(qvRoot, qvauth) xmlhttp.send(req); // Ticket uit de response-XML peuteren - var ticketResponse = Server.CreateObject("Msxml2.DOMDocument.4.0"); + var ticketResponse = Server.CreateObject("Msxml2.DOMDocument.6.0"); ticketResponse.loadXML(xmlhttp.ResponseText); // for parsing var ticket_code; diff --git a/APPL/RES/res_bez_oproep.asp b/APPL/RES/res_bez_oproep.asp index c659285fb3..3551addb51 100644 --- a/APPL/RES/res_bez_oproep.asp +++ b/APPL/RES/res_bez_oproep.asp @@ -36,7 +36,8 @@ if (bez_key < 0) //+ " AND TRUNC(res_rsv_ruimte_van) = TRUNC(SYSDATE)" // Meerdaagse POOL-reservering is wel obscuur trouwens + " AND bb.bez_bezoekers_done IS NOT NULL" // Moet binnen zijn + " AND bb.bez_bezoekers_oproep IS NULL" // Nog niet opgeroepen - + " AND bb.bez_bezoekers_out IS NULL"; // En nog zeker niet weg + + " AND bb.bez_bezoekers_out IS NULL" // En nog zeker niet weg + + " ORDER BY bb.bez_bezoekers_done"; // Eerste eerst var oRs = Oracle.Execute(sql); if (oRs.Eof) abort_with_warning(L("lcl_res_bez_novisitor")); // Geen geschikte bezoeker diff --git a/APPL/RES/res_cat.inc b/APPL/RES/res_cat.inc index da07415e55..cd8e920c61 100644 --- a/APPL/RES/res_cat.inc +++ b/APPL/RES/res_cat.inc @@ -125,7 +125,7 @@ function make_cat(discipline_key, rsv_ruimte_key, existing_only, res_artikel_key + ", " + lcl.xsqla('ra.res_artikel_opmerking', 'ra.res_artikel_key') + ", COALESCE(ra.res_artikel_default, 0) res_artikel_default" + ", ra.res_artikel_prijs prijs" - + ", " + lcl.xsqla('ra.res_artikel_eenheid', 'res_artikel_key') + + ", " + lcl.xsqla('ra.res_artikel_eenheid', 'ra.res_artikel_key') + ", ra.res_artikel_prijs_vast" + ", CASE" + " WHEN (ra.res_artikel_ingangsdatum IS NULL OR ra.res_artikel_ingangsdatum <= " + ora_date1 + ")" diff --git a/APPL/RES/res_edit_objcat_save.asp b/APPL/RES/res_edit_objcat_save.asp index 27a24ab8e3..4aea3c6501 100644 --- a/APPL/RES/res_edit_objcat_save.asp +++ b/APPL/RES/res_edit_objcat_save.asp @@ -142,6 +142,7 @@ var must_warn = false; // must I warn about last-minute? // // // Request.Form is iets als inpb_c_216_2470136=0,inpbh1_c_216_2470136=14,inpbm1_c_216_2470136=30,inpb_c_217_2470138=0,inpbh1_c_217_2470138=14,inpbm1_c_217_2470138=30,...... +// waarbij 216 de res_artikel_key is en 2470136 de res_rsv_artikel_key // in het geval van catering for (i = 1; i <= Request.Form.Count; i++) { @@ -215,7 +216,7 @@ for (i = 1; i <= Request.Form.Count; i++) } cur_lev_m = fval; // De minuten } - if (a_arIns.length && a_arIns[a_arIns.length-1].res_rsv_deel == cur_rsv_art) + if (a_arIns.length && a_arIns[a_arIns.length-1].res_rsv_deel == cur_rsv_art && a_arIns[a_arIns.length-1].res_deel == cur_res_art) { // CAPG#161 __DoLog("Internal error: Attempting to add " + cur_res_art + " twice", "#FF0000"); __DoLog("Request.Form: " + String(Request.Form)); diff --git a/APPL/RES/res_list.inc b/APPL/RES/res_list.inc index cb7ded6409..c91f543985 100644 --- a/APPL/RES/res_list.inc +++ b/APPL/RES/res_list.inc @@ -1068,7 +1068,7 @@ function res_list (pautfunction, params) + ", ruimte_geg.alg_ruimte_key" + ", COALESCE(opstelalg.res_ruimte_nr, ruimte_geg.alg_ruimte_aanduiding) res_ruimte_nr" //res_ruimte_nr is al vertaald + ", " + ( minfo - ? "DECODE(res_geg.res_type, 'R', opstelalg.res_ruimte_nr, ruimte_geg.alg_ruimte_aanduiding)" + ? "COALESCE(opstelalg.res_ruimte_nr, ruimte_geg.alg_ruimte_omschrijving)" : "ruimte_geg.alg_ruimte_aanduiding" ) + " alg_ruimte_aanduiding" + ", res_geg.res_voorziening" @@ -1197,7 +1197,7 @@ function res_list (pautfunction, params) + ", ra.res_discipline_key AS res_ins_discipline_key" + ", rra.res_status_bo_key" + ", ra.res_artikel_key AS res_artikel_key" - + ", "+ (withprices ? "NVL2(rrr.res_rsv_ruimte_totaal, NULL, res.getartikelprijs(rra.res_rsv_artikel_key))" : "NULL") + " AS prijs" + + ", "+ (withprices ? "res.getartikelprijs(rra.res_rsv_artikel_key)" : "NULL") + " AS prijs" + ", ra.res_artikel_prijs AS stuks_prijs" + ", ra.res_artikel_btw AS btwtarief" + ", to_number(null) AS rsv_ruimte_aantal" @@ -1252,7 +1252,7 @@ function res_list (pautfunction, params) + ", rd.res_discipline_key AS res_ins_discipline_key" + ", rrd.res_status_bo_key" + ", TO_NUMBER(null) AS res_artikel_key" - + ", "+ (withprices ? "NVL2(rrr.res_rsv_ruimte_totaal, NULL, res.getdeelprijs(rrd.res_rsv_deel_key))" : "NULL") + " AS prijs" + + ", "+ (withprices ? "res.getdeelprijs(rrd.res_rsv_deel_key)" : "NULL") + " AS prijs" + ", rd.res_deel_prijs AS stuks_prijs" + ", to_number(null) AS btwtarief" + ", to_number(null) AS rsv_ruimte_aantal" @@ -1295,7 +1295,7 @@ function res_list (pautfunction, params) + ", rr.res_discipline_key AS res_ins_discipline_key" + ", rrr.res_status_bo_key" + ", to_number(null) AS res_artikel_key" - + ", "+ (withprices ? "COALESCE(rrr.res_rsv_ruimte_totaal, res.getruimteprijs(rrr.res_rsv_ruimte_key) - COALESCE(rrr.res_rsv_ruimte_korting, 0))" : "NULL") + " AS prijs" + + ", "+ (withprices ? "res.getruimteprijs(rrr.res_rsv_ruimte_key) - COALESCE(rrr.res_rsv_ruimte_korting, 0)" : "NULL") + " AS prijs" + ", to_number(null) AS stuks_prijs" + ", to_number(null) AS btwtarief" + ", 1 AS rsv_ruimte_aantal" diff --git a/APPL/RES/res_multi_create.asp b/APPL/RES/res_multi_create.asp index 1c069b962b..cff5f8a7e8 100644 --- a/APPL/RES/res_multi_create.asp +++ b/APPL/RES/res_multi_create.asp @@ -287,7 +287,7 @@ user.auth_required_or_abort(this_res.couldCreate); var np = $("#n_periods").val(); var bits = parseInt($("#dayofmonth").val(), 10) + parseInt($("#dayofweek").val(), 10); var data = { urole: "<%=urole%>", - np: np, + np: np != ""? np : 0, nextDate: nextDate.getTime(), lastDate: lastDate.getTime(), bits: bits diff --git a/APPL/RES/res_plan.js b/APPL/RES/res_plan.js index c7a17e3947..9a09194a71 100644 --- a/APPL/RES/res_plan.js +++ b/APPL/RES/res_plan.js @@ -70,7 +70,7 @@ function rsv_click(elm,urole) function room_table_click(evt, res_van, hour_px, res_t1, urole, activiteit) { - var hours = parseInt('offsetX' in event?event.offsetX:event.layerX, 10)/ hour_px + res_t1; + var hours = parseInt('offsetX' in evt?evt.offsetX:evt.layerX, 10)/ hour_px + res_t1; if (window.beingdragged) { window.beingdragged = false; @@ -111,7 +111,7 @@ function room_table_click(evt, res_van, hour_px, res_t1, urole, activiteit) function room_table_mouse(evt, res_van, hour_px, res_t1) { - var hours = parseInt('offsetX' in event?event.offsetX:event.layerX, 10)/ hour_px + res_t1; + var hours = parseInt('offsetX' in evt?evt.offsetX:evt.layerX, 10)/ hour_px + res_t1; var ob = (window.event ? window.event.srcElement : evt.target); if ($(ob).hasClass("tddiv")) ob = ob.parentElement || ob.parentNode; @@ -133,7 +133,7 @@ function room_table_mouse(evt, res_van, hour_px, res_t1) function obj_table_click(evt, res_van, hour_px, res_t1, urole) { - var hours = parseInt('offsetX' in event?event.offsetX:event.layerX, 10)/ hour_px + res_t1; + var hours = parseInt('offsetX' in evt?evt.offsetX:evt.layerX, 10)/ hour_px + res_t1; if (window.beingdragged) { window.beingdragged = false; diff --git a/APPL/RES/res_show_rsv_ruimte.asp b/APPL/RES/res_show_rsv_ruimte.asp index c377670230..3cc5b634bb 100644 --- a/APPL/RES/res_show_rsv_ruimte.asp +++ b/APPL/RES/res_show_rsv_ruimte.asp @@ -522,7 +522,7 @@ FCLTHeader.Requires({plugins: ["jQuery"]}) }); if (rrr.rsv_ruimte_verwijder == null) { - sql = "SELECT res.getruimteprijs (" + rsv_ruimte_key + ") ruimteprijs" + sql = "SELECT res.getruimteprijs (" + rsv_ruimte_key + ", 1) orgruimteprijs" + " , res.getdeelresprijs (" + rsv_ruimte_key + ") deelresprijs" + " , (SELECT SUM (res.getartikelprijs (res_rsv_artikel_key))" + " FROM res_rsv_artikel" @@ -534,10 +534,12 @@ FCLTHeader.Requires({plugins: ["jQuery"]}) + " AND res_rsv_ruimte_key = " + rsv_ruimte_key + ") deelprijs" + " FROM DUAL"; oRs = Oracle.Execute(sql) - ROFIELDTR("fldroomkosten", L("lcl_res_ruimte_kosten") + " " + S("currency_pref"), safe.curr(oRs("ruimteprijs").value), {suppressEmpty: true} ); - ROFIELDTR("fldvoorzkosten", L("lcl_res_voorzieningen_kosten") + " " + S("currency_pref"), safe.curr(oRs("artikelprijs").value + oRs("deelprijs").value), {suppressEmpty: true} ); + + ROFIELDTR("fldroomkosten", L("lcl_res_ruimte_kosten") + " " + S("currency_pref"), safe.curr(oRs("orgruimteprijs").value), {suppressEmpty: true} ); + ROFIELDTR("fldroomkorting", L("lcl_res_ruimtekorting") + " " + S("currency_pref"), safe.curr(rrr.ruimte_korting), {suppressEmpty: true} ); - ROFIELDTR("fldroomtotaal", L("lcl_res_ruimtetotaal") + " " + S("currency_pref"), safe.curr(rrr.ruimte_totaal), {suppressEmpty: true} ); + ROFIELDTR("fldroomtotaal", L("lcl_res_ruimtetotaal") + " " + S("currency_pref"), safe.curr(rrr.ruimte_totaal), {suppressEmpty: rrr.ruimte_totaal===null} ); + ROFIELDTR("fldvoorzkosten", L("lcl_res_voorzieningen_kosten") + " " + S("currency_pref"), safe.curr(oRs("artikelprijs").value + oRs("deelprijs").value), {suppressEmpty: true} ); ROFIELDTR("fldrvskosten", L("lcl_res_rsv_kosten") + " " + S("currency_pref"), safe.curr(oRs("deelresprijs").value), {id: "kosten",suppressEmpty: true} ); } } diff --git a/APPL/Shared/Login.inc b/APPL/Shared/Login.inc index 26952d9182..ebd728644c 100644 --- a/APPL/Shared/Login.inc +++ b/APPL/Shared/Login.inc @@ -13,8 +13,9 @@ moet je ook vele sso.asp's langs. Dan toch maar hier */ +%> - +<% // Elders is prs_key geauthenticeerd. Registreer die hier als de actieve gebruiker. function doLogin(prs_key, params) { diff --git a/APPL/Shared/Shared.inc b/APPL/Shared/Shared.inc index f29f7de650..3ff43ad3cf 100644 --- a/APPL/Shared/Shared.inc +++ b/APPL/Shared/Shared.inc @@ -286,6 +286,13 @@ function _get_ParamDate(pColl, pName, defVal) return null; } // Error message will get to client and/or IIS logfiles + if (String(Request.ServerVariables("REQUEST_METHOD")) == "HEAD") + { + __DoLog("Parameter '" + pName + "' is not date, probably because of unexpected HEAD request", "#FF0000"); + __DoLog("Useragent: " + Request.ServerVariables("HTTP_USER_AGENT")); + __DoLog("Referer: " + Request.ServerVariables("HTTP_REFERER")); + Response.End; + } eval("INTERNAL_ERROR_PARAMETER_" + pName + "_IS_NOT_DATE"); // A required parameter was not supplied } diff --git a/APPL/Shared/contactpersoonselector.inc b/APPL/Shared/contactpersoonselector.inc index 1dd2382a4c..2b7684abfa 100644 --- a/APPL/Shared/contactpersoonselector.inc +++ b/APPL/Shared/contactpersoonselector.inc @@ -53,8 +53,11 @@ function FCLTcontactpersoonselector(fieldName, objectName, params) + " AND cp.prs_contactpersoon_key = " + params.contactpersoonKey + filtClause; var oRs = Oracle.Execute(sql); - lcontactpersoonName = oRs("naam").value; - lextraInit = oRs("prs_bedrijf_naam").value; + if (!oRs.eof) + { + lcontactpersoonName = oRs("naam").value; + lextraInit = oRs("prs_bedrijf_naam").value; + } } // Bouw de url voor de contactpersoons query op diff --git a/APPL/Shared/default.inc b/APPL/Shared/default.inc index 7c432bdef8..2f0a200da0 100644 --- a/APPL/Shared/default.inc +++ b/APPL/Shared/default.inc @@ -9,7 +9,7 @@ Note: Sinds 5.2.2 zitten de settings in de database */ -var FCLTVersion="5.4.3"; // software versie +var FCLTVersion="5.4.3a"; // software versie var FCLTMinDatabaseSchema="23"; var custpath = rooturl + "/cust/" + customerId; // path to customer files diff --git a/APPL/Shared/discxalg3d.inc b/APPL/Shared/discxalg3d.inc index 1e55ec71b7..5ffcaee8f7 100644 --- a/APPL/Shared/discxalg3d.inc +++ b/APPL/Shared/discxalg3d.inc @@ -118,7 +118,7 @@ function discxalg3d ( } if (thisLevel >= 0 && rkeys=="") { - __Log("" + pautfunction+" for disciplines " + discsOfThisLevel + " requires ALG level " + thisLevel + " but user has no 'werkplek'"); + __SafeLog("" + pautfunction+" for disciplines " + discsOfThisLevel + " requires ALG level " + thisLevel + " but user has no 'werkplek'"); continue; // Geen (vereiste) werkplek, dus voor deze discipline(s) geen rechten } diff --git a/APPL/Shared/header.inc b/APPL/Shared/header.inc index 5f3a5cf682..3e01c891b6 100644 --- a/APPL/Shared/header.inc +++ b/APPL/Shared/header.inc @@ -66,7 +66,7 @@ FCLTHeader = Requires: function(params) { if (JSON_Result) - __Log("JSON_Result staat aan, dan is FCLTHeader.Requires erg onlogisch."); + __SafeLog("JSON_Result staat aan, dan is FCLTHeader.Requires erg onlogisch."); if (!params) params = {}; @@ -354,7 +354,15 @@ FCLTHeader = inCss = inCss.replace(/\n\s+/g, "\n"); // alle leading spaties schrappen inCss = inCss.replace(/\n\n/g, "\n"); // lege regels schrappen - var outFile = this._fso.OpenTextFile(outfname, 2, true); // 2=write, true=create? + try + { + var outFile = this._fso.OpenTextFile(outfname, 2, true); // 2=write, true=create? + } + catch (e) + { + Response.Write("ERROR: Unable to write " + outfname + "
" + e.description); + Response.End; + } outFile.WriteLine("/*********************************"); outFile.WriteLine(" * GENERATED FILE, DO NOT MODIFY *"); outFile.WriteLine(" *********************************/"); diff --git a/APPL/Shared/iface.inc b/APPL/Shared/iface.inc index 6a0b447907..626af8b735 100644 --- a/APPL/Shared/iface.inc +++ b/APPL/Shared/iface.inc @@ -8,7 +8,7 @@ <% if (JSON_Result) - __Log("JSON_Result staat aan, dan is iface.inc includen erg onlogisch."); + __SafeLog("JSON_Result staat aan, dan is iface.inc includen erg onlogisch."); FCLTHeader.Requires({ plugins: ["jQuery"], js: ["iface.js"]}) var isPrinting = getQParamInt("print", 0) == 1; diff --git a/APPL/Shared/kenmerk_common.inc b/APPL/Shared/kenmerk_common.inc index d13b09244f..c0ccc1e316 100644 --- a/APPL/Shared/kenmerk_common.inc +++ b/APPL/Shared/kenmerk_common.inc @@ -396,7 +396,7 @@ function listKenmerk(sql, module, key, props) $("#<%=requiredbyfield%>").addClass("<%=required_class%>"); <% } %> checkRequiredGroup("<%=required_group%>"); - $("#requiredgeg_<%=nameprefix + idCounter%>").remove(); // Na het uitvoeren kan de ready functie weer weg zodat deze niet + $("#requiredgeg_<%=nameprefix + idCounter%>").remove(); // Na het uitvoeren kan de ready functie weer weg zodat deze niet }); @@ -1543,13 +1543,16 @@ function _saveFlexKenmerken(parentKey, params) // TODO: support multiMode! // Kunnen met name onstaan als iemand bijvoorbeeld de stdmelding wijzigt van een melding, // srtactiviteit van een reservering etc. // params.currentKenmerkenSQL bevat alle geldige kenmerkwaarden (ongeacht autorisatie) - var sqldelete = "DELETE FROM " + params.kenmerkTable - + " WHERE " + params.kenmerkParentKey + " = " + parentKey - + " AND " + params.kenmerkKey + " NOT IN (SELECT " + params.kenmerkKey + " FROM (" + params.currentKenmerkenSQL + "))"; - if (params.moduleName) // voorzichtig - sqldelete += " AND " + params.moduleName + " = " + safe.quoted_sql(params.moduleVal); + if (!params.noFlexCleanup) + { + var sqldelete = "DELETE FROM " + params.kenmerkTable + + " WHERE " + params.kenmerkParentKey + " = " + parentKey + + " AND " + params.kenmerkKey + " NOT IN (SELECT " + params.kenmerkKey + " FROM (" + params.currentKenmerkenSQL + "))"; + if (params.moduleName) // voorzichtig + sqldelete += " AND " + params.moduleName + " = " + safe.quoted_sql(params.moduleVal); - Oracle.Execute(sqldelete); + Oracle.Execute(sqldelete); + } // Nu oude kenmerken verzamelen in kenmerk_keys var oRs = Oracle.Execute(params.currentKenmerkenSQL); while( !oRs.eof ) { diff --git a/APPL/Shared/locale.inc b/APPL/Shared/locale.inc index 0ab6af4551..6c6164397f 100644 --- a/APPL/Shared/locale.inc +++ b/APPL/Shared/locale.inc @@ -273,7 +273,7 @@ lcl = { // Waarschijnlijk vervallen in FAC_LCLASP.inc maar nog niet gedropt uit FAC_LOCALEITEMS // Of: (bijvoorbeeld mld_melding.asp) wel een set_dialect maar veel lcl's worden // in dit bestand helemaal niet gebruikt - __Log("Dialect label not used in this file: " + oRs("fac_localeitems_lcl").Value + ""); + __SafeLog("Dialect label not used in this file: " + oRs("fac_localeitems_lcl").Value + ""); } } } diff --git a/APPL/Shared/resultset_table_v2.inc b/APPL/Shared/resultset_table_v2.inc index 6427bafa69..6d684b2f5a 100644 --- a/APPL/Shared/resultset_table_v2.inc +++ b/APPL/Shared/resultset_table_v2.inc @@ -242,10 +242,10 @@ function __rsAddAction(params) this.actions.push(params); }; - +// JGL: O.a. UWVA smoelenboek ResultsetTable.prototype.ProcessAsXMLXSL = function() { - var xmlDoc = new ActiveXObject("MSXML2.DOMDocument.4.0"); + var xmlDoc = new ActiveXObject("MSXML2.DOMDocument.6.0"); xmlDoc.appendChild(xmlDoc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"windows-1252\"")) // MGE: De encoding komt niet in de xml te staan, maar alleen de version: < ?xml version="1.0"? >. MSXML print nooit de encoding. @@ -369,11 +369,12 @@ ResultsetTable.prototype.ProcessAsXMLXSL = function() Response.ContentType = "text/html"; var xslfile = Server.MapPath(custpath+'\\xsl\\cust.xsl'); - var xslt = new ActiveXObject("Msxml2.XSLTemplate.4.0"); - var xsldoc = new ActiveXObject("Msxml2.FreeThreadedDOMDocument.4.0"); + var xslt = new ActiveXObject("Msxml2.XSLTemplate.6.0"); + var xsldoc = new ActiveXObject("Msxml2.FreeThreadedDOMDocument.6.0"); var xslproc; xsldoc.async = false; xsldoc.load(xslfile); + xsldoc.resolveExternals = true; xslt.stylesheet = xsldoc; xslproc = xslt.createProcessor(); xslproc.input = xmlDoc; diff --git a/APPL/Shared/save2db.inc b/APPL/Shared/save2db.inc index 77e1784756..052dbadff0 100644 --- a/APPL/Shared/save2db.inc +++ b/APPL/Shared/save2db.inc @@ -230,15 +230,15 @@ function buildTrackText(typ, oldjsval, newjsval, params) var known_adotypes = { - key: [adNumeric], - date: [adDBTimeStamp], - datetime: [adDBTimeStamp], - number: [adNumeric], - float: [adNumeric], - varchar: [adVarChar], - check: [adNumeric], - check0: [adNumeric], - time: [adDBTimeStamp], + key: ['NUMBER'], + date: ['DATE'], + datetime: ['DATE'], + number: ['NUMBER'], + float: ['NUMBER'], + varchar: ['VARCHAR2'], + check: ['NUMBER'], + check0: ['NUMBER'], + time: ['DATE'], sql: [] }; @@ -253,6 +253,7 @@ function checkFieldTypes(tabel, fields) + " ELSE ''" + " END column_name" + " , COALESCE(attr_type_name, data_type) data_type" + + " , data_scale" + " , attr_name" + " FROM user_tab_columns utc" + " , user_type_attrs uta" @@ -273,7 +274,12 @@ function checkFieldTypes(tabel, fields) while (!oRs.eof) { if (oRs("column_name").value == dbs.toUpperCase()) - dbfield = oRs("column_name").value; + { + dbfield = { name: oRs("column_name").value, + Type: oRs("data_type").value, + NumericScale: oRs("data_scale").value + }; + } //else //__Log(oRs.Fields(j).Name.toUpperCase() + " is het niet?"); oRs.MoveNext(); @@ -293,17 +299,18 @@ function checkFieldTypes(tabel, fields) } if (!found && field.typ != "sql") { - __Log("" + dbs + " is opgegeven als type '" + field.typ + "' maar is (zie ../shared/adovbs.inc): " + dbfield.Type + ""); + __SafeLog("" + dbs + " is opgegeven als type '" + field.typ + "' maar is: " + dbfield.Type + ""); } else { if (field.typ == "number" && dbfield.NumericScale > 0) { - __Log("" + __SafeLog("" + dbs + " is gedefinieerd als 'number' maar heeft " + dbfield.NumericScale + " decimalen dus 'float' ligt meer voor de hand"); } } + oRs.MoveFirst(); // voor de volgende } oRs.Close(); } @@ -432,7 +439,7 @@ function buildInsert(tabel, fields, params) vals += tupels[i].sql; } } - + // De verzamelde object type nog toevoegen aan cols en vals: OBJECT_TYPE(field1 => val1, field2 => val2). for (var obj_i in obj) { @@ -441,7 +448,7 @@ function buildInsert(tabel, fields, params) cols += obj_identifier[1]; vals += obj_identifier[0] + "(" + obj[obj_i] + ")"; } - + var sql = "INSERT INTO "+tabel+"("+cols+") VALUES ("+vals+")"; return { sql: sql, sequences: result.sequences}; } diff --git a/APPL/Shared/xml_converter.inc b/APPL/Shared/xml_converter.inc index 8ad692e47d..c0eaabe83b 100644 --- a/APPL/Shared/xml_converter.inc +++ b/APPL/Shared/xml_converter.inc @@ -3,53 +3,16 @@ $Id$ */ %> <% - - -// Conversion functions -function XML2STR(xmlfile, xslfile) -{ - - __Log("XML2STR: From XML:'" + xmlfile + "' with XSL:'" + xslfile); - var xmlfile = Server.MapPath(xmlfile); - var xslfile = Server.MapPath(xslfile); - var cRetValue = '' - - // Load the XML - var source = Server.CreateObject("MSXML2.DOMDocument.4.0"); - source.async = false; - if( ! source.load(xmlfile) ) { - %>

XML: <%=source.parseError.reason%> @ - <%=source.parseError.line%>.<%=source.parseError.linepos%>

<% - } - - // Load the XSLT - var style = Server.CreateObject("MSXML2.DOMDocument.4.0"); - style.async = false; - if( ! style.load(xslfile) ) { - %>

XSL: <%=style.parseError.reason%>

@ - <%=style.parseError.line%>.<%=style.parseError.linepos%>

<% - } - -// var result = new ActiveXObject("Msxml2.DOMDocument.4.0"); -// result.async = false; -// result.validateOnParse = true; - - XML2STR = source.transformNode(style); - return XML2STR; -} - -// Als XML2STR maar dan met mode? +// Alleen nog in gebruik voor CAD/PrintFG.asp, daar nog eens uit-schrijven function XML2STR2(xmlfile, xslfile, mode) { - __Log("XML2STR2: From XML:'" + xmlfile + "' with XSL:'" + xslfile); var xmlfile = Server.MapPath(xmlfile); var xslfile = Server.MapPath(xslfile); var cRetValue = '' - - var xslt = new ActiveXObject("Msxml2.XSLTemplate.4.0"); - var xsldoc = new ActiveXObject("Msxml2.FreeThreadedDOMDocument.4.0"); + var xslt = new ActiveXObject("Msxml2.XSLTemplate.6.0"); + var xsldoc = new ActiveXObject("Msxml2.FreeThreadedDOMDocument.6.0"); var xslproc; xsldoc.async = false; xsldoc.load(xslfile); @@ -57,8 +20,9 @@ function XML2STR2(xmlfile, xslfile, mode) var myErr = xsldoc.parseError; __Log("You have error " + myErr.reason); } else { + xsldoc.resolveExternals = true; xslt.stylesheet = xsldoc; - var xmldoc = new ActiveXObject("Msxml2.DOMDocument.4.0"); + var xmldoc = new ActiveXObject("Msxml2.DOMDocument.6.0"); xmldoc.async = false; xmldoc.load(xmlfile); if (xmldoc.parseError.errorCode != 0) { @@ -82,8 +46,8 @@ function STR2Stream(xmlstr, xslfile, Stream, params) params = params || {}; var xslfile = Server.MapPath(xslfile); - var xslt = new ActiveXObject("Msxml2.XSLTemplate.4.0"); - var xsldoc = new ActiveXObject("Msxml2.FreeThreadedDOMDocument.4.0"); + var xslt = new ActiveXObject("Msxml2.XSLTemplate.6.0"); + var xsldoc = new ActiveXObject("Msxml2.FreeThreadedDOMDocument.6.0"); var xslproc; xsldoc.async = false; xsldoc.load(xslfile); @@ -96,8 +60,10 @@ function STR2Stream(xmlstr, xslfile, Stream, params) } else { + xsldoc.resolveExternals = true; // anders op de volgende regel al: + // A reference to variable or parameter 'srtnotificatiecode' cannot be resolved xslt.stylesheet = xsldoc; - var xmldoc = new ActiveXObject("Msxml2.DOMDocument.4.0"); + var xmldoc = new ActiveXObject("Msxml2.DOMDocument.6.0"); xmldoc.async = false; xmldoc.loadXML(xmlstr); if (xmldoc.parseError.errorCode != 0) { diff --git a/APPL/SlnkDwf/ToonIMG.asp b/APPL/SlnkDwf/ToonIMG.asp index 6cdcd5e5a6..1d448105d7 100644 --- a/APPL/SlnkDwf/ToonIMG.asp +++ b/APPL/SlnkDwf/ToonIMG.asp @@ -49,7 +49,7 @@ if (typeof(dllMajor) == 'undefined' || { var full = window.event && window.event.ctrlKey && window.event.altKey && window.event.shiftKey; var version = "SLNKDwf DLL Version: <%=_oAbout.VersionString%>" - + "\n\n(c) 2005-2014 SG|facilitor"; + + "\n\n(c) 2005-2014 Facilitor B.V."; if (full) { version += "\n\n<%=fullPath.replace(/\\/g,'\\\\')%>"