From db9355fd0c9f77252977838fa3be835ac6eff0b4 Mon Sep 17 00:00:00 2001 From: Waterticket Date: Sat, 4 Mar 2023 12:56:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EC=9E=90=EB=8F=99=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=9D=B4=ED=9B=84=20member.doAutoLogin=20?= =?UTF-8?q?After=20=ED=8A=B8=EB=A6=AC=EA=B1=B0=20=ED=98=B8=EC=B6=9C?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=ED=8C=A8=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/member.controller.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index d26803b24..b2c006ec4 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -2171,6 +2171,11 @@ class MemberController extends Member executeQuery('member.deleteAutologin', $args); return false; } + + // Call a trigger after validate security key (after) + $trigger_obj = new stdClass(); + $trigger_obj->member_srl = $output->data->member_srl; + ModuleHandler::triggerCall('member.doAutoLogin', 'after', $trigger_obj); // Update the security key. $new_security_key = Rhymix\Framework\Security::getRandom(24, 'alnum'); From 92fc585eb7549604cd02b2a3ca8ec5d5fc58a2e9 Mon Sep 17 00:00:00 2001 From: Waterticket Date: Sat, 4 Mar 2023 13:51:06 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20doAutoLogin=20after=20=ED=8A=B8?= =?UTF-8?q?=EB=A6=AC=EA=B1=B0=20=EC=9C=84=EC=B9=98=EB=A5=BC=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=20=EC=BA=90=EC=8B=9C=20=EC=B4=88=EA=B8=B0=ED=99=94=20?= =?UTF-8?q?=ED=9B=84=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/member.controller.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index b2c006ec4..a2227186e 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -2171,11 +2171,6 @@ class MemberController extends Member executeQuery('member.deleteAutologin', $args); return false; } - - // Call a trigger after validate security key (after) - $trigger_obj = new stdClass(); - $trigger_obj->member_srl = $output->data->member_srl; - ModuleHandler::triggerCall('member.doAutoLogin', 'after', $trigger_obj); // Update the security key. $new_security_key = Rhymix\Framework\Security::getRandom(24, 'alnum'); @@ -2192,6 +2187,11 @@ class MemberController extends Member executeQuery('member.updateLastLogin', (object)['member_srl' => $output->data->member_srl]); self::clearMemberCache($output->data->member_srl); + // Call a trigger after validate security key (after) + $trigger_obj = new stdClass(); + $trigger_obj->member_srl = $output->data->member_srl; + ModuleHandler::triggerCall('member.doAutoLogin', 'after', $trigger_obj); + // Return the member_srl. return intval($output->data->member_srl); }