tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Escape restriction names manually in Forms\Security\RoleForm" 

This reverts commit 706e5504e6.

HTML5 does allow any non-empty value for the name attribute but Zend only permits
alphanumerics, the underscore, the circumflex and any ASCII character in range \x7f to \xff (127 to 255).
Thus only escaping the slash (/) is wrong.

refs #8086
This commit is contained in:
Eric Lippmann 2014-12-29 09:39:23 +01:00
parent 5e40ce2088
commit 6960a08de0
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ class RoleForm extends ConfigForm
foreach ($this->providedRestrictions as $name => $description) {
$this->addElement(
'text',
str_replace('/', '_', $name),
$name,
array(
'label' => $name,
'description' => $description
@ -129,12 +129,6 @@ class RoleForm extends ConfigForm
? String::trimSplit($role['permissions'])
: null;
$role['name'] = $name;
foreach (array_keys($role) as $key) {
// Slashes are not allowed in a form's element name
$value = $role[$key];
unset($role[$key]);
$role[str_replace('/', '_', $key)] = $value;
}
$this->populate($role);
return $this;
}
@ -236,12 +230,6 @@ class RoleForm extends ConfigForm
if (isset($values['permissions'])) {
$values['permissions'] = implode(', ', $values['permissions']);
}
foreach (array_keys($values) as $key) {
// Slashes are not allowed in a form's element name
$value = $values[$key];
unset($values[$key]);
$values[str_replace('/', '_', $key)] = $value;
}
return $values;
}
}