ContactGroupForm: Add missing filter and simplify code

Icinga · Jul 4, 2024 · d95758b · d95758b
1 parent 195ca73
commit d95758b
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/application/forms/ContactGroupForm.php b/application/forms/ContactGroupForm.php
@@ -252,31 +252,29 @@ public function editGroup(): void
                     ->columns(['contact_id'])
                     ->where([
                         'contactgroup_id = ?'   => $this->contactgroupId,
+                        'deleted = ?'           => 'y',
                         'contact_id IN (?)'     => $toAdd
                     ])
             );
 
-            $removeDeletedFlagFromIds = [];
+            $toAdd = array_diff($toAdd, $contactsMarkedAsDeleted);
             foreach ($toAdd as $contactId) {
-                if (in_array($contactId, $contactsMarkedAsDeleted)) {
-                    $removeDeletedFlagFromIds[] = $contactId;
-                } else {
-                    $this->db->insert(
-                        'contactgroup_member',
-                        [
-                            'contactgroup_id'   => $this->contactgroupId,
-                            'contact_id'        => $contactId
-                        ]
-                    );
-                }
+                $this->db->insert(
+                    'contactgroup_member',
+                    [
+                        'contactgroup_id'   => $this->contactgroupId,
+                        'contact_id'        => $contactId
+                    ]
+                );
             }
-            if (! empty($removeDeletedFlagFromIds)) {
+
+            if (! empty($contactsMarkedAsDeleted)) {
                 $this->db->update(
                     'contactgroup_member',
                     ['changed_at' => $changedAt, 'deleted' => 'n'],
                     [
                         'contactgroup_id = ?'   => $this->contactgroupId,
-                        'contact_id IN (?)'     => $removeDeletedFlagFromIds
+                        'contact_id IN (?)'     => $contactsMarkedAsDeleted
                     ]
                 );
             }