Merge branch 'hotfix/dnn92'

Author: sachatrauwaen

OpenForm.csproj

@@ -81,10 +81,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\bin\OpenContent.dll</HintPath>
     </Reference>
-    <Reference Include="SharpZipLib, Version=0.81.0.1407, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\bin\SharpZipLib.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

OpenForm.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="OpenForm" type="Module" version="03.03.00">
+    <package name="OpenForm" type="Module" version="03.03.01">
       <friendlyName>OpenForm</friendlyName>
       <description>OpenForm module. Requires OpenContent v3.2.x</description>
       <iconFile>~/Images/icon_extensions.png</iconFile>

ShareTemplate.ascx.cs

@@ -17,7 +17,7 @@
 using DotNetNuke.Services.FileSystem;
 using DotNetNuke.Entities.Host;
 using DotNetNuke.Common.Utilities;
-using ICSharpCode.SharpZipLib.Zip;
+//using ICSharpCode.SharpZipLib.Zip;
 using System.Web;
 using Satrabel.OpenContent.Components.Rss;
 using System.Net;
@@ -142,7 +142,9 @@ protected void cmdImport_Click(object sender, EventArgs e)
                     {
                         folder = FolderManager.Instance.AddFolder(PortalId, FolderName);
                     }
-                    FileSystemUtils.UnzipResources(new ZipInputStream(fuFile.FileContent), folder.PhysicalPath);
+                    //FileSystemUtils.UnzipResources(new ZipInputStream(fuFile.FileContent), folder.PhysicalPath);
+                    var zip = new ZipUtils();
+                    zip.UnzipFiles(fuFile.FileContent, folder.PhysicalPath);
                 }
             }
             catch (PermissionsNotMetException)
@@ -218,7 +220,9 @@ protected void cmdImportWeb_Click(object sender, EventArgs e)
                     var req = (HttpWebRequest)WebRequest.Create(FileName);
                     Stream stream = req.GetResponse().GetResponseStream();
 
-                    FileSystemUtils.UnzipResources(new ZipInputStream(stream), folder.PhysicalPath);
+                    //FileSystemUtils.UnzipResources(new ZipInputStream(stream), folder.PhysicalPath);
+                    var zip = new ZipUtils();
+                    zip.UnzipFiles(stream, folder.PhysicalPath);
                 }
             }
             catch (PermissionsNotMetException)
@@ -261,31 +265,11 @@ private void CreateZipFile(string zipFileName, string Folder)
             try
             {
                 //Log.AddInfo(string.Format(Util.WRITER_CreateArchive, ZipFileShortName));
-                strmZipFile = File.Create(zipFileName);
-                ZipOutputStream strmZipStream = null;
-                try
-                {
-                    strmZipStream = new ZipOutputStream(strmZipFile);
-                    strmZipStream.SetLevel(CompressionLevel);
+                
+                var zip = new ZipUtils();
+                zip.ZipFiles(CompressionLevel, strmZipFile, Directory.GetFiles(Folder));
 
-                    foreach (var item in Directory.GetFiles(Folder))
-                    {
-                        FileSystemUtils.AddToZip(ref strmZipStream, Path.GetFullPath(item), Path.GetFileName(item), "");
-                    }
-                }
-                catch (Exception ex)
-                {
-                    DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
-                    //Log.AddFailure(string.Format(Util.WRITER_SaveFileError, ex));
-                }
-                finally
-                {
-                    if (strmZipStream != null)
-                    {
-                        strmZipStream.Finish();
-                        strmZipStream.Close();
-                    }
-                }
+                
                 //Log.EndJob(Util.WRITER_CreatedPackage);
                 WriteFileToHttpContext(zipFileName, ContentDisposition.Attachment);
             }

build-local92.cmd

@@ -0,0 +1,3 @@
+"%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" OpenForm92.csproj /p:Configuration=Release,Platform=AnyCPU,SolutionDir=Solution,ReferencePath="ref\dnn920" /t:Rebuild >build-local-dnn920.log
+
+pause