From 9bb2e40ef4911509b3926b051acbba1f935ef0a1 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 25 Jun 2023 19:58:52 +0900
Subject: [PATCH] Fix #2086 missing CAPTCHA in message module skin

---
 modules/message/skins/default/message.css          | 1 +
 modules/message/skins/default/system_message.html  | 7 ++++++-
 modules/message/skins/xedition/system_message.html | 7 ++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/message/skins/default/message.css b/modules/message/skins/default/message.css
index ccde3f349..26d7f2e07 100644
--- a/modules/message/skins/default/message.css
+++ b/modules/message/skins/default/message.css
@@ -15,6 +15,7 @@ body, #access table, #access input, #access textarea, #access select, #access bu
 #access>.login-footer:before,
 #access>.login-footer:after{display:table;line-height:0;content:"";clear:both}
 #access .control-group{position:relative;padding:0 14px 0 0;margin:0;clear:both}
+#access .control-group.captcha { margin-bottom:10px}
 #access .control-group:before{content:"";display:block;clear:both}
 #access .message{padding:0.8em 1em}
 #access .message.location{word-break:break-all}
diff --git a/modules/message/skins/default/system_message.html b/modules/message/skins/default/system_message.html
index fd24599fe..14fbbd252 100644
--- a/modules/message/skins/default/system_message.html
+++ b/modules/message/skins/default/system_message.html
@@ -30,9 +30,14 @@
 					<input type="email" name="user_id" id="uid" title="{$lang->email_address}" placeholder="{$lang->email_address}" required autofocus cond="$member_config->identifier == 'email_address'" />
 					<input type="password" name="password" id="upw" title="{$lang->password}" placeholder="{$lang->password}" required />
 				</div>
+				<!--@if(SpamfilterModel::isCaptchaEnabled('login'))-->
+					<div class="control-group captcha">
+						{SpamfilterModel::getCaptcha('login')|noescape}
+					</div>
+				<!--@endif-->
 				<div class="control-group">
 					<label for="keepid">
-						<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()&gt;0?'addClass':'removeClass')]('open');" />						
+						<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()&gt;0?'addClass':'removeClass')]('open');" />
 						{$lang->keep_signed}
 					</label>
 					<p id="warning">{$lang->about_keep_warning}</p>
diff --git a/modules/message/skins/xedition/system_message.html b/modules/message/skins/xedition/system_message.html
index c49207e56..5626ca4c9 100644
--- a/modules/message/skins/xedition/system_message.html
+++ b/modules/message/skins/xedition/system_message.html
@@ -26,8 +26,13 @@
 					<input type="text" name="user_id" id="uid" title="{$lang->user_id}" placeholder="{$lang->user_id}" required autofocus cond="$member_config->identifier != 'email_address'" />
 					<input type="email" name="user_id" id="uid" title="{$lang->email_address}" placeholder="{$lang->email_address}" required autofocus cond="$member_config->identifier == 'email_address'" />
 					<input type="password" name="password" id="upw" title="{$lang->password}" placeholder="{$lang->password}" required />
+					<!--@if(SpamfilterModel::isCaptchaEnabled('login'))-->
+						<div class="control-group captcha">
+							{SpamfilterModel::getCaptcha('login')|noescape}
+						</div>
+					<!--@endif-->
 					<label for="keepid" cond="!$system_message_detail">
-						<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()&gt;0?'addClass':'removeClass')]('open');" />						
+						<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()&gt;0?'addClass':'removeClass')]('open');" />
 						{$lang->keep_signed}
 					</label>
 				</div>