Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Corrected the IsPrivate

Browse Source
This commit is contained in:
Leigh Pointer
2023-12-04 17:26:37 +01:00
parent 6e36312be8
commit daeb76df11
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Oqtane.Client/Modules/Admin/Files/Add.razor
View File

@ -81,6 +81,7 @@
{ {
validated = true; validated = true;
var interop = new Interop(JSRuntime); var interop = new Interop(JSRuntime);
if (await interop.FormValid(form)) if (await interop.FormValid(form))
{ {
if (_url == string.Empty || _folderId == -1) if (_url == string.Empty || _folderId == -1)

4
Oqtane.Client/Modules/Admin/Site/Index.razor
View File

@ -646,8 +646,8 @@
settings = SettingService.SetSetting(settings, "NotificationRetention", _retention.ToString(), true); settings = SettingService.SetSetting(settings, "NotificationRetention", _retention.ToString(), true);
//File Extensions //File Extensions
settings = SettingService.SetSetting(settings, "ImageFiles", _ImageFiles, true); settings = SettingService.SetSetting(settings, "ImageFiles", _ImageFiles, false);
settings = SettingService.SetSetting(settings, "UploadableFiles", _UploadableFiles, true); settings = SettingService.SetSetting(settings, "UploadableFiles", _UploadableFiles, false);
await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId); await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);

2
Oqtane.Client/Modules/Controls/FileManager.razor
View File

@ -344,7 +344,7 @@
_message = string.Empty; _message = string.Empty;
var interop = new Interop(JSRuntime); var interop = new Interop(JSRuntime);
var uploads = await interop.GetFiles(_fileinputid); var uploads = await interop.GetFiles(_fileinputid);
if (uploads.Length > 0) if (uploads.Length > 0)
{ {
string restricted = ""; string restricted = "";

16
Oqtane.Server/Controllers/FileController.cs
View File

@ -288,8 +288,7 @@ namespace Oqtane.Controllers
folder = _folders.GetFolder(FolderId); folder = _folders.GetFolder(FolderId);
} }
var _ImageFiles = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "ImageFiles").SettingValue; var _UploadableFiles = (_settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "UploadableFiles")?.SettingValue ?? Constants.UploadableFiles) ?? Constants.UploadableFiles;
var _UploadableFiles = _ImageFiles + "," + _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "UploadableFiles").SettingValue;
if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Edit, folder.PermissionList)) if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Edit, folder.PermissionList))
{ {
@ -367,13 +366,8 @@ namespace Oqtane.Controllers
} }
// Get the UploadableFiles extensions // Get the UploadableFiles extensions
string imagefilesSetting = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "ImageFiles")?.SettingValue;
string imagefiles = imagefilesSetting ?? Constants.ImageFiles;
string uploadfilesSetting = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "UploadableFiles")?.SettingValue; string uploadfilesSetting = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "UploadableFiles")?.SettingValue;
string uploadfiles = uploadfilesSetting ?? Constants.UploadableFiles; string _UploadableFiles = uploadfilesSetting ?? Constants.UploadableFiles;
string _UploadableFiles = $"{imagefiles},{uploadfiles}";
// ensure filename is valid // ensure filename is valid
string token = ".part_"; string token = ".part_";
@ -617,8 +611,8 @@ namespace Oqtane.Controllers
public IActionResult GetImage(int id, int width, int height, string mode, string position, string background, string rotate, string recreate) public IActionResult GetImage(int id, int width, int height, string mode, string position, string background, string rotate, string recreate)
{ {
var file = _files.GetFile(id); var file = _files.GetFile(id);
var _ImageFiles = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "ImageFiles").SettingValue; var _ImageFiles = (_settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "ImageFiles")?.SettingValue ?? Constants.ImageFiles) ?? Constants.ImageFiles;
if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.PermissionList)) if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.PermissionList))
{ {
if (_ImageFiles.Split(',').Contains(file.Extension.ToLower())) if (_ImageFiles.Split(',').Contains(file.Extension.ToLower()))
@ -785,7 +779,7 @@ namespace Oqtane.Controllers
private Models.File CreateFile(string filename, int folderid, string filepath) private Models.File CreateFile(string filename, int folderid, string filepath)
{ {
var file = _files.GetFile(folderid, filename); var file = _files.GetFile(folderid, filename);
var _ImageFiles = _settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "ImageFiles").SettingValue; var _ImageFiles = (_settingRepository.GetSetting(EntityNames.Site, _alias.SiteId, "ImageFiles")?.SettingValue ?? Constants.ImageFiles) ?? Constants.ImageFiles;
int size = 0; int size = 0;
var folder = _folders.GetFolder(folderid, false); var folder = _folders.GetFolder(folderid, false);