adjust ContactStore class

apps/settings/js/admin.js

@@ -8,6 +8,14 @@ window.addEventListener('DOMContentLoaded', function(){
 		});
 	});
 
+	$('#globalScopedGroups').each(function (index, element) {
+		OC.Settings.setupGroupsSelect($(element));
+		$(element).change(function(ev) {
+			var groups = ev.val || [];
+			groups = JSON.stringify(groups);
+			OCP.AppConfig.setValue('core', $(this).attr('name'), groups);
+		});
+	});
 
 	$('#loglevel').change(function(){
 		$.post(OC.generateUrl('/settings/admin/log/level'), {level: $(this).val()},function(){
@@ -252,6 +260,10 @@ window.addEventListener('DOMContentLoaded', function(){
 		$("#selectExcludedGroups").toggleClass('hidden', !this.checked);
 	});
 
+	$('#onlyShareWithGroupMembers').change(function() {
+		$("#selectGlobalScopedGroups").toggleClass('hidden', !this.checked);
+	});
+
 	var setupChecks = function () {
 		// run setup checks then gather error messages
 		$.when(

apps/settings/l10n/de_DE.js

@@ -370,6 +370,7 @@ OC.L10N.register(
     "Allow sharing with groups" : "Teilen mit Gruppen erlauben",
     "Restrict users to only share with users in their groups" : "Benutzer auf das Teilen innerhalb ihrer Gruppen beschränken",
     "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
+	"Add exceptions: Groups that can always receive shares." : "Ausnahmen hinzufügen: Gruppen die immer Freigaben empfangen können.",
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
     "Allow username autocompletion in share dialog (if this is disabled the full username or email address needs to be entered)" : "Die Auto-Vervollständigung von Benutzernamen im Teilen-Dialog zulassen (Wenn dies deaktiviert ist, müssen der vollständige Benutzername oder die E-Mail-Adresse eingegeben werden)",
     "Restrict username autocompletion to users within the same groups" : "Automatische Vervollständigung der Benutzernamen auf Benutzer innerhalb der gleichen Gruppen beschränken",

apps/settings/l10n/de_DE.json

@@ -368,6 +368,7 @@
     "Allow sharing with groups" : "Teilen mit Gruppen erlauben",
     "Restrict users to only share with users in their groups" : "Benutzer auf das Teilen innerhalb ihrer Gruppen beschränken",
     "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
+  	"Add exceptions: Groups that can always receive shares." : "Ausnahmen hinzufügen: Gruppen die immer Freigaben empfangen können.",
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
     "Allow username autocompletion in share dialog (if this is disabled the full username or email address needs to be entered)" : "Die Auto-Vervollständigung von Benutzernamen im Teilen-Dialog zulassen (Wenn dies deaktiviert ist, müssen der vollständige Benutzername oder die E-Mail-Adresse eingegeben werden)",
     "Restrict username autocompletion to users within the same groups" : "Automatische Vervollständigung der Benutzernamen auf Benutzer innerhalb der gleichen Gruppen beschränken",
@@ -884,4 +885,4 @@
     "Show image" : "Bild anzeigen",
     "Show file" : "Datei anzeigen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
+}

apps/settings/lib/Settings/Admin/Sharing.php

@@ -65,6 +65,10 @@ public function getForm() {
 		$excludeGroupsList = !is_null(json_decode($excludedGroups))
 			? implode('|', json_decode($excludedGroups, true)) : '';
 
+		$globalScopedGroups = $this->config->getAppValue('core', 'shareapi_global_scoped_group_list', '');
+		$globalScopedGroupList = !is_null(json_decode($globalScopedGroups))
+			? implode('|', json_decode($globalScopedGroups, true)) : '';
+
 		$parameters = [
 			// Built-In Sharing
 			'allowGroupSharing'                    => $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes'),
@@ -81,6 +85,7 @@ public function getForm() {
 			'shareEnforceExpireDate'               => $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no'),
 			'shareExcludeGroups'                   => $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes',
 			'shareExcludedGroupsList'              => $excludeGroupsList,
+			'shareGlobalScopedGroupList'          => $globalScopedGroupList,
 			'publicShareDisclaimerText'            => $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext', null),
 			'enableLinkPasswordByDefault'          => $this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no'),
 			'shareApiDefaultPermissions'           => $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL),

apps/settings/templates/settings/admin/sharing.php

@@ -139,6 +139,13 @@
 } ?> />
 		<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
 	</p>
+	<p id="selectGlobalScopedGroups" class="indent <?php if (!$_['onlyShareWithGroupMembers'] || $_['shareAPIEnabled'] === 'no') {
+		p('hidden');
+	} ?>">
+		<input name="shareapi_global_scoped_group_list" type="hidden" id="globalScopedGroups" value="<?php p($_['shareGlobalScopedGroupList']) ?>" style="width: 400px" class="noJSAutoUpdate"/>
+		<br />
+		<em><?php p($l->t('Add exceptions: Groups that can always receive shares.')); ?></em>
+	</p>
 	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
 }?>">

lib/private/Contacts/ContactsMenu/ContactsStore.php

@@ -111,7 +111,7 @@ public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offs
 	 * current user is in an excluded group it will filter all local users.
 	 *  4. if the `shareapi_only_share_with_group_members` config option is
 	 * enabled it will filter all users which doens't have a common group
-	 * with the current user.
+	 * with the current user, considering exceptions (global scoped groups)
 	 *
 	 * @param IUser $self
 	 * @param Entry[] $entries
@@ -132,6 +132,13 @@ private function filterContacts(IUser $self,
 
 		$selfGroups = $this->groupManager->getUserGroupIds($self);
 
+		// check for existing global scoped groups to include them into selfGroups
+		$globalScopedGroupList = $this->config->getAppValue('core', 'shareapi_global_scoped_group_list', '');
+		$globalScopedGroups = json_decode($globalScopedGroupList);
+		if (!is_null($globalScopedGroups)) {
+			$selfGroups = array_merge($selfGroups, $globalScopedGroups);
+		}
+
 		if ($excludedGroups) {
 			$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
 			$decodedExcludeGroups = json_decode($excludedGroups, true);