Add a hint that the settings are OR based

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/apps/settings/js/admin.js b/apps/settings/js/admin.js
index 72b167d7e0d7129ee02d8872adfe67ae1efba156..ba6b480c79d30a4054ab878f71be8f3a69e5378b 100644 (file)
--- a/apps/settings/js/admin.js
+++ b/apps/settings/js/admin.js
@@ -145,6 +145,7 @@ window.addEventListener('DOMContentLoaded', function(){
        $('#shareapi_allow_share_dialog_user_enumeration').on('change', function() {
                $('#shareapi_restrict_user_enumeration_to_group_setting').toggleClass('hidden', !this.checked);
                $('#shareapi_restrict_user_enumeration_to_phone_setting').toggleClass('hidden', !this.checked);
+               $('#shareapi_restrict_user_enumeration_combinewarning_setting').toggleClass('hidden', !this.checked);
        })
 
        $('#allowLinks').change(function() {

diff --git a/apps/settings/templates/settings/admin/sharing.php b/apps/settings/templates/settings/admin/sharing.php
index b02a7d2764ca1bd37d13d2cbff273fa99e6392b0..a72bf0bd590c5b74bf023cf7b487d587b1570393 100644 (file)
--- a/apps/settings/templates/settings/admin/sharing.php
+++ b/apps/settings/templates/settings/admin/sharing.php
@@ -185,6 +185,11 @@
 } ?> />
                <label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phonebook matches'));?></label><br />
        </p>
+       <p id="shareapi_restrict_user_enumeration_combinewarning_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
+       p('hidden');
+}?>">
+               <em><?php p($l->t('If autocompletion "same group" and "phonebook matches" are enabled a match in either is enough to show the user.'));?></em><br />
+       </p>
 
        <p>
                <input type="checkbox" id="publicShareDisclaimer" class="checkbox noJSAutoUpdate"