From 6e640108edd5420ba6a32fea240f57cb6898e453 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Mon, 31 Mar 2025 08:58:23 -0400
Subject: [PATCH] delete files before deleting folder

---
 Oqtane.Server/Controllers/FolderController.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs
index 23d3db9b..62545760 100644
--- a/Oqtane.Server/Controllers/FolderController.cs
+++ b/Oqtane.Server/Controllers/FolderController.cs
@@ -280,9 +280,14 @@ namespace Oqtane.Controllers
             var folder = _folders.GetFolder(id, false);
             if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, folder.SiteId, EntityNames.Folder, id, PermissionNames.Edit))
             {
-                if (Directory.Exists(_folders.GetFolderPath(folder)))
+                var folderPath = _folders.GetFolderPath(folder);
+                if (Directory.Exists(folderPath))
                 {
-                    Directory.Delete(_folders.GetFolderPath(folder));
+                    foreach (var filePath in Directory.GetFiles(folderPath))
+                    {
+                        System.IO.File.Delete(filePath);
+                    }
+                    Directory.Delete(folderPath);
                 }
                 _folders.DeleteFolder(id);
                 _syncManager.AddSyncEvent(_alias, EntityNames.Folder, folder.FolderId, SyncEventActions.Delete);