Fix overwritte default-values in forms and connection validation

refs #6141
Icinga · May 28, 2014 · ec096c3 · ec096c3
1 parent 5e1729d
commit ec096c3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
@@ -134,10 +134,10 @@ public function getConfig()
      *
      * @return bool
      */
-    public function isValidResource($data)
+    public function isValidResource()
     {
         try {
-            $config = $this->createConfig($data);
+            $config = $this->getConfig();
             /*
              * It should be possible to run icingaweb without the pgsql or mysql extension or Zend-Pdo-Classes,
              * in case they aren't actually used. When the user tries to create a resource that depends on an
@@ -164,5 +164,6 @@ public function isValidResource($data)
             $this->addErrorMessage(t('Connectivity validation failed, connection to the given resource not possible.'));
             return false;
         }
+        return true;
     }
 } 
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
@@ -30,6 +30,7 @@
 namespace Icinga\Form\Config\Resource;
 
 use Icinga\Web\Form;
+use Zend_Config;
 
 /**
  * Contains the properties needed to create a basic LDAP resource.

diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -33,6 +33,7 @@
 use Exception;
 use Icinga\Web\Form;
 use Zend_Config;
+use Icinga\Data\ResourceFactory;
 
 /**
  * Contains the properties needed to create a basic LDAP resource.

diff --git a/application/forms/Config/Resource/ResourceBaseForm.php b/application/forms/Config/Resource/ResourceBaseForm.php
@@ -32,6 +32,7 @@
 use Icinga\Data\ResourceFactory;
 use Icinga\Web\Form;
 use Zend_Config;
+use Exception;
 
 class ResourceBaseForm extends Form {
 
@@ -75,15 +76,26 @@ public function getConfig()
         return new Zend_Config($result);
     }
 
+    public function isValid($data)
+    {
+        foreach ($this->getElements() as $key => $element) {
+            // Initialize all empty elements with their default values.
+            if (!isset($data[$key])) {
+                $data[$key] = $element->getValue();
+            }
+        }
+        return parent::isValid($data);
+    }
+
     /**
      * Return if this resource is usable by icingaweb
      *
      * For abstract resources, this will perform a simple connectivity test
      *
      * @return bool
      */
-    public function isValidResource($data) {
-        $config = $this->createConfig($data);
+    public function isValidResource() {
+        $config = $this->getConfig();
         try {
             $resource = ResourceFactory::createResource($config);
             $resource->connect();

diff --git a/application/forms/Config/Resource/StatusdatResourceForm.php b/application/forms/Config/Resource/StatusdatResourceForm.php
@@ -72,6 +72,7 @@ public function isValidResource()
             );
             return false;
         }
+        return true;
     }
 
     public function getConfig()

diff --git a/application/forms/Config/ResourceForm.php b/application/forms/Config/ResourceForm.php
@@ -273,6 +273,7 @@ public function isValid($data)
         if (isset($data['resource_force_creation']) && $data['resource_force_creation']) {
             return true;
         }
+        var_dump($data);
         if ($data['resource_type_old'] === $data['resource_type']) {
             if (!$this->isValidResource($data)) {
                 $this->addForceCreationCheckbox();
@@ -295,8 +296,7 @@ public function isValid($data)
      */
     public function isValidResource()
     {
-        $data = $this->getValues();
-        $valid = $this->resourceSubForm->isValidResource($data);
+        $valid = $this->resourceSubForm->isValidResource();
         $this->addErrorMessages($this->resourceSubForm->getErrorMessages());
         return $valid;
     }