Skip to content

Commit aedb38e

Browse files
Merge pull request #663 from jaredhendrickson13/next_patch
v2.3.5 Fixes
2 parents 53b7c4c + 88bb8bd commit aedb38e

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Caches/PrivilegesCache.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ class PrivilegesCache extends Cache {
2525
$privs += $endpoint_object->generate_pfsense_privs();
2626
}
2727

28-
# Obtain privileges for each Endpoint class
29-
foreach (get_classes_from_namespace('\\RESTAPI\\Forms\\') as $endpoint_class) {
30-
$endpoint_object = new $endpoint_class();
31-
$privs += $endpoint_object->generate_pfsense_privs();
28+
# Obtain privileges for each Form class
29+
foreach (get_classes_from_namespace('\\RESTAPI\\Forms\\') as $form_class) {
30+
$form_object = new $form_class();
31+
$privs += $form_object->generate_pfsense_privs();
3232
}
3333

3434
return $privs;

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Core/Form.inc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,17 @@ class Form {
165165
private function generate_verbose_name(): string {
166166
# Separate the class name's words with spaces, allow consecutive capital characters like 'DNS'
167167
$form_name = $this->get_class_shortname();
168-
return preg_replace('/(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])/', ': ', $form_name);
168+
$verbose_name = preg_replace('/(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])/', ' ', $form_name);
169+
170+
# Add a colon after the first word if the class name is more than one word
171+
if (str_contains($verbose_name, ' ')) {
172+
$verbose_name = explode(' ', $verbose_name);
173+
$verbose_name[0] .= ': ';
174+
$verbose_name = implode(' ', $verbose_name);
175+
}
176+
177+
# Return the verbose name with the 'Form' suffix removed
178+
return str_replace(' Form', '', $verbose_name);
169179
}
170180

171181
/**
@@ -513,6 +523,7 @@ class Form {
513523
$this->get_priv_name() => [
514524
'name' => 'WebCfg - ' . $this->verbose_name,
515525
'descr' => "Allow access to the $this->url page.",
526+
'match' => [substr($this->url, 1)],
516527
],
517528
];
518529
}

0 commit comments

Comments
 (0)