Rename setting name to reduce its length

artonge · backportbot-nextcloud[bot] · commit a87cb0252647 · 2022-06-27T10:03:23.000Z
Signed-off-by: Louis Chemineau &lt;louis@chmn.me&gt;
diff --git a/apps/settings/lib/Settings/Admin/Sharing.php b/apps/settings/lib/Settings/Admin/Sharing.php
@@ -91,7 +91,7 @@ public function getForm() {
 			'restrictUserEnumerationFullMatch' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes'),
 			'restrictUserEnumerationFullMatchUserId' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes'),
 			'restrictUserEnumerationFullMatchEmail' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes'),
-			'restrictUserEnumerationFullMatchIgnoreSecondDisplayName' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no'),
+			'restrictUserEnumerationFullMatchIgnoreSecondDN' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no'),
 			'enforceLinkPassword' => Util::isPublicLinkPasswordRequired(false),
 			'passwordExcludedGroups' => $excludedPasswordGroupsList,
 			'passwordExcludedGroupsFeatureEnabled' => $this->config->getSystemValueBool('sharing.allow_disabled_password_enforcement_groups', false),
diff --git a/apps/settings/src/admin.js b/apps/settings/src/admin.js
@@ -155,12 +155,6 @@ window.addEventListener('DOMContentLoaded', () => {
 		$('#shareapi_restrict_user_enumeration_combinewarning_setting').toggleClass('hidden', !this.checked)
 	})
 
-	$('#shareapi_restrict_user_enumeration_full_match').on('change', function() {
-		$('#shareapi_restrict_user_enumeration_full_match_userid_setting').toggleClass('hidden', !this.checked)
-		$('#shareapi_restrict_user_enumeration_full_match_email_setting').toggleClass('hidden', !this.checked)
-		$('#shareapi_restrict_user_enumeration_full_match_ignore_second_display_name_setting').toggleClass('hidden', !this.checked)
-	})
-
 	$('#allowLinks').change(function() {
 		$('#publicLinkSettings').toggleClass('hidden', !this.checked)
 		$('#setDefaultExpireDate').toggleClass('hidden', !(this.checked && $('#shareapiDefaultExpireDate')[0].checked))
diff --git a/apps/settings/tests/Settings/Admin/SharingTest.php b/apps/settings/tests/Settings/Admin/SharingTest.php
@@ -85,7 +85,7 @@ public function testGetFormWithoutExcludedGroups(): void {
 				['core', 'shareapi_restrict_user_enumeration_full_match', 'yes', 'yes'],
 				['core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes', 'yes'],
 				['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'],
-				['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no', 'no'],
+				['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'],
 				['core', 'shareapi_enabled', 'yes', 'yes'],
 				['core', 'shareapi_default_expire_date', 'no', 'no'],
 				['core', 'shareapi_expire_after_n_days', '7', '7'],
@@ -121,7 +121,7 @@ public function testGetFormWithoutExcludedGroups(): void {
 				'restrictUserEnumerationFullMatch' => 'yes',
 				'restrictUserEnumerationFullMatchUserId' => 'yes',
 				'restrictUserEnumerationFullMatchEmail' => 'yes',
-				'restrictUserEnumerationFullMatchIgnoreSecondDisplayName' => 'no',
+				'restrictUserEnumerationFullMatchIgnoreSecondDN' => 'no',
 				'enforceLinkPassword' => false,
 				'onlyShareWithGroupMembers' => false,
 				'shareAPIEnabled' => 'yes',
@@ -166,7 +166,7 @@ public function testGetFormWithExcludedGroups(): void {
 				['core', 'shareapi_restrict_user_enumeration_full_match', 'yes', 'yes'],
 				['core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes', 'yes'],
 				['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'],
-				['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no', 'no'],
+				['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'],
 				['core', 'shareapi_enabled', 'yes', 'yes'],
 				['core', 'shareapi_default_expire_date', 'no', 'no'],
 				['core', 'shareapi_expire_after_n_days', '7', '7'],
@@ -202,7 +202,7 @@ public function testGetFormWithExcludedGroups(): void {
 				'restrictUserEnumerationFullMatch' => 'yes',
 				'restrictUserEnumerationFullMatchUserId' => 'yes',
 				'restrictUserEnumerationFullMatchEmail' => 'yes',
-				'restrictUserEnumerationFullMatchIgnoreSecondDisplayName' => 'no',
+				'restrictUserEnumerationFullMatchIgnoreSecondDN' => 'no',
 				'enforceLinkPassword' => false,
 				'onlyShareWithGroupMembers' => false,
 				'shareAPIEnabled' => 'yes',
diff --git a/build/integration/features/bootstrap/CollaborationContext.php b/build/integration/features/bootstrap/CollaborationContext.php
@@ -124,7 +124,7 @@ protected function resetAppConfigs(): void {
 		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match');
 		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_userid');
 		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_email');
-		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name');
+		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn');
 		$this->deleteServerConfig('core', 'shareapi_only_share_with_group_members');
 	}
 
diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php
@@ -95,7 +95,7 @@ public function __construct(IConfig $config,
 		$this->shareeEnumerationFullMatch = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
 		$this->shareeEnumerationFullMatchUserId = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes') === 'yes';
 		$this->shareeEnumerationFullMatchEmail = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
-		$this->shareeEnumerationFullMatchIgnoreSecondDisplayName = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no') === 'yes';
+		$this->shareeEnumerationFullMatchIgnoreSecondDisplayName = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no') === 'yes';
 	}
 
 	public function search($search, $limit, $offset, ISearchResult $searchResult) {
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
@@ -1968,7 +1968,7 @@ public function matchEmail(): bool {
 	}
 
 	public function ignoreSecondDisplayName(): bool {
-		return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no') === 'yes';
+		return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no') === 'yes';
 	}
 
 	public function currentUserCanEnumerateTargetUser(?IUser $currentUser, IUser $targetUser): bool {
diff --git a/tests/lib/Collaboration/Collaborators/UserPluginTest.php b/tests/lib/Collaboration/Collaborators/UserPluginTest.php
@@ -657,7 +657,7 @@ public function dataSearchEnumeration() {
 				[
 					'core' => [
 						'shareapi_allow_share_dialog_user_enumeration' => 'no',
-						'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name' => 'yes',
+						'shareapi_restrict_user_enumeration_full_match_ignore_second_dn' => 'yes',
 					],
 				]
 			],

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ protected function resetAppConfigs(): void {`
`124`	`124`	`$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match');`
`125`	`125`	`$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_userid');`
`126`	`126`	`$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_email');`
`127`		`- $this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name');`
	`127`	`+ $this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn');`
`128`	`128`	`$this->deleteServerConfig('core', 'shareapi_only_share_with_group_members');`
`129`	`129`	`}`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function __construct(IConfig $config,`
`95`	`95`	`$this->shareeEnumerationFullMatch = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';`
`96`	`96`	`$this->shareeEnumerationFullMatchUserId = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes') === 'yes';`
`97`	`97`	`$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';`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`public function search($search, $limit, $offset, ISearchResult $searchResult) {`
Original file line number	Diff line number	Diff line change
`@@ -1968,7 +1968,7 @@ public function matchEmail(): bool {`
`1968`	`1968`	`}`
`1969`	`1969`
`1970`	`1970`	`public function ignoreSecondDisplayName(): bool {`
`1971`		`- return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no') === 'yes';`
	`1971`	`+ return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no') === 'yes';`
`1972`	`1972`	`}`
`1973`	`1973`
`1974`	`1974`	`public function currentUserCanEnumerateTargetUser(?IUser $currentUser, IUser $targetUser): bool {`
Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ public function dataSearchEnumeration() {`
`657`	`657`	`[`
`658`	`658`	`'core' => [`
`659`	`659`	`'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',`
`661`	`661`	`],`
`662`	`662`	`]`
`663`	`663`	`],`