Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for import/export #3700

Merged
merged 1 commit into from
Apr 24, 2020
Merged

Fix for import/export #3700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion DNN Platform/Library/Services/Upgrade/Upgrade.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
mitchelsellers marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
4 changes: 2 additions & 2 deletions DNN Platform/Website/Install/DotNetNuke.install.config.resources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.06.00.SqlDataProvider
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
mitchelsellers marked this conversation as resolved.
Show resolved Hide resolved
GO


Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Website/admin/Modules/Export.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
3 changes: 2 additions & 1 deletion DNN Platform/Website/admin/Modules/Import.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down