Skip to content

Commit d6319b4

Browse files
renemadsenrenemadsen
authored
Merge branch 'master' into master
2 parents f83f27e + 3536340 commit d6319b4

File tree

3 files changed

+88
-81
lines changed

3 files changed

+88
-81
lines changed

‎eFormAPI/eFormAPI/Controllers/TemplateFilesController.cs‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Drawing;
33
using System.IO;
4-
using System.IO.Compression;
54
using System.Net;
65
using System.Net.Http;
76
using System.Net.Http.Headers;
@@ -12,6 +11,7 @@
1211
using eFormApi.BasePn.Infrastructure.Helpers;
1312
using eFormApi.BasePn.Infrastructure.Messages;
1413
using eFormApi.BasePn.Infrastructure.Models.API;
14+
using Ionic.Zip;
1515

1616
namespace eFormAPI.Web.Controllers
1717
{
@@ -237,14 +237,11 @@ public HttpResponseMessage UploadEformZip()
237237
{
238238
return Request.CreateResponse(HttpStatusCode.BadRequest, "Folder error");
239239
}
240-
if (!Directory.Exists(saveFolder))
241-
{
242-
Directory.CreateDirectory(saveFolder);
243-
}
244-
if (!Directory.Exists(zipArchiveFolder))
245-
{
246-
Directory.CreateDirectory(zipArchiveFolder);
247-
}
240+
241+
Directory.CreateDirectory(saveFolder);
242+
243+
Directory.CreateDirectory(zipArchiveFolder);
244+
248245
var files = HttpContext.Current.Request.Files;
249246
if (files.Count > 0)
250247
{
@@ -253,22 +250,26 @@ public HttpResponseMessage UploadEformZip()
253250
{
254251
var filePath = Path.Combine(zipArchiveFolder, Path.GetFileName(httpPostedFile.FileName));
255252
var extractPath = Path.Combine(saveFolder);
256-
if (!File.Exists(filePath))
253+
if (File.Exists(filePath))
257254
{
258-
httpPostedFile.SaveAs(filePath);
255+
File.Delete(filePath);
259256
}
257+
httpPostedFile.SaveAs(filePath);
260258
if (File.Exists(filePath))
261259
{
262-
if (!Directory.Exists(extractPath))
263-
{
264-
Directory.CreateDirectory(extractPath);
265-
}
266-
else
260+
Directory.CreateDirectory(extractPath);
261+
FoldersHelper.ClearFolder(extractPath);
262+
263+
using (var zip = ZipFile.Read(filePath))
267264
{
268-
FoldersHelper.ClearFolder(extractPath);
265+
foreach (var entry in zip.Entries)
266+
{
267+
if (entry.FileName.Contains(".png") || entry.FileName.Contains("jrxml"))
268+
{
269+
entry.Extract(extractPath);
270+
}
271+
}
269272
}
270-
271-
ZipFile.ExtractToDirectory(filePath, extractPath);
272273
File.Delete(filePath);
273274
_coreHelper.bus.SendLocal(new GenerateJasperFiles(templateId));
274275

@@ -278,10 +279,12 @@ public HttpResponseMessage UploadEformZip()
278279
}
279280
return Request.CreateResponse(HttpStatusCode.BadRequest, LocaleHelper.GetString("InvalidRequest"));
280281
}
281-
catch (Exception)
282+
catch (Exception ex)
282283
{
283284
return new HttpResponseMessage(HttpStatusCode.InternalServerError);
284285
}
285286
}
286287
}
288+
289+
287290
}

