From 1e0c9e9039b9d8c5cf0bc10fcd1ee3c24c55198e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=A7=B9=EC=A3=BC=EC=98=81?= <mjy9088@naver.com>
Date: Wed, 8 Dec 2021 15:38:50 +0900
Subject: [PATCH 1/6] =?UTF-8?q?HTML=20ID=20=EC=A4=91=EB=B3=B5=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 views/skin/user/default/create.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/skin/user/default/create.blade.php b/views/skin/user/default/create.blade.php
index e84e61e..2c1f7bc 100644
--- a/views/skin/user/default/create.blade.php
+++ b/views/skin/user/default/create.blade.php
@@ -29,7 +29,7 @@
             @endif
             @if($config->get('secret') === true && !Auth::guest())
             <div class="comment_form_option">
-                <input type="checkbox" name="display" value="secret" id="private_text"><label for="private_text">{{ xe_trans('comment::secret') }}</label>
+                <input type="checkbox" name="display" value="secret" id="private_text--{{ $targetId }}--{{ $instanceId }}--{{ $targetType }}"><label for="private_text--{{ $targetId }}--{{ $instanceId }}--{{ $targetType }}">{{ xe_trans('comment::secret') }}</label>
             </div>
             @endif
             <div class="comment_form_btn">

From 297cd2a87093ca5bd87bae8a0f90e54c578b23ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=A7=B9=EC=A3=BC=EC=98=81?= <mjy9088@naver.com>
Date: Wed, 8 Dec 2021 15:41:14 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=EC=A4=91=EB=B3=B5=20ID=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 views/skin/user/default/edit.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/skin/user/default/edit.blade.php b/views/skin/user/default/edit.blade.php
index b33573c..2b4884e 100644
--- a/views/skin/user/default/edit.blade.php
+++ b/views/skin/user/default/edit.blade.php
@@ -26,8 +26,8 @@
                 @endif
                 @if($config->get('secret') === true && !Auth::guest())
                     <div class="comment_form_option">
-                        <input type="checkbox" name="display" value="secret" id="private_text" {{ $comment->display === Xpressengine\Plugins\Comment\Models\Comment::DISPLAY_SECRET ? 'checked' : '' }}>
-                        <label for="private_text">{{ xe_trans('comment::secret') }}</label>
+                        <input type="checkbox" name="display" value="secret" id="private_text--{{ $instanceId }}--{{ $comment->id }}" {{ $comment->display === Xpressengine\Plugins\Comment\Models\Comment::DISPLAY_SECRET ? 'checked' : '' }}>
+                        <label for="private_text--{{ $instanceId }}--{{ $comment->id }}">{{ xe_trans('comment::secret') }}</label>
                     </div>
                 @endif
                 <div class="comment_form_btn">

From e0a6338832da84d6741a18b112e86d7c49e74027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=A7=B9=EC=A3=BC=EC=98=81?= <mjy9088@naver.com>
Date: Wed, 8 Dec 2021 15:43:16 +0900
Subject: [PATCH 3/6] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=A4=91=EB=B3=B5=20I?=
 =?UTF-8?q?D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 views/skin/user/default/reply.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/skin/user/default/reply.blade.php b/views/skin/user/default/reply.blade.php
index 60834eb..995fa29 100644
--- a/views/skin/user/default/reply.blade.php
+++ b/views/skin/user/default/reply.blade.php
@@ -33,7 +33,7 @@
                 @if($config->get('secret') === true && !Auth::guest())
                 <div class="comment_form_option">
                     <!-- [D] id, for 값 동일하게 적용 -->
-                    <input type="checkbox" name="display" value="secret" id="private_text_reply"><label for="private_text_reply">{{ xe_trans('comment::secret') }}</label>
+                    <input type="checkbox" name="display" value="secret" id="private_text_reply--{{ $comment->instance_id }}--{{ $comment->target->target_id }}--{{ $comment->id }}--{{ $targetType }}"><label for="private_text_reply--{{ $comment->instance_id }}--{{ $comment->target->target_id }}--{{ $comment->id }}--{{ $targetType }}">{{ xe_trans('comment::secret') }}</label>
                 </div>
                 @endif
                 <div class="comment_form_btn">

From c170cfcac38c2711cb67763aec1285e0d3a92a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=A7=B9=EC=A3=BC=EC=98=81?= <mjy9088@naver.com>
Date: Wed, 29 Dec 2021 18:42:41 +0900
Subject: [PATCH 4/6] Update create.blade.php

