Skip to content

Commit e14859c

Browse files
Merge pull request #63910 from nextcloud/backport/63745/stable35
[stable35] fix(settings): clean up regex / app config outliers
2 parents b92bce5 + f6240b3 commit e14859c

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
@@ -80,7 +80,7 @@ public function getName(): ?string {
8080
#[\Override]
8181
public function getAuthorizedAppConfig(): array {
8282
return [
83-
'dav' => ['/(' . implode('|', array_keys(self::defaults)) . ')/']
83+
'dav' => array_keys(self::defaults),
8484
];
8585
}
8686
}

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

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

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

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

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

apps/sharebymail/lib/Settings/Admin.php

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

apps/theming/lib/Settings/Admin.php

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

0 commit comments

Comments
 (0)