FMHN#86276

- Fix regex expression

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

APPL/API2/model_cad_tekening.inc

@@ -65,7 +65,7 @@ function model_cad_tekening(niveau, params)
 
         // Save in DB (link file to floor)
         var cadfields = [
-            { dbs: "cad_tekening_filenaam", typ: "varchar", val: safefilename.replace(/.dwf$/i, "") }
+            { dbs: "cad_tekening_filenaam", typ: "varchar", val: safefilename.replace(/\.dwf$/i, "") }
         ];
         var sql = buildUpdate("cad_tekening", cadfields, { noValidateToken: true }) + " cad_tekening_key = " + the_key;
         Oracle.Execute(sql);
@@ -116,7 +116,7 @@ function model_cad_tekening(niveau, params)
         // Save in DB (link file to floor)
         var cadfields = [
             { dbs: "cad_tekening_key",      typ: "key",     seq: "cad_s_cad_tekening_key" },
-            { dbs: "cad_tekening_filenaam", typ: "varchar", val: safefilename.replace(/.dwf$/i, "") },
+            { dbs: "cad_tekening_filenaam", typ: "varchar", val: safefilename.replace(/\.dwf$/i, "") },
             { dbs: "alg_locatie_key",       typ: "key",     val: getLocation(jsondata.floor) },
             { dbs: "alg_verdieping_key",    typ: "key",     val: jsondata.floor },
             { dbs: "cad_tekening_type",     typ: "varchar", val: "P" }

APPL/CAD/EvictionPlan.asp

@@ -134,7 +134,7 @@ function onOtherDrawing()
                          for (; !fc4.atEnd(); fc4.moveNext())
                          {
                              var vTekening0 = fc4.item().Name;
-                             if (vTekening0.match(/.dwf$/i))
+                             if (vTekening0.match(/\.dwf$/i))
                              {
                 %>    <option <%=nn==0?" SELECTED='1'":""%>><%=Server.HTMLEncode(vTekening0)%></option>
                 <%

APPL/CAD/FGII.inc

@@ -24,8 +24,8 @@ var _DOBBELLINEWEIGHT = S("fg_symbolweight")*2/3;
 function FindDWF(drawing, scenario_key, dwfmode)
 {
     // Strip eventuele DWG en DWF van filenaam
-    var fname = drawing.replace(/.dwg$/ig,'');
-    var fname = fname.replace(/.dwf$/ig,'');
+    var fname = drawing.replace(/\.dwg$/ig,'');
+    var fname = fname.replace(/\.dwf$/ig,'');
     switch (dwfmode)
     {
         case 1: var fullpath = S("flexfilespath") + "/cad/concept/";

APPL/CAD/cad_contour_list.inc

@@ -71,8 +71,8 @@ function contour_list(pautfunction, params)
     else
     {
         var fname = oRs("cad_tekening_filenaam").value;
-        fname = fname.replace(/.dwg$/i,'');
-        fname = fname.replace(/.dwf$/i,'');
+        fname = fname.replace(/\.dwg$/i,'');
+        fname = fname.replace(/\.dwf$/i,'');
         var fullnameActual = S("flexfilespath") + "/cad/" + fname + ".dwf";
         var fullnameConcept = S("flexfilespath") + "/cad/concept/" + fname + ".dwf";
         var fso = new ActiveXObject("Scripting.FileSystemObject");

APPL/CAD/cad_verify.asp

@@ -241,7 +241,7 @@ if (concept==1 && !dwf) {
          for (; !fc4.atEnd(); fc4.moveNext())
          {
              vTekening0 = fc4.item().Name;
-             if (vTekening0.match(/.dwf$/i)||vTekening0.match(/.w2d$/))
+             if (vTekening0.match(/\.dwf$/i)||vTekening0.match(/.w2d$/))
              {
                 var dt = new Date(fc4.item().DateLastModified);
 %>    <option <%=vTekening0==dwf?"selected='1'":""%> value='<%=safe.htmlattr(vTekening0)%>' title='<%=toISODateTimeString(dt)%>'><%= safe.html(vTekening0)%></option>

APPL/CAD/contour_search.asp

@@ -52,8 +52,8 @@ if (verdieping_key > 0 || (gebouw_key > 0 && bttype == "T"))
            + " AND ct.alg_verdieping_key IS NULL");
   oRs = Oracle.Execute(sql);
   var fname = oRs("cad_tekening_filenaam").value;
-  fname = fname.replace(/.dwg$/i,'');
-  fname = fname.replace(/.dwf$/i,'');
+  fname = fname.replace(/\.dwg$/i,'');
+  fname = fname.replace(/\.dwf$/i,'');
   var fullnameConcept = S("flexfilespath") + "/cad/concept/" + fname + ".dwf";
   var fso = new ActiveXObject("Scripting.FileSystemObject");
   concept = fso.FileExists(fullnameConcept);
@@ -113,4 +113,4 @@ SEARCH_BLOCK_START();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 
+<% ASPPAGE_END(); %>

APPL/CAD/contour_update.asp

@@ -54,8 +54,8 @@ if (floor_key > 0 || (building_key > 1 && bttype == "T")) // alvast een en ander
     oRs = Oracle.Execute(sql);
     var cad_tek_key = oRs("cad_tekening_key").value;
     var fname = oRs("cad_tekening_filenaam").value;
-    fname = fname.replace(/.dwg$/i,'');
-    fname = fname.replace(/.dwf$/i,'');
+    fname = fname.replace(/\.dwg$/i,'');
+    fname = fname.replace(/\.dwf$/i,'');
     var fullnameActual = S("flexfilespath") + "/cad/" + fname + ".dwf";
     var fullnameConcept = S("flexfilespath") + "/cad/concept/" + fname + ".dwf";
     var fso = new ActiveXObject("Scripting.FileSystemObject");

APPL/Shared/BijlagenStream.asp

@@ -92,7 +92,7 @@ if (pModule === "ORDN") {
 
     // Bestanden zijn nu te vinden op ...cust/[custid]/flexfiles/[module]/[key]/
     __Log("vAttachPath = " + vAttachPath);
-    if (!pDosave && S("view_dwf_with_slnkdwf") && String(vFileName).match(/.dwf$/i))
+    if (!pDosave && S("view_dwf_with_slnkdwf") && String(vFileName).match(/\.dwf$/i))
         Response.Redirect("../SLNKDwf/ShowDWF.asp?absfile=" + vAttachPath + "/" + safe.filename(vFileName));
 
     if (vFileName.match(/\.encrypted$/)) // Auto decrypt gewenst