tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 00:34:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

RoleForm: Wrap module prefixes of permissions and restrictions in <em>

Browse Source
This commit is contained in:
Johannes Meyer 2019-07-24 13:16:47 +02:00
parent f871caeecd
commit 616f1fe2c8
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
application/forms/Security/RoleForm.php
View File

@ -38,6 +38,7 @@ class RoleForm extends RepositoryForm
public function init() public function init()
{ {
$helper = new Zend_Form_Element('bogus'); $helper = new Zend_Form_Element('bogus');
$view = $this->getView();
$this->providedPermissions['application'] = [ $this->providedPermissions['application'] = [
$helper->filterName('application/share/navigation') => [ $helper->filterName('application/share/navigation') => [
@ -87,7 +88,7 @@ class RoleForm extends RepositoryForm
$this->providedPermissions[$moduleName][$helper->filterName($modulePermission)] = [ $this->providedPermissions[$moduleName][$helper->filterName($modulePermission)] = [
'isUsagePerm' => true, 'isUsagePerm' => true,
'name' => $modulePermission, 'name' => $modulePermission,
'label' => $this->translate('General Module Access'), 'label' => $view->escape($this->translate('General Module Access')),
'description' => sprintf($this->translate('Allow access to module %s'), $moduleName) 'description' => sprintf($this->translate('Allow access to module %s'), $moduleName)
]; ];
@ -97,13 +98,18 @@ class RoleForm extends RepositoryForm
$this->providedPermissions[$moduleName][$helper->filterName($moduleName . '/*')] = [ $this->providedPermissions[$moduleName][$helper->filterName($moduleName . '/*')] = [
'isFullPerm' => true, 'isFullPerm' => true,
'name' => $moduleName . '/*', 'name' => $moduleName . '/*',
'label' => $this->translate('Full Module Access') 'label' => $view->escape($this->translate('Full Module Access'))
]; ];
foreach ($permissions as $permission) { foreach ($permissions as $permission) {
/** @var object $permission */ /** @var object $permission */
$this->providedPermissions[$moduleName][$helper->filterName($permission->name)] = [ $this->providedPermissions[$moduleName][$helper->filterName($permission->name)] = [
'name' => $permission->name, 'name' => $permission->name,
'label' => preg_replace(
'~^(\w+)(\/.*)~',
'<em>$1</em>$2',
$view->escape($permission->name)
),
'description' => $permission->description 'description' => $permission->description
]; ];
} }
@ -111,6 +117,11 @@ class RoleForm extends RepositoryForm
foreach ($module->getProvidedRestrictions() as $restriction) { foreach ($module->getProvidedRestrictions() as $restriction) {
$this->providedRestrictions[$moduleName][$helper->filterName($restriction->name)] = [ $this->providedRestrictions[$moduleName][$helper->filterName($restriction->name)] = [
'name' => $restriction->name, 'name' => $restriction->name,
'label' => preg_replace(
'~^(\w+)(\/.*)~',
'<em>$1</em>$2',
$view->escape($restriction->name)
),
'description' => $restriction->description 'description' => $restriction->description
]; ];
} }
@ -178,7 +189,10 @@ class RoleForm extends RepositoryForm
'label' => isset($spec['label']) ? $spec['label'] : $spec['name'], 'label' => isset($spec['label']) ? $spec['label'] : $spec['name'],
'description' => isset($spec['description']) ? $spec['description'] : $spec['name'] 'description' => isset($spec['description']) ? $spec['description'] : $spec['name']
] ]
); )
->getElement($name)
->getDecorator('Label')
->setOption('escape', false);
if (isset($spec['isFullPerm'])) { if (isset($spec['isFullPerm'])) {
$hasFullPerm = isset($formData[$name]) && $formData[$name]; $hasFullPerm = isset($formData[$name]) && $formData[$name];
} }
@ -191,10 +205,13 @@ class RoleForm extends RepositoryForm
'text', 'text',
$name, $name,
[ [
'label' => $spec['name'], 'label' => isset($spec['label']) ? $spec['label'] : $spec['name'],
'description' => $spec['description'] 'description' => $spec['description']
] ]
); )
->getElement($name)
->getDecorator('Label')
->setOption('escape', false);
} }
} }