From d46e24adb85d035dd97c12acbd19587e2e8e7a49 Mon Sep 17 00:00:00 2001 From: Peter Donker Date: Fri, 24 Apr 2020 00:35:50 +0200 Subject: [PATCH] Change module export to use the .export extension --- DNN Platform/Library/Services/Upgrade/Upgrade.cs | 4 +++- .../Website/Install/DotNetNuke.install.config.resources | 4 ++-- .../DataProviders/SqlDataProvider/09.06.00.SqlDataProvider | 2 +- DNN Platform/Website/admin/Modules/Export.ascx.cs | 2 +- DNN Platform/Website/admin/Modules/Import.ascx.cs | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/DNN Platform/Library/Services/Upgrade/Upgrade.cs b/DNN Platform/Library/Services/Upgrade/Upgrade.cs index 5559e076c16..c76fae41d6f 100644 --- 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 { ".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 index 007e667b6c5..110172869bc 100644 --- a/DNN Platform/Website/Install/DotNetNuke.install.config.resources +++ b/DNN Platform/Website/Install/DotNetNuke.install.config.resources @@ -43,8 +43,8 @@ Y N - 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 - 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 + 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 + 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 Y https://www.dnndocs.com/ USD diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.06.00.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.06.00.SqlDataProvider index ab7faab71c0..998592c1676 100644 --- 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 index ff500c6d687..a92f4e8957c 100644 --- a/DNN Platform/Website/admin/Modules/Export.ascx.cs +++ b/DNN Platform/Website/admin/Modules/Export.ascx.cs @@ -217,7 +217,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 index dca93b2cf68..b2b3ed34289 100644 --- 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)