Merge pull request dnnsoftware#3711 from dnnsoftware/release/9.6.0

Merge latest changes from Release/9.6.0 into develop
donker · Apr 29, 2020 · 53282b2 · 53282b2
2 parents e369d39 + 600e5a8
commit 53282b2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 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
@@ -82,8 +82,8 @@ private string ExportModule(int moduleID, string fileName, IFolderInfo folder)
                     {
                         var objObject = Reflection.CreateObject(Module.DesktopModule.BusinessControllerClass, Module.DesktopModule.BusinessControllerClass);
 
-						//Double-check
-						if (objObject is IPortable)
+                        //Double-check
+                        if (objObject is IPortable)
                         {
                             XmlDocument moduleXml = new XmlDocument { XmlResolver = null };
                             XmlNode moduleNode = ModuleController.SerializeModule(moduleXml, Module, true);
@@ -104,20 +104,20 @@ private string ExportModule(int moduleID, string fileName, IFolderInfo folder)
                             var content = sw.ToString();
                             if (!String.IsNullOrEmpty(content))
                             {
-								//remove invalid chars in content -> DNN 26810: Handled by ModuleController.SerializeModule
-	                            //content = Regex.Replace(content, _invalidCharsRegex, string.Empty);
-								//add attributes to XML document
+                                //remove invalid chars in content -> DNN 26810: Handled by ModuleController.SerializeModule
+                                //content = Regex.Replace(content, _invalidCharsRegex, string.Empty);
+                                //add attributes to XML document
                                 //content = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + "<content type=\"" + CleanName(Module.DesktopModule.ModuleName) + "\" version=\"" +
                                 //          Module.DesktopModule.Version + "\">" + content + "</content>";
 
                                 //First check the Portal limits will not be exceeded (this is approximate)
                                 if (PortalController.Instance.HasSpaceAvailable(PortalId, content.Length))
                                 {
                                     //add file to Files table
-									using (var fileContent = new MemoryStream(Encoding.UTF8.GetBytes(content)))
-									{
+                                    using (var fileContent = new MemoryStream(Encoding.UTF8.GetBytes(content)))
+                                    {
                                         Services.FileSystem.FileManager.Instance.AddFile(folder, fileName, fileContent, true, true, "application/octet-stream");
-									}
+                                    }
                                 }
                                 else
                                 {
@@ -134,9 +134,16 @@ private string ExportModule(int moduleID, string fileName, IFolderInfo folder)
                             strMessage = Localization.GetString("ExportNotSupported", LocalResourceFile);
                         }
                     }
-                    catch
+                    catch (Exception ex)
                     {
-                        strMessage = Localization.GetString("Error", LocalResourceFile);
+                        if (ex is InvalidFileExtensionException || ex is PermissionsNotMetException || ex is InvalidFilenameException)
+                        {
+                            strMessage = ex.Message;
+                        }
+                        else
+                        {
+                            strMessage = Localization.GetString("Error", LocalResourceFile);
+                        }
                     }
                 }
                 else
@@ -217,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))
                         {
@@ -227,7 +234,7 @@ protected void OnExportClick(object sender, EventArgs e)
                         {
                             UI.Skins.Skin.AddModuleMessage(this, strMessage, ModuleMessage.ModuleMessageType.RedError);
                         }
-                        }
+                    }
 
                 }
                 else

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)