Skip to content

Commit 9f3e64d

Browse files
artongeartonge
authored
Merge pull request #33029 from nextcloud/backport/32998/stable23
[stable23] Rename setting name to reduce its length
2 parents 1eb6806 + 768b41e commit 9f3e64d

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function getForm() {
8686
'restrictUserEnumerationFullMatch' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes'),
8787
'restrictUserEnumerationFullMatchUserId' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes'),
8888
'restrictUserEnumerationFullMatchEmail' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes'),
89-
'restrictUserEnumerationFullMatchIgnoreSecondDisplayName' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no'),
89+
'restrictUserEnumerationFullMatchIgnoreSecondDN' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no'),
9090
'enforceLinkPassword' => Util::isPublicLinkPasswordRequired(),
9191
'onlyShareWithGroupMembers' => $this->shareManager->shareWithGroupMembersOnly(),
9292
'shareAPIEnabled' => $this->config->getAppValue('core', 'shareapi_enabled', 'yes'),

‎apps/settings/tests/Settings/Admin/SharingTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function testGetFormWithoutExcludedGroups(): void {
8484
['core', 'shareapi_restrict_user_enumeration_full_match', 'yes', 'yes'],
8585
['core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes', 'yes'],
8686
['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'],
87-
['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no', 'no'],
87+
['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'],
8888
['core', 'shareapi_enabled', 'yes', 'yes'],
8989
['core', 'shareapi_default_expire_date', 'no', 'no'],
9090
['core', 'shareapi_expire_after_n_days', '7', '7'],
@@ -120,7 +120,7 @@ public function testGetFormWithoutExcludedGroups(): void {
120120
'restrictUserEnumerationFullMatch' => 'yes',
121121
'restrictUserEnumerationFullMatchUserId' => 'yes',
122122
'restrictUserEnumerationFullMatchEmail' => 'yes',
123-
'restrictUserEnumerationFullMatchIgnoreSecondDisplayName' => 'no',
123+
'restrictUserEnumerationFullMatchIgnoreSecondDN' => 'no',
124124
'enforceLinkPassword' => false,
125125
'onlyShareWithGroupMembers' => false,
126126
'shareAPIEnabled' => 'yes',
@@ -162,7 +162,7 @@ public function testGetFormWithExcludedGroups(): void {
162162
['core', 'shareapi_restrict_user_enumeration_full_match', 'yes', 'yes'],
163163
['core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes', 'yes'],
164164
['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'],
165-
['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no', 'no'],
165+
['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'],
166166
['core', 'shareapi_enabled', 'yes', 'yes'],
167167
['core', 'shareapi_default_expire_date', 'no', 'no'],
168168
['core', 'shareapi_expire_after_n_days', '7', '7'],
@@ -198,7 +198,7 @@ public function testGetFormWithExcludedGroups(): void {
198198
'restrictUserEnumerationFullMatch' => 'yes',
199199
'restrictUserEnumerationFullMatchUserId' => 'yes',
200200
'restrictUserEnumerationFullMatchEmail' => 'yes',
201-
'restrictUserEnumerationFullMatchIgnoreSecondDisplayName' => 'no',
201+
'restrictUserEnumerationFullMatchIgnoreSecondDN' => 'no',
202202
'enforceLinkPassword' => false,
203203
'onlyShareWithGroupMembers' => false,
204204
'shareAPIEnabled' => 'yes',

‎build/integration/features/bootstrap/CollaborationContext.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected function resetAppConfigs(): void {
7171
$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match');
7272
$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_userid');
7373
$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_email');
74-
$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name');
74+
$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn');
7575
$this->deleteServerConfig('core', 'shareapi_only_share_with_group_members');
7676
}
7777

‎lib/private/Collaboration/Collaborators/UserPlugin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function __construct(IConfig $config,
9595
$this->shareeEnumerationFullMatch = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
9696
$this->shareeEnumerationFullMatchUserId = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes') === 'yes';
9797
$this->shareeEnumerationFullMatchEmail = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
98-
$this->shareeEnumerationFullMatchIgnoreSecondDisplayName = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no') === 'yes';
98+
$this->shareeEnumerationFullMatchIgnoreSecondDisplayName = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no') === 'yes';
9999
}
100100

101101
public function search($search, $limit, $offset, ISearchResult $searchResult) {

‎lib/private/Share20/Manager.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,7 @@ public function matchEmail(): bool {
19201920
}
19211921

19221922
public function ignoreSecondDisplayName(): bool {
1923-
return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no') === 'yes';
1923+
return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no') === 'yes';
19241924
}
19251925

19261926
public function currentUserCanEnumerateTargetUser(?IUser $currentUser, IUser $targetUser): bool {

‎tests/lib/Collaboration/Collaborators/UserPluginTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ public function dataSearchEnumeration() {
657657
[
658658
'core' => [
659659
'shareapi_allow_share_dialog_user_enumeration' => 'no',
660-
'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name' => 'yes',
660+
'shareapi_restrict_user_enumeration_full_match_ignore_second_dn' => 'yes',
661661
],
662662
]
663663
],

0 commit comments

Comments
 (0)