From 4c5d5650a65bdfa5c9b9d899234f59ea0e57d856 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 2 Oct 2018 13:50:13 +0900 Subject: [PATCH] Fix #1095 denied email hosts not applied in procMemberResetAuthMail --- modules/member/member.controller.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index cceb6ce50..e992b9a21 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1733,6 +1733,22 @@ class memberController extends member throw new Rhymix\Framework\Exception('msg_exists_email_address'); } + // Check managed Email Host + if($oMemberModel->isDeniedEmailHost($newEmail)) + { + $config = $oMemberModel->getMemberConfig(); + $emailhost_check = $config->emailhost_check; + + $managed_email_host = lang('managed_email_host'); + $email_hosts = $oMemberModel->getManagedEmailHosts(); + foreach ($email_hosts as $host) + { + $hosts[] = $host->email_host; + } + $message = sprintf($managed_email_host[$emailhost_check], implode(', ',$hosts), 'id@' . implode(', id@', $hosts)); + throw new Rhymix\Framework\Exception($message); + } + // remove all key by member_srl $args = new stdClass; $args->member_srl = $memberInfo->member_srl;