Skip to content

Commit 208abe4

Browse files
Merge pull request #63911 from nextcloud/backport/63745/stable34
[stable34] fix(settings): clean up regex / app config outliers
2 parents 40be0c5 + 5e1b210 commit 208abe4

5 files changed

Lines changed: 8 additions & 9 deletions

File tree

apps/dav/lib/Settings/CalDAVSettings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function getName(): ?string {
7979
#[\Override]
8080
public function getAuthorizedAppConfig(): array {
8181
return [
82-
'dav' => ['/(' . implode('|', array_keys(self::defaults)) . ')/']
82+
'dav' => array_keys(self::defaults),
8383
];
8484
}
8585
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@ public function getName(): ?string {
109109

110110
#[\Override]
111111
public function getAuthorizedAppConfig(): array {
112-
return [
113-
'core' => [
114-
'/mail_general_settings/',
115-
],
116-
];
112+
return [];
117113
}
118114
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function getPriority() {
120120
#[\Override]
121121
public function getAuthorizedAppConfig(): array {
122122
return [
123-
'core' => ['/shareapi_.*/'],
123+
'core' => ['/^shareapi_.*$/'],
124124
];
125125
}
126126

apps/sharebymail/lib/Settings/Admin.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ public function getName(): ?string {
6363
#[\Override]
6464
public function getAuthorizedAppConfig(): array {
6565
return [
66-
'sharebymail' => ['s/(sendpasswordmail|replyToInitiator)/'],
66+
'sharebymail' => [
67+
'sendpasswordmail',
68+
'replyToInitiator',
69+
],
6770
];
6871
}
6972
}

apps/theming/lib/Settings/Admin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function getName(): ?string {
114114
#[\Override]
115115
public function getAuthorizedAppConfig(): array {
116116
return [
117-
Application::APP_ID => '/.*/',
117+
Application::APP_ID => '/^.*$/',
118118
];
119119
}
120120
}

0 commit comments

Comments
 (0)