Updating:

- Microting.eForm to 2.1.140.
Changing the hardcoded paths for pdf and pictures, to use SDK information from settings table.

Author: renemadsen

eFormAPI/eFormAPI/Controllers/TemplateFilesController.cs

@@ -30,7 +30,6 @@ public HttpResponseMessage Csv(int id)
             var filePath = System.Web.Hosting.HostingEnvironment.MapPath($"~/bin/output/{fileName}");
             var fullPath = core.CasesToCsv(id, null, null, filePath,
                 $"{core.GetHttpServerAddress()}/" + "api/template-files/get-image/");
-            //$"{core.GetHttpServerAddress()}/" + "api/template-files/get-image?&filename=");
 
             var result = new HttpResponseMessage(HttpStatusCode.OK);
             var fileStream = new FileStream(fullPath, FileMode.Open, FileAccess.Read);
@@ -47,7 +46,9 @@ public HttpResponseMessage Csv(int id)
         [Route("api/template-files/get-image/{fileName}.{ext}")]
         public HttpResponseMessage GetImage(string fileName, string ext, string noCache = "noCache")
         {
-            var filePath = HttpContext.Current.Server.MapPath($"~/output/datafolder/picture/{fileName}.{ext}");
+            var core = _coreHelper.GetCore();
+
+            var filePath = $"{core.GetPicturePath()}\\{fileName}.{ext}";
             if (!File.Exists(filePath))
             {
                 var resultNotFound = new HttpResponseMessage(HttpStatusCode.NotFound);
@@ -72,7 +73,9 @@ public HttpResponseMessage GetImage(string fileName, string ext, string noCache
         [Route("api/template-files/rotate-image")]
         public OperationResult RotateImage(string fileName)
         {
-            var filePath = HttpContext.Current.Server.MapPath($"~/output/datafolder/picture/{fileName}");
+            var core = _coreHelper.GetCore();
+
+            var filePath = $"{core.GetPicturePath()}\\{fileName}";
             if (!File.Exists(filePath))
             {
                 return new OperationResult(false, "File not found");
@@ -123,7 +126,9 @@ public OperationResult DeleteImage(string fileName, int fieldId, int uploadedObj
         [Route("api/template-files/get-pdf-file")]
         public HttpResponseMessage GetPdfFile(string fileName)
         {
-            var filePath = HttpContext.Current.Server.MapPath($"~/output/datafolder/pdf/{fileName}.pdf");
+            var core = _coreHelper.GetCore();
+
+            var filePath = $"{core.GetPdfPath()}\\{fileName}.pdf";
             if (!File.Exists(filePath))
             {
                 return new HttpResponseMessage(HttpStatusCode.NotFound);

eFormAPI/eFormAPI/Web.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   https://go.microsoft.com/fwlink/?LinkId=301879
@@ -55,9 +55,9 @@
       <remove name="OPTIONSVerbHandler" />
       <remove name="TRACEVerbHandler" />
       <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-      <add name="get-image-png" path="*.png" verb="GET" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" responseBufferLimit="0"/>
-      <add name="get-image-jpg" path="*.jpg" verb="GET" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" responseBufferLimit="0"/>
-      <add name="get-image-jpeg" path="*.jpeg" verb="GET" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" responseBufferLimit="0"/>
+      <add name="get-image-png" path="*.png" verb="GET" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" responseBufferLimit="0" />
+      <add name="get-image-jpg" path="*.jpg" verb="GET" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" responseBufferLimit="0" />
+      <add name="get-image-jpeg" path="*.jpeg" verb="GET" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" responseBufferLimit="0" />
     </handlers>
     <validation validateIntegratedModeConfiguration="false" />
     <modules />

eFormAPI/eFormAPI/eFormAPI.Web.csproj

@@ -130,8 +130,8 @@
     <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
     </Reference>
-    <Reference Include="Microting.eForm, Version=2.1.132.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.2.1.132\lib\net45\Microting.eForm.dll</HintPath>
+    <Reference Include="Microting.eForm, Version=2.1.140.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\Microting.eForm.2.1.140\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
       <HintPath>..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll</HintPath>

eFormAPI/eFormAPI/packages.config

@@ -39,7 +39,7 @@
   <package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
-  <package id="Microting.eForm" version="2.1.132" targetFramework="net461" />
+  <package id="Microting.eForm" version="2.1.140" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net46" />
   <package id="MySql.Data" version="6.9.11" targetFramework="net46" />
   <package id="MySql.Data.Entity" version="6.9.11" targetFramework="net46" />