Merge pull request #21017 from nextcloud/enh/noid/clean-excluded-grou…

…ps-list Remove group from excluded_groups_list after delete
nextcloud · May 18, 2020 · 1bba7de · 1bba7de
2 parents 73f5848 + 16da29c
commit 1bba7de
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
@@ -1511,6 +1511,19 @@ public function userDeleted($uid) {
 	public function groupDeleted($gid) {
 		$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_GROUP);
 		$provider->groupDeleted($gid);
+
+		$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+		if ($excludedGroups === '') {
+			return;
+		}
+
+		$excludedGroups = json_decode($excludedGroups, true);
+		if (json_last_error() !== JSON_ERROR_NONE) {
+			return;
+		}
+
+		$excludedGroups = array_diff($excludedGroups, [$gid]);
+		$this->config->setAppValue('core', 'shareapi_exclude_groups_list', json_encode($excludedGroups));
 	}
 
 	/**