From 69029097309f1315292b5c326983aa21e351dc91 Mon Sep 17 00:00:00 2001
From: Lucas Bartholemy <lucas@bartholemy.com>
Date: Mon, 2 Jul 2018 13:20:28 +0200
Subject: [PATCH] Fix #3176: Integrity checker removes modules default state

---
 protected/humhub/docs/CHANGELOG.md        | 1 +
 protected/humhub/modules/space/Events.php | 4 ++--
 protected/humhub/modules/user/Events.php  | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
index fd22f5183f..19fbe6ee47 100644
--- a/protected/humhub/docs/CHANGELOG.md
+++ b/protected/humhub/docs/CHANGELOG.md
@@ -13,6 +13,7 @@ HumHub Change Log
 - Fix: Incorrect last visit date shown in space admin pending members view (acs-ferreira)
 - Enh: Allow enable/disable modules by CLI
 - Enh: Added UTC only timezone in server timezone dropdown
+- Fix #3176: Integrity checker removes modules default state
 
 
 1.2.7 (May 23, 2018)
diff --git a/protected/humhub/modules/space/Events.php b/protected/humhub/modules/space/Events.php
index b4f6af8c21..8f6efa6839 100644
--- a/protected/humhub/modules/space/Events.php
+++ b/protected/humhub/modules/space/Events.php
@@ -15,7 +15,7 @@ use yii\web\HttpException;
 
 /**
  * Events provides callbacks for all defined module events.
- * 
+ *
  * @author luke
  */
 class Events extends \yii\base\Object
@@ -93,7 +93,7 @@ class Events extends \yii\base\Object
 
         $integrityController->showTestHeadline("Space Module - Module (" . models\Module::find()->count() . " entries)");
         foreach (models\Module::find()->joinWith('space')->each() as $module) {
-            if ($module->space == null) {
+            if ($module->space == null && !empty($module->space_id)) {
                 if ($integrityController->showFix("Deleting space module " . $module->id . " without existing space!")) {
                     $module->delete();
                 }
diff --git a/protected/humhub/modules/user/Events.php b/protected/humhub/modules/user/Events.php
index a242ebad94..dd3611f6c8 100644
--- a/protected/humhub/modules/user/Events.php
+++ b/protected/humhub/modules/user/Events.php
@@ -13,7 +13,7 @@ use humhub\modules\user\models\Follow;
 
 /**
  * Events provides callbacks for all defined module events.
- * 
+ *
  * @author luke
  */
 class Events extends \yii\base\Object
@@ -130,7 +130,7 @@ class Events extends \yii\base\Object
 
         $integrityController->showTestHeadline("User Module - Modules (" . models\Module::find()->count() . " entries)");
         foreach (models\Module::find()->joinWith(['user'])->each() as $module) {
-            if ($module->user == null) {
+            if ($module->user == null && !empty($module->user_id)) {
                 if ($integrityController->showFix("Deleting user-module " . $module->id . " of non existing user!")) {
                     $module->delete();
                 }
@@ -153,7 +153,7 @@ class Events extends \yii\base\Object
 
     /**
      * Tasks on hourly cron job
-     * 
+     *
      * @param \yii\base\Event $event
      */
     public static function onHourlyCron($event)
@@ -161,7 +161,7 @@ class Events extends \yii\base\Object
         foreach (Yii::$app->authClientCollection->getClients() as $authClient) {
             if ($authClient instanceof authclient\interfaces\AutoSyncUsers) {
                 /**
-                 * @var authclient\interfaces\AutoSyncUsers $authClient 
+                 * @var authclient\interfaces\AutoSyncUsers $authClient
                  */
                 $authClient->syncUsers();
             }