‎eFormAPI/eFormAPI/eFormAPI.Web.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@
8282
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
8383
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
8484
</Reference>
85+
<Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
86+
<HintPath>..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
87+
</Reference>
8588
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
8689
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
8790
</Reference>
@@ -130,11 +133,11 @@
130133
<Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131134
<HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
132135
</Reference>
133-
<Reference Include="Microting.eForm, Version=3.0.27.0, Culture=neutral, processorArchitecture=MSIL">
134-
<HintPath>..\packages\Microting.eForm.3.0.27\lib\net45\Microting.eForm.dll</HintPath>
136+
<Reference Include="Microting.eForm, Version=3.0.32.0, Culture=neutral, processorArchitecture=MSIL">
137+
<HintPath>..\packages\Microting.eForm.3.0.32\lib\net45\Microting.eForm.dll</HintPath>
135138
</Reference>
136-
<Reference Include="Microting.eFormApi.BasePn, Version=1.1.29.0, Culture=neutral, processorArchitecture=MSIL">
137-
<HintPath>..\packages\Microting.eFormApi.BasePn.1.1.29\lib\net461\Microting.eFormApi.BasePn.dll</HintPath>
139+
<Reference Include="Microting.eFormApi.BasePn, Version=1.1.31.0, Culture=neutral, processorArchitecture=MSIL">
140+
<HintPath>..\packages\Microting.eFormApi.BasePn.1.1.31\lib\net461\Microting.eFormApi.BasePn.dll</HintPath>
138141
</Reference>
139142
<Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
140143
<HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>

