From 5028ec7b0b8ae80948da5a2895b7319e2fb50085 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 Aug 2014 12:30:13 +0200
Subject: [PATCH] Avoid NIH

It's useless to have specific getters and setters if generic methods from the
baseclass can be used as well to accomplish the same task.

refs #6641
---
 .../controllers/ConfigController.php          | 24 ++++++++++-------
 .../application/forms/Config/SecurityForm.php | 27 -------------------
 2 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 4f1d3c7fa..ba005f302 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -259,19 +259,23 @@ class Monitoring_ConfigController extends ModuleActionController
         $this->view->tabs = $this->Module()->getConfigTabs()->activate('security');
 
         $form = new SecurityForm();
-        $form->setConfiguration($this->Config()->get('security'));
         $request = $this->getRequest();
-        if ($request->isPost() && $form->isValid($request->getPost())) {
-            $config = $this->Config()->toArray();
-            $config['security'] = $form->getConfig();
-            if ($this->writeConfiguration(new Zend_Config($config))) {
-                Notification::success('Configuration modified successfully');
-                $this->redirectNow('monitoring/config/security');
-            } else {
-                $this->render('show-configuration');
-                return;
+        $config = $this->Config()->toArray();
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {
+                $config['security'] = $form->getValues();
+                if ($this->writeConfiguration(new Zend_Config($config))) {
+                    Notification::success('Configuration modified successfully');
+                    $this->redirectNow('monitoring/config/security');
+                } else {
+                    $this->render('show-configuration');
+                    return;
+                }
             }
+        } elseif (isset($config['security'])) {
+            $form->populate($config['security']);
         }
+
         $this->view->form = $form;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/SecurityForm.php b/modules/monitoring/application/forms/Config/SecurityForm.php
index 65544c23e..7c38976a1 100644
--- a/modules/monitoring/application/forms/Config/SecurityForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityForm.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Module\Monitoring\Form\Config;
 
-use Zend_Config;
 use Icinga\Web\Form;
 
 /**
@@ -12,11 +11,6 @@ use Icinga\Web\Form;
  */
 class SecurityForm extends Form
 {
-    /**
-     * The configuration to use for populating the form
-     */
-    protected $config;
-
     /**
      * Initialize this form
      */
@@ -61,25 +55,4 @@ class SecurityForm extends Form
 
         return $this;
     }
-
-    /**
-     * Set the configuration to be used for initial population of the form
-     */
-    public function setConfiguration($config)
-    {
-        $this->config = $config;
-    }
-
-    /**
-     * Return the configuration set by this form
-     *
-     * @return Zend_Config The configuration set in this form
-     */
-    public function getConfig()
-    {
-        $values = $this->getValues();
-        return new Zend_Config(array(
-            'protected_customvars' => $values['protected_customvars']
-        ));
-    }
 }