From fa4c559f27dd392b47257f527bdabeee3b44a5d1 Mon Sep 17 00:00:00 2001
From: "sas.fajri" <sas.fajri@gmail.com>
Date: Tue, 5 May 2026 10:27:58 +0700
Subject: [PATCH] Use notification config for email gateway

---
 .../controllers/tools/Email_gateway.php       | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/application/controllers/tools/Email_gateway.php b/application/controllers/tools/Email_gateway.php
index 46ef8c1..1237d93 100644
--- a/application/controllers/tools/Email_gateway.php
+++ b/application/controllers/tools/Email_gateway.php
@@ -20,15 +20,31 @@ class Email_gateway extends MY_Controller
         unset($keu['password']);
         $this->sender_keu = $keu;
 
-        $sql = "SELECT M_EmailConfigSender as email,
-            M_EmailConfigUsername as name,
-            M_EmailConfigPassword as password
-            FROM m_emailconfig
-            WHERE M_EmailConfigIsActive = 'Y';";
+        $sql = "SELECT
+                Email_ConfigNofificationSender as email,
+                Email_ConfigNofificationUsername as name,
+                Email_ConfigNofificationPassword as password,
+                Email_ConfigNofificationServer as server
+            FROM email_config_nofification
+            WHERE Email_ConfigNofificationIsActive = 'Y'
+            ORDER BY Email_ConfigNofificationID DESC
+            LIMIT 1";
         $qry = $this->db->query($sql);
+        $rst = $qry ? $qry->row_array() : [];
 
-        $rst = $qry->row_array();
-        $this->password_result = $rst['password'];
+        if (!$rst || empty($rst['email'])) {
+            $sql = "SELECT M_EmailConfigSender as email,
+                M_EmailConfigUsername as name,
+                M_EmailConfigPassword as password,
+                M_EmailConfigServer as server
+                FROM m_emailconfig
+                WHERE M_EmailConfigIsActive = 'Y'
+                LIMIT 1";
+            $qry = $this->db->query($sql);
+            $rst = $qry ? $qry->row_array() : [];
+        }
+
+        $this->password_result = isset($rst['password']) ? $rst['password'] : '';
         unset($rst['password']);
         $this->sender_result = $rst;
         $this->sender_std = $rst;