Merge pull request dnnsoftware#3700 from donker/fiximportexport

Fix for import/export
donker · Apr 24, 2020 · 600e5a8 · 600e5a8
2 parents a56c7a0 + d46e24a
commit 600e5a8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/DNN Platform/Library/Services/Upgrade/Upgrade.cs b/DNN Platform/Library/Services/Upgrade/Upgrade.cs
@@ -5707,7 +5707,9 @@ private static void UpgradeToVersion941()
         private static void UpgradeToVersion960()
         {
             // Set default end user upload extension whitelist - ensure we don't add extensions that were not in the master list before
-            var exts = new FileExtensionWhitelist("jpg,jpeg,jpe,gif,bmp,png,svg,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,zip,rar,ico,avi,mpg,mpeg,mp3,wmv,mov,wav,mp4,webm,ogv");
+            var toAdd = new List<string> { ".export" };
+            HostController.Instance.Update("FileExtensions", Host.AllowedExtensionWhitelist.ToStorageString(toAdd));
+            var exts = new FileExtensionWhitelist("jpg,jpeg,jpe,gif,bmp,png,svg,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,zip,rar,ico,avi,mpg,mpeg,mp3,wmv,mov,wav,mp4,webm,ogv,export");
             exts.RestrictBy(Host.AllowedExtensionWhitelist);
             HostController.Instance.Update("DefaultEndUserExtensionWhitelist", exts.ToStorageString());
         }

diff --git a/DNN Platform/Website/Install/DotNetNuke.install.config.resources b/DNN Platform/Website/Install/DotNetNuke.install.config.resources
@@ -43,8 +43,8 @@
     <EnableStrengthMeter>Y</EnableStrengthMeter>
     <EncryptionKey Secure="True"></EncryptionKey>
     <EventLogBuffer>N</EventLogBuffer>
-    <FileExtensions>jpg,jpeg,jpe,gif,bmp,png,svg,ttf,eot,woff,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,css,zip,rar,template,htmtemplate,ico,avi,mpg,mpeg,mp3,wmv,mov,wav,mp4,webm,ogv</FileExtensions>
-    <DefaultEndUserExtensionWhitelist>jpg,jpeg,jpe,gif,bmp,png,svg,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,ico,avi,mpg,mpeg,mp3,wmv,mov,wav,mp4,webm,ogv</DefaultEndUserExtensionWhitelist>
+    <FileExtensions>jpg,jpeg,jpe,gif,bmp,png,svg,ttf,eot,woff,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,css,zip,rar,template,htmtemplate,ico,avi,mpg,mpeg,mp3,wmv,mov,wav,mp4,webm,ogv,export</FileExtensions>
+    <DefaultEndUserExtensionWhitelist>jpg,jpeg,jpe,gif,bmp,png,svg,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,ico,avi,mpg,mpeg,mp3,wmv,mov,wav,mp4,webm,ogv,export</DefaultEndUserExtensionWhitelist>
     <ForceLogoutAfterPasswordChanged>Y</ForceLogoutAfterPasswordChanged>
     <HelpURL>https://www.dnndocs.com/</HelpURL>
     <HostCurrency>USD</HostCurrency>

diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.06.00.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.06.00.SqlDataProvider
@@ -56,7 +56,7 @@ IF NOT EXISTS (SELECT * FROM {databaseOwner}{objectQualifier}HostSettings WHERE
 INSERT INTO {databaseOwner}{objectQualifier}HostSettings
 ([SettingName],[SettingValue],[SettingIsSecure],[CreatedByUserID],[CreatedOnDate],[LastModifiedByUserID],[LastModifiedOnDate])
 VALUES
-('DefaultEndUserExtensionWhitelist', 'jpg,jpeg,jpe,gif,bmp,png,svg,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,ico,avi,mpg,mpeg,mp3,wmv,mov,wav,mp4,webm,ogv', 0, -1, GETDATE(), -1, GETDATE())
+('DefaultEndUserExtensionWhitelist', 'jpg,jpeg,jpe,gif,bmp,png,svg,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,ico,avi,mpg,mpeg,mp3,wmv,mov,wav,mp4,webm,ogv,export', 0, -1, GETDATE(), -1, GETDATE())
 GO
 
 

diff --git a/DNN Platform/Website/admin/Modules/Export.ascx.cs b/DNN Platform/Website/admin/Modules/Export.ascx.cs
@@ -224,7 +224,7 @@ protected void OnExportClick(object sender, EventArgs e)
                     var folder = FolderManager.Instance.GetFolder(cboFolders.SelectedItemValueAsInt);
                     if (folder != null)
                     {
-                        var strFile = "content." + CleanName(Module.DesktopModule.ModuleName) + "." + CleanName(txtFile.Text) + ".xml";
+                        var strFile = "content." + CleanName(Module.DesktopModule.ModuleName) + "." + CleanName(txtFile.Text) + ".export";
                         var strMessage = ExportModule(ModuleId, strFile, folder);
                         if (String.IsNullOrEmpty(strMessage))
                         {

diff --git a/DNN Platform/Website/admin/Modules/Import.ascx.cs b/DNN Platform/Website/admin/Modules/Import.ascx.cs
@@ -185,7 +185,8 @@ protected void OnFoldersIndexChanged(object sender, EventArgs e)
             var folder = FolderManager.Instance.GetFolder(cboFolders.SelectedItemValueAsInt);
             if (folder == null) return;
 
-            var files = Globals.GetFileList(PortalId, "xml", false, folder.FolderPath);
+            var files = Globals.GetFileList(PortalId, "export", false, folder.FolderPath);
+            files.AddRange(Globals.GetFileList(PortalId, "xml", false, folder.FolderPath));
             foreach (FileItem file in files)
             {
 				if (file.Text.IndexOf("content." + Globals.CleanName(Module.DesktopModule.ModuleName) + ".", System.StringComparison.Ordinal) != -1)