Merge pull request #177 from humhub/fix/40-hard-delete-on-disable-module

Hard delete records on disable module

Events.php

@@ -53,7 +53,7 @@ public static function onIntegrityCheck($event)
             // If parent_folder_id is 0 or null its an old root child which is not merged yet.
             if (!empty($file->parent_folder_id) && empty($file->parentFolder)) {
                 if ($integrityController->showFix("Deleting cfile id " . $file->id . " without existing parent!")) {
-                    $file->delete();
+                    $file->hardDelete();
                 }
             }
         }
@@ -66,7 +66,7 @@ public static function onIntegrityCheck($event)
             // If parent_folder_id is 0 or null its either an old root child which is not merged yet or an root directory.
             if (!empty($folder->parent_folder_id) && empty($folder->parentFolder)) {
                 if ($integrityController->showFix("Deleting cfile folder id " . $folder->id . " without existing parent!")) {
-                    $folder->delete();
+                    $folder->hardDelete();
                 }
             }
         }

Module.php

@@ -5,7 +5,6 @@
 use humhub\components\console\Application as ConsoleApplication;
 use humhub\modules\cfiles\models\ConfigureContainerForm;
 use humhub\modules\cfiles\models\rows\FileSystemItemRow;
-use humhub\modules\content\models\ContentContainer;
 use humhub\modules\space\models\Space;
 use humhub\modules\user\models\User;
 use humhub\modules\content\components\ContentContainerModule;
@@ -90,11 +89,11 @@ public function getPermissions($contentContainer = null)
      */
     public function disable()
     {
-        foreach (Folder::find()->all() as $key => $folder) {
-            $folder->delete();
+        foreach (Folder::find()->all() as $folder) {
+            $folder->hardDelete();
         }
-        foreach (File::find()->all() as $key => $file) {
-            $file->delete();
+        foreach (File::find()->all() as $file) {
+            $file->hardDelete();
         }
         parent::disable();
     }
@@ -104,13 +103,11 @@ public function disable()
      */
     public function disableContentContainer(ContentContainerActiveRecord $container)
     {
-
         foreach (Folder::find()->contentContainer($container)->all() as $folder) {
-            $folder->delete();
+            $folder->hardDelete();
         }
-
         foreach (File::find()->contentContainer($container)->all() as $file) {
-            $file->delete();
+            $file->hardDelete();
         }
         parent::disableContentContainer($container);
     }

docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.16.1 - Unreleased
+-----------------------
+- Fix #177: Hard delete records on disable module
+
 0.16.0 - April 27, 2023
 -----------------------
 - Enh: Added support for hidden files in stream

module.json

@@ -9,7 +9,7 @@
         "organisation",
         "sharing"
     ],
-    "version": "0.16.0",
+    "version": "0.16.1",
     "humhub": {
         "minVersion": "1.14"
     },