From 6c621d904508be55bf907d38f84fee3033651adb Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Fri, 17 Apr 2026 15:35:50 +0700
Subject: [PATCH] Update - Perbaikan untuk menampilkan data semua email yang
 aktif ke Mail Group

---
 app/Controllers/Mailgroups.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/Mailgroups.php b/app/Controllers/Mailgroups.php
index fe229d6..390e6e7 100644
--- a/app/Controllers/Mailgroups.php
+++ b/app/Controllers/Mailgroups.php
@@ -24,17 +24,14 @@ class Mailgroups extends BaseController {
 			$results = $query->getResultArray();
 			$data['mailgroups'] = $results;
 		}
-		$sql = "SELECT email_1 FROM users WHERE `enddate` IS NULL UNION SELECT email_2 FROM users WHERE `enddate` IS NULL";
+		$sql = "SELECT email_2 as emails FROM users WHERE enddate IS NULL
+				UNION SELECT email FROM emails WHERE email IS NOT NULL AND email != '' AND enddate IS NULL
+				UNION SELECT email_1 FROM contacts WHERE email_1 IS NOT NULL AND email_1 != ''
+				UNION SELECT email_2 FROM contacts WHERE email_2 IS NOT NULL AND email_2 != ''";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
-		foreach($results as $email) { array_push( $data['emails'], $email['email_1']); }
-		$sql = "SELECT email_1 FROM contacts WHERE enddate IS NULL UNION SELECT email_2 FROM contacts WHERE enddate IS NULL;";
-		$query = $db->query($sql);
-		$results = $query->getResultArray();
-		foreach($results as $email) { array_push( $data['emails'], $email['email_1']); }
-		$data['emails'] = array_unique($data['emails']);
-		$data['emails'] = array_filter($data['emails']);
-		//print_r($data['emails']);
+		$data['emails'] = array_column($results, 'emails');	
+		
 		if ($this->request->getMethod() === 'POST') {
 			$rules = [
 				'mailgroupname' => 'required',