From 395201eee90583d16ee7738f281c894eb115f774 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 26 Nov 2015 15:34:08 +0100 Subject: [PATCH] lib: Automatically flatten subform values in ConfigForm::getValues() Zend returns values from subforms grouped by their names and we have several places where we manually extract them. ConfigForm::getValues() does this automatically now. --- application/forms/ConfigForm.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php index 3d6d85dc7..70399c970 100644 --- a/application/forms/ConfigForm.php +++ b/application/forms/ConfigForm.php @@ -5,9 +5,9 @@ namespace Icinga\Forms; use Exception; use Zend_Form_Decorator_Abstract; +use Icinga\Application\Config; use Icinga\Web\Form; use Icinga\Web\Notification; -use Icinga\Application\Config; /** * Form base-class providing standard functionality for configuration forms @@ -21,6 +21,23 @@ class ConfigForm extends Form */ protected $config; + /** + * {@inheritdoc} + * + * Values from subforms are directly added to the returned values array instead of being grouped by the subforms' + * names. + */ + public function getValues($suppressArrayNotation = false) + { + $values = parent::getValues($suppressArrayNotation); + foreach (array_keys($this->_subForms) as $name) { + // Zend returns values from subforms grouped by their names, but we want them flat + $values = array_merge($values, $values[$name]); + unset($values[$name]); + } + return $values; + } + /** * Set the configuration to use when populating the form or when saving the user's input *