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

Form: Don't prevent disabled elements from getting overwritten..

Browse Source 
..if someone just utilizes populate() programatically.

refs #2509

(cherry picked from commit eb343009bb696e155897dda4decef532242cf9fa)
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
This commit is contained in:
Johannes Meyer 2017-07-13 13:53:48 +02:00 committed by Eric Lippmann
parent 75291386b2
commit 244f4e6694
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Web/Form.php
View File

@ -1104,21 +1104,22 @@ class Form extends Zend_Form
*
* @param Zend_Form $form
* @param array $defaults
* @param bool $ignoreDisabled
*/
protected function preserveDefaults(Zend_Form $form, array & $defaults)
protected function preserveDefaults(Zend_Form $form, array & $defaults, $ignoreDisabled = true)
{
foreach ($form->getElements() as $name => $element) {
if ((array_key_exists($name, $defaults)
&& array_key_exists($name . static::DEFAULT_SUFFIX, $defaults)
&& $defaults[$name] === $defaults[$name . static::DEFAULT_SUFFIX])
|| $element->getAttrib('disabled')
|| (! $ignoreDisabled && $element->getAttrib('disabled'))
) {
unset($defaults[$name]);
}
}
foreach ($form->getSubForms() as $_ => $subForm) {
$this->preserveDefaults($subForm, $defaults);
$this->preserveDefaults($subForm, $defaults, $ignoreDisabled);
}
}
@ -1145,6 +1146,11 @@ class Form extends Zend_Form
if (($frameUpload = (bool) $request->getUrl()->shift('_frameUpload', false))) {
$this->getView()->layout()->setLayout('wrapped');
}
// To prevent a BC, this is here. The proper fix is to extend populate()
// and pass $ignoreDisabled through to preserveDefaults()
$this->create($formData)->preserveDefaults($this, $formData, false);
$this->populate($formData); // Necessary to get isSubmitted() to work
if (! $this->getSubmitLabel() || $this->isSubmitted()) {
if ($this->isValid($formData)