clean up data of disabled users; updates #724

OpencachingDeutschland · Jun 25, 2015 · f323b09 · f323b09
1 parent 04c3b3c
commit f323b09
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/bin/dbsv-update.php b/bin/dbsv-update.php
@@ -468,6 +468,12 @@ function dbv_125()  // update cache lists implementation; preparation of XML int
 		update_triggers();		// runs maintain-125.inc.php
 	}
 
+	function dbv_126()  // clean up data of disabled accounts
+	{
+		sql("DELETE FROM `cache_adoption` WHERE `user_id` IN (SELECT `user_id` FROM `user` WHERE `is_active_flag`=0)");
+		sql("DELETE FROM `cache_ignore`   WHERE `user_id` IN (SELECT `user_id` FROM `user` WHERE `is_active_flag`=0)");
+		sql("DELETE FROM `cache_watches`  WHERE `user_id` IN (SELECT `user_id` FROM `user` WHERE `is_active_flag`=0)");
+	}
 
 	// When adding new mutations, take care that they behave well if run multiple
 	// times. This improves robustness of database versioning.

diff --git a/htdocs/lib2/logic/user.class.php b/htdocs/lib2/logic/user.class.php
@@ -761,8 +761,12 @@ function disable()
 		sql("DELETE FROM `user_options` WHERE `user_id`='&1'", $this->nUserId);
 		$this->reload();
 
-		sql("DELETE FROM `cache_lists` WHERE `user_id`='&1'", $this->nUserId);
-			// Triggers will do all the dependent clean-up.
+		sql("DELETE FROM `cache_lists`     WHERE `user_id`='&1'", $this->nUserId);  // Triggers will do all the dependent clean-up.
+		sql("DELETE FROM `cache_adoption`  WHERE `user_id`='&1'", $this->nUserId);
+		sql("DELETE FROM `cache_ignore`    WHERE `user_id`='&1'", $this->nUserId);
+		sql("DELETE FROM `cache_watches`   WHERE `user_id`='&1'", $this->nUserId);
+		sql("DELETE FROM `watches_waiting` WHERE `user_id`='&1'", $this->nUserId);
+		sql("DELETE FROM `notify_waiting`  WHERE `user_id`='&1'", $this->nUserId);
 
 		// lock the user's caches
 		$error = false;