---
 views/skin/user/default/create.blade.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/skin/user/default/create.blade.php b/views/skin/user/default/create.blade.php
index 2c1f7bc..13448df 100644
--- a/views/skin/user/default/create.blade.php
+++ b/views/skin/user/default/create.blade.php
@@ -28,8 +28,11 @@
             </div>
             @endif
             @if($config->get('secret') === true && !Auth::guest())
+            @php
+            $htmlIdPrivateText = app('xe.keygen')->generate();
+            @endphp
             <div class="comment_form_option">
-                <input type="checkbox" name="display" value="secret" id="private_text--{{ $targetId }}--{{ $instanceId }}--{{ $targetType }}"><label for="private_text--{{ $targetId }}--{{ $instanceId }}--{{ $targetType }}">{{ xe_trans('comment::secret') }}</label>
+                <input type="checkbox" name="display" value="secret" id="private_text--{{ $htmlIdPrivateText }}"><label for="private_text--{{ $$htmlIdPrivateText }}">{{ xe_trans('comment::secret') }}</label>
             </div>
             @endif
             <div class="comment_form_btn">

From 25cebcba057ae76f973ba66713495c81a0ce986b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=A7=B9=EC=A3=BC=EC=98=81?= <mjy9088@naver.com>
Date: Wed, 29 Dec 2021 18:44:59 +0900
Subject: [PATCH 5/6] Update edit.blade.php

---
 views/skin/user/default/edit.blade.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/views/skin/user/default/edit.blade.php b/views/skin/user/default/edit.blade.php
index 2b4884e..375858e 100644
--- a/views/skin/user/default/edit.blade.php
+++ b/views/skin/user/default/edit.blade.php
@@ -25,9 +25,12 @@
                     </div>
                 @endif
                 @if($config->get('secret') === true && !Auth::guest())
+                @php
+                $htmlIdPrivateText = app('xe.keygen')->generate();
+                @endphp
                     <div class="comment_form_option">
-                        <input type="checkbox" name="display" value="secret" id="private_text--{{ $instanceId }}--{{ $comment->id }}" {{ $comment->display === Xpressengine\Plugins\Comment\Models\Comment::DISPLAY_SECRET ? 'checked' : '' }}>
-                        <label for="private_text--{{ $instanceId }}--{{ $comment->id }}">{{ xe_trans('comment::secret') }}</label>
+                        <input type="checkbox" name="display" value="secret" id="private_text--{{ $htmlIdPrivateText }}" {{ $comment->display === Xpressengine\Plugins\Comment\Models\Comment::DISPLAY_SECRET ? 'checked' : '' }}>
+                        <label for="private_text--{{ $htmlIdPrivateText }}">{{ xe_trans('comment::secret') }}</label>
                     </div>
                 @endif
                 <div class="comment_form_btn">

From 3012c63f010fcb52762efec9803cb2128e2e6508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=A7=B9=EC=A3=BC=EC=98=81?= <mjy9088@naver.com>
Date: Wed, 29 Dec 2021 18:47:23 +0900
Subject: [PATCH 6/6] Update reply.blade.php

---
 views/skin/user/default/reply.blade.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/skin/user/default/reply.blade.php b/views/skin/user/default/reply.blade.php
index 995fa29..5c1989b 100644
--- a/views/skin/user/default/reply.blade.php
+++ b/views/skin/user/default/reply.blade.php
@@ -31,9 +31,12 @@
                 </div>
                 @endif
                 @if($config->get('secret') === true && !Auth::guest())
+                @php
+                $htmlIdPrivateTextReply = app('xe.keygen')->generate();
+                @endphp
                 <div class="comment_form_option">
                     <!-- [D] id, for 값 동일하게 적용 -->
-                    <input type="checkbox" name="display" value="secret" id="private_text_reply--{{ $comment->instance_id }}--{{ $comment->target->target_id }}--{{ $comment->id }}--{{ $targetType }}"><label for="private_text_reply--{{ $comment->instance_id }}--{{ $comment->target->target_id }}--{{ $comment->id }}--{{ $targetType }}">{{ xe_trans('comment::secret') }}</label>
+                    <input type="checkbox" name="display" value="secret" id="private_text_reply--{{ $htmlIdPrivateTextReply }}"><label for="private_text_reply--{{ $htmlIdPrivateTextReply }}">{{ xe_trans('comment::secret') }}</label>
                 </div>
                 @endif
                 <div class="comment_form_btn">