ContactForm: Fix saving and populating contact addresses

Icinga · Jun 12, 2024 · 2ae3713 · 2ae3713
1 parent 5da809e
commit 2ae3713
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/library/Notifications/Web/Form/ContactForm.php b/library/Notifications/Web/Form/ContactForm.php
@@ -172,20 +172,7 @@ public function populate($values)
             }
 
             foreach ($values->contact_address as $contactInfo) {
-                if (! isset($formValues['contact_address'])) {
-                    $formValues['contact_address'] = [
-                        'email'       => null,
-                        'rocketchat' => null
-                    ];
-                }
-
-                if ($contactInfo->type === 'email') {
-                    $formValues['contact_address']['email' ] = $contactInfo->address;
-                }
-
-                if ($contactInfo->type === 'rocketchat') {
-                    $formValues['contact_address']['rocketchat'] = $contactInfo->address;
-                }
+                $formValues['contact_address'][$contactInfo->type] = $contactInfo->address;
             }
 
             $values = $formValues;
@@ -222,8 +209,7 @@ public function addOrUpdateContact()
             }
         }
 
-        $addr = ! empty($addressFromDb) ? $addressFromDb : $addressFromForm;
-        foreach ($addr as $type => $value) {
+        foreach ($addressFromForm as $type => $value) {
             $this->insertOrUpdateAddress($type, $addressFromForm, $addressFromDb);
         }