Merge pull request #3667 from sbwalker/dev

fix #3656 - UploadableFiles and ImageFiles settings not loaded properly to handle empty string value resulting in upload issues
oqtane · Jan 22, 2024 · 95d1680 · 95d1680
2 parents 0069694 + 5e1e6ae
commit 95d1680
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -409,8 +409,9 @@
  }
 
  settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
- var sitesettings = await SettingService.GetSiteSettingsAsync(SiteState.Alias.SiteId);
+ var sitesettings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
  _ImageFiles = SettingService.GetSetting(settings, "ImageFiles", Constants.ImageFiles);
+ _ImageFiles = (string.IsNullOrEmpty(_ImageFiles)) ? Constants.ImageFiles : _ImageFiles;
 
  await LoadNotificationsAsync();
 

diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs
@@ -288,7 +288,8 @@ public void Delete(int id)
  folder = _folders.GetFolder(FolderId);
  }
 
- var _UploadableFiles = (_settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "UploadableFiles")?.SettingValue ?? Constants.UploadableFiles) ?? Constants.UploadableFiles;
+ var _UploadableFiles = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "UploadableFiles")?.SettingValue;
+ _UploadableFiles = (string.IsNullOrEmpty(_UploadableFiles)) ? Constants.UploadableFiles : _UploadableFiles;
 
  if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Edit, folder.PermissionList))
  {
@@ -366,8 +367,8 @@ public async Task UploadFile(string folder, IFormFile formfile)
  }
 
  // Get the UploadableFiles extensions
- string uploadfilesSetting = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "UploadableFiles")?.SettingValue;
- string _UploadableFiles = uploadfilesSetting ?? Constants.UploadableFiles; 
+ string _UploadableFiles = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "UploadableFiles")?.SettingValue;
+ _UploadableFiles = (string.IsNullOrEmpty(_UploadableFiles)) ? Constants.UploadableFiles : _UploadableFiles;
 
  // ensure filename is valid
  string token = ".part_";
@@ -612,7 +613,9 @@ public IActionResult GetImage(int id, int width, int height, string mode, string
  {
  var file = _files.GetFile(id);
 
- var _ImageFiles = (_settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "ImageFiles")?.SettingValue ?? Constants.ImageFiles) ?? Constants.ImageFiles;
+ var _ImageFiles = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "ImageFiles")?.SettingValue;
+ _ImageFiles = (string.IsNullOrEmpty(_ImageFiles)) ? Constants.UploadableFiles : _ImageFiles;
+
  if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.PermissionList))
  {
  if (_ImageFiles.Split(',').Contains(file.Extension.ToLower()))
@@ -779,7 +782,9 @@ private void CreateDirectory(string folderpath)
  private Models.File CreateFile(string filename, int folderid, string filepath)
  {
  var file = _files.GetFile(folderid, filename);
- var _ImageFiles = (_settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "ImageFiles")?.SettingValue ?? Constants.ImageFiles) ?? Constants.ImageFiles;
+
+ var _ImageFiles = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "ImageFiles")?.SettingValue;
+ _ImageFiles = (string.IsNullOrEmpty(_ImageFiles)) ? Constants.UploadableFiles : _ImageFiles;
 
  int size = 0;
  var folder = _folders.GetFolder(folderid, false);