Merge 2022.3 Gold E patches

svn path=/Website/trunk/; revision=58883

APPL/FAC/fac_verify.inc

@@ -606,8 +606,14 @@ checker("HTTP Request protocol",
             }
         )
 
-var CN = String(Request.ServerVariables("HTTPS_SERVER_SUBJECT"));
-//CN = "CN=areo.facilitor.de";
+var subject = String(Request.ServerVariables("HTTPS_SERVER_SUBJECT")).split(", ");
+// subject = "CN=areo.facilitor.de" of "C=NL, S=Utrecht, L=Utrecht, O=ProRail B.V., CN=fmis.testprorail.nl"
+var CN="";
+for (var i=0; i < subject.length; i++)
+{
+    if (subject[i].substr(0, 3) == 'CN=')
+        CN = subject[i];
+}
 if (CN)
 checker("Certificate checker for " + CN,
             function ()
@@ -615,7 +621,7 @@ checker("Certificate checker for " + CN,
                 try
                 {
                     // CertStore is no license required, geen lockcode nodig
-                    //oChilglob = new ActiveXObject("Chilkat_9_5_0.Global");
+                    var oChilglob = new ActiveXObject("Chilkat_9_5_0.Global"); // voor version
                     //var txt ="Version: " + oChilglob.Version;
                     //var success = oChilglob.UnlockBundle(S("puo_chilkat_secret"));
                     //if (success != 1)
@@ -647,7 +653,6 @@ checker("Certificate checker for " + CN,
                 }
 
                 var cert = certStore.FindCertBySubjectCN(commonname);
-                //var cert = certStore.FindCertBySubjectCN("marx.mareon-test.nl");
                 if (!cert)
                 {
                     return { result: resultcodes.warning,
@@ -659,6 +664,9 @@ checker("Certificate checker for " + CN,
                 var dtFrom = new Date(cert.ValidFromStr);
                 var dtTo = new Date(cert.ValidToStr);
                 msg += "<br>Found and valid from " + toDateTimeString(dtFrom) + " to " + toDateTimeString(dtTo);
+                // pas vanaf 9.5.0.85, wij hebben nog 9.5.0.83 in gebruik?
+                // msg += "<br><pre>" + Server.HTMLEncode(cert.SubjectAlternativeName) + "</pre>";
+
                 var days = Math.floor((dtTo.getTime() - new Date().getTime()) / 1000 / 3600 / 24);
 
                 return { result: days > 28?resultcodes.ok:days > 7?resultcodes.warning:resultcodes.error,
@@ -1912,7 +1920,7 @@ checker("Chilkat Installed",
             {
                 try
                 {
-                    oChilglob = new ActiveXObject("Chilkat_9_5_0.Global");
+                    var oChilglob = new ActiveXObject("Chilkat_9_5_0.Global");
                 }
                 catch(e)
                 {

APPL/MARX/export/BCTAdapter.asp

@@ -190,7 +190,7 @@ var postdata =
 {     "requestid": request_id, // deze komt met de XML response helaas niet terug
       "partner": config.BCT_partnerID,
       "partnertenant": klantid,
-      "jobid": "invoice_aareon",
+      "jobid": "Aareon_NL_invoice",
       "jobdescription": "invoice_mareon",
       "filename": filename,
       "contentsize": data64.length,