‎eFormAPI/eFormAPI/packages.config‎

Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,59 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="Antlr" version="3.5.0.2" targetFramework="net46" />
4-
<package id="Autofac" version="4.6.0" targetFramework="net46" />
5-
<package id="Autofac.WebApi2" version="4.0.1" targetFramework="net46" />
6-
<package id="AutoMapper" version="6.1.1" targetFramework="net46" />
7-
<package id="AWSSDK.Core" version="3.3.24.3" targetFramework="net461" />
8-
<package id="AWSSDK.SQS" version="3.3.3.11" targetFramework="net461" />
9-
<package id="Base32" version="1.0.0.26" targetFramework="net461" />
10-
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
11-
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
12-
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
13-
<package id="EPPlus" version="4.5.2.1" targetFramework="net461" />
14-
<package id="Microsoft.AspNet.Cors" version="5.0.0" targetFramework="net46" />
15-
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net46" />
16-
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net46" />
17-
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net46" />
18-
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net46" />
19-
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net46" />
20-
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net46" />
21-
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net46" />
22-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net46" />
23-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net46" />
24-
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net46" />
25-
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net46" />
26-
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net46" />
27-
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.5" targetFramework="net46" />
28-
<package id="Microsoft.IdentityModel.Logging" version="5.2.1" targetFramework="net461" />
29-
<package id="Microsoft.IdentityModel.Tokens" version="5.1.4" targetFramework="net461" />
30-
<package id="Microsoft.Net.Compilers" version="2.3.0" targetFramework="net46" developmentDependency="true" />
31-
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net46" />
32-
<package id="Microsoft.Owin" version="3.1.0" targetFramework="net46" />
33-
<package id="Microsoft.Owin.Cors" version="3.1.0" targetFramework="net46" />
34-
<package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net46" />
35-
<package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net46" />
36-
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
37-
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
38-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
39-
<package id="Microting.eForm" version="3.0.32" targetFramework="net461" />
40-
<package id="Microting.eFormApi.BasePn" version="1.1.29" targetFramework="net461" />
41-
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
42-
<package id="MySql.Data" version="6.9.12" targetFramework="net461" />
43-
<package id="MySql.Data.Entity" version="6.9.12" targetFramework="net461" />
44-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
45-
<package id="NLog" version="4.5.6" targetFramework="net461" />
46-
<package id="NLog.Config" version="4.4.11" targetFramework="net46" />
47-
<package id="NLog.Schema" version="4.4.11" targetFramework="net46" />
48-
<package id="OtpSharp" version="1.3.0.4" targetFramework="net461" />
49-
<package id="Owin" version="1.0" targetFramework="net46" />
50-
<package id="Rebus" version="4.2.1" targetFramework="net461" />
51-
<package id="Rebus.Castle.Windsor" version="4.1.0" targetFramework="net461" />
52-
<package id="Rebus.SqlServer" version="4.0.0" targetFramework="net461" />
53-
<package id="Respond" version="1.4.2" targetFramework="net46" />
54-
<package id="Swashbuckle.Core" version="5.6.0" targetFramework="net46" />
55-
<package id="System.IdentityModel.Tokens.Jwt" version="5.1.4" targetFramework="net461" />
56-
<package id="WebActivatorEx" version="2.0" targetFramework="net46" />
57-
<package id="WebGrease" version="1.6.0" targetFramework="net46" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Antlr" version="3.5.0.2" targetFramework="net46" />
4+
<package id="Autofac" version="4.6.0" targetFramework="net46" />
5+
<package id="Autofac.WebApi2" version="4.0.1" targetFramework="net46" />
6+
<package id="AutoMapper" version="6.1.1" targetFramework="net46" />
7+
<package id="AWSSDK.Core" version="3.3.24.3" targetFramework="net461" />
8+
<package id="AWSSDK.SQS" version="3.3.3.11" targetFramework="net461" />
9+
<package id="Base32" version="1.0.0.26" targetFramework="net461" />
10+
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
11+
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
12+
<package id="DotNetZip" version="1.11.0" targetFramework="net461" />
13+
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
14+
<package id="EPPlus" version="4.5.2.1" targetFramework="net461" />
15+
<package id="Microsoft.AspNet.Cors" version="5.0.0" targetFramework="net46" />
16+
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net46" />
17+
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net46" />
18+
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net46" />
19+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net46" />
20+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net46" />
21+
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net46" />
22+
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net46" />
23+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net46" />
24+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net46" />
25+
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net46" />
26+
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net46" />
27+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net46" />
28+
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.5" targetFramework="net46" />
29+
<package id="Microsoft.IdentityModel.Logging" version="5.2.1" targetFramework="net461" />
30+
<package id="Microsoft.IdentityModel.Tokens" version="5.1.4" targetFramework="net461" />
31+
<package id="Microsoft.Net.Compilers" version="2.3.0" targetFramework="net46" developmentDependency="true" />
32+
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net46" />
33+
<package id="Microsoft.Owin" version="3.1.0" targetFramework="net46" />
34+
<package id="Microsoft.Owin.Cors" version="3.1.0" targetFramework="net46" />
35+
<package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net46" />
36+
<package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net46" />
37+
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
38+
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
39+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
40+
<package id="Microting.eForm" version="3.0.32" targetFramework="net461" />
41+
<package id="Microting.eFormApi.BasePn" version="1.1.31" targetFramework="net461" />
42+
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
43+
<package id="MySql.Data" version="6.9.12" targetFramework="net461" />
44+
<package id="MySql.Data.Entity" version="6.9.12" targetFramework="net461" />
45+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
46+
<package id="NLog" version="4.5.6" targetFramework="net461" />
47+
<package id="NLog.Config" version="4.4.11" targetFramework="net46" />
48+
<package id="NLog.Schema" version="4.4.11" targetFramework="net46" />
49+
<package id="OtpSharp" version="1.3.0.4" targetFramework="net461" />
50+
<package id="Owin" version="1.0" targetFramework="net46" />
51+
<package id="Rebus" version="4.2.1" targetFramework="net461" />
52+
<package id="Rebus.Castle.Windsor" version="4.1.0" targetFramework="net461" />
53+
<package id="Rebus.SqlServer" version="4.0.0" targetFramework="net461" />
54+
<package id="Respond" version="1.4.2" targetFramework="net46" />
55+
<package id="Swashbuckle.Core" version="5.6.0" targetFramework="net46" />
56+
<package id="System.IdentityModel.Tokens.Jwt" version="5.1.4" targetFramework="net461" />
57+
<package id="WebActivatorEx" version="2.0" targetFramework="net46" />
58+
<package id="WebGrease" version="1.6.0" targetFramework="net46" />
5859
</packages>

0 commit comments

Comments
 (0)