From 3790169e50d558fe05d95de4c20d8ac003695413 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 30 Aug 2023 23:14:09 +0900
Subject: [PATCH] Migrate advanced_mailer module triggers to new format using
 module.xml

---
 .../advanced_mailer/advanced_mailer.class.php | 67 ++-----------------
 modules/advanced_mailer/conf/module.xml       |  8 ++-
 2 files changed, 11 insertions(+), 64 deletions(-)

diff --git a/modules/advanced_mailer/advanced_mailer.class.php b/modules/advanced_mailer/advanced_mailer.class.php
index 707144666..1c0ce19bb 100644
--- a/modules/advanced_mailer/advanced_mailer.class.php
+++ b/modules/advanced_mailer/advanced_mailer.class.php
@@ -177,82 +177,23 @@ class Advanced_Mailer extends ModuleObject
 		return $config;
 	}
 
-	/**
-	 * Register triggers.
-	 */
-	public function registerTriggers()
-	{
-		$oModuleModel = getModel('module');
-		$oModuleController = getController('module');
-		if ($oModuleModel->getTrigger('moduleHandler.init', 'advanced_mailer', 'model', 'triggerReplaceMailClass', 'before'))
-		{
-			$oModuleController->deleteTrigger('moduleHandler.init', 'advanced_mailer', 'model', 'triggerReplaceMailClass', 'before');
-		}
-		if (!$oModuleModel->getTrigger('mail.send', 'advanced_mailer', 'controller', 'triggerBeforeMailSend', 'before'))
-		{
-			$oModuleController->insertTrigger('mail.send', 'advanced_mailer', 'controller', 'triggerBeforeMailSend', 'before');
-		}
-		if (!$oModuleModel->getTrigger('mail.send', 'advanced_mailer', 'controller', 'triggerAfterMailSend', 'after'))
-		{
-			$oModuleController->insertTrigger('mail.send', 'advanced_mailer', 'controller', 'triggerAfterMailSend', 'after');
-		}
-		if (!$oModuleModel->getTrigger('sms.send', 'advanced_mailer', 'controller', 'triggerAfterSMSSend', 'after'))
-		{
-			$oModuleController->insertTrigger('sms.send', 'advanced_mailer', 'controller', 'triggerAfterSMSSend', 'after');
-		}
-		if (!$oModuleModel->getTrigger('push.send', 'advanced_mailer', 'controller', 'triggerAfterPushSend', 'after'))
-		{
-			$oModuleController->insertTrigger('push.send', 'advanced_mailer', 'controller', 'triggerAfterPushSend', 'after');
-		}
-	}
-
-	/**
-	 * Install.
-	 */
 	public function moduleInstall()
 	{
-		$this->registerTriggers();
+
 	}
 
-	/**
-	 * Check update.
-	 */
 	public function checkUpdate()
 	{
-		$oModuleModel = getModel('module');
-		if ($oModuleModel->getTrigger('moduleHandler.init', 'advanced_mailer', 'model', 'triggerReplaceMailClass', 'before'))
-		{
-			return true;
-		}
-		if (!$oModuleModel->getTrigger('mail.send', 'advanced_mailer', 'controller', 'triggerBeforeMailSend', 'before'))
-		{
-			return true;
-		}
-		if (!$oModuleModel->getTrigger('mail.send', 'advanced_mailer', 'controller', 'triggerAfterMailSend', 'after'))
-		{
-			return true;
-		}
-		if (!$oModuleModel->getTrigger('sms.send', 'advanced_mailer', 'controller', 'triggerAfterSMSSend', 'after'))
-		{
-			return true;
-		}
-		if (!$oModuleModel->getTrigger('push.send', 'advanced_mailer', 'controller', 'triggerAfterPushSend', 'after'))
-		{
-			return true;
-		}
-		return false;
+
 	}
 
-	/**
-	 * Update.
-	 */
 	public function moduleUpdate()
 	{
-		$this->registerTriggers();
+
 	}
 
 	public function recompileCache()
 	{
-		// no-op
+
 	}
 }
diff --git a/modules/advanced_mailer/conf/module.xml b/modules/advanced_mailer/conf/module.xml
index c3e85b36b..d1ce4bd25 100644
--- a/modules/advanced_mailer/conf/module.xml
+++ b/modules/advanced_mailer/conf/module.xml
@@ -11,7 +11,7 @@
 		<action name="dispAdvanced_mailerAdminSMSLog" type="view" />
 		<action name="dispAdvanced_mailerAdminPushTest" type="view" />
 		<action name="dispAdvanced_mailerAdminPushLog" type="view" />
-		
+
 		<action name="procAdvanced_mailerAdminInsertConfig" type="controller" />
 		<action name="procAdvanced_mailerAdminInsertExceptions" type="controller" />
 		<action name="procAdvanced_mailerAdminCheckDNSRecord" type="controller" />
@@ -22,6 +22,12 @@
 		<action name="procAdvanced_mailerAdminTestSendSMS" type="controller" />
 		<action name="procAdvanced_mailerAdminTestSendPush" type="controller" />
 	</actions>
+	<eventHandlers>
+		<eventHandler before="mail.send" class="controller" method="triggerBeforeMailSend" />
+		<eventHandler after="mail.send" class="controller" method="triggerAfterMailSend" />
+		<eventHandler after="sms.send" class="controller" method="triggerAfterSMSSend" />
+		<eventHandler after="push.send" class="controller" method="triggerAfterPushSend" />
+	</eventHandlers>
 	<menus>
 		<menu name="advanced_mailer" type="all">
 			<title xml:lang="ko">고급 메일 발송 모듈</title>