From aa7e3fc375ab7afa5ed18ce67fa993d3f642563f Mon Sep 17 00:00:00 2001
From: kkigomi <kkigomi@duck.com>
Date: Fri, 5 Jul 2024 21:32:07 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=AA=A9=EB=A1=9D=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=8B=89=EB=84=A4=EC=9E=84=20=EA=B0=80=EB=A6=AC=EA=B8=B0=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=82=AC=EC=9A=A9=20=EC=8B=9C=20=EA=B8=80?=
 =?UTF-8?q?,=20=EB=8C=93=EA=B8=80=20=EC=9E=91=EC=84=B1=EC=9E=90=EC=9D=98?=
 =?UTF-8?q?=20=EB=8B=89=EB=84=A4=EC=9E=84=20=EB=B0=8F=20=EC=84=9C=EB=AA=85?=
 =?UTF-8?q?=20=EA=B0=80=EB=A6=AC=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

스킨 설정에서 닉네임 가리기 기능 사용 시 글, 댓글의 작성자 닉네임과 서명, 회원 메모가 출력되는 문제를 해결합니다.
최고관리자는 항상 표시되며, 글과 댓글의 작성자 본인에게 표시됩니다.
---
 .../basic/comment/basic/comment.skin.php      |  8 ++-
 .../skin/board/basic/list/list/list.skin.php  |  4 +-
 .../skin/board/basic/view/basic/view.skin.php | 62 +++++++++----------
 3 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/theme/damoang/skin/board/basic/comment/basic/comment.skin.php b/theme/damoang/skin/board/basic/comment/basic/comment.skin.php
index 333567743..5588a0407 100755
--- a/theme/damoang/skin/board/basic/comment/basic/comment.skin.php
+++ b/theme/damoang/skin/board/basic/comment/basic/comment.skin.php
@@ -181,6 +181,9 @@
                                 <i class="bi bi-arrow-return-right"></i>
                                 <span class="visually-hidden">대댓글</span>
                             <?php } ?>
+
+                                <!-- 댓글 작성자 -->
+                                <?php if ($boset->isProfileRenderable() || $member->isAuthor($list[$i]['mb_id'])) { ?>
                             <span class="visually-hidden">작성자</span>
                             <span class="d-inline-block"><?php echo na_name_photo($list[$i]['mb_id'], $list[$i]['name']); ?></span>
                             <?php
@@ -188,6 +191,7 @@
                             echo $list[$i]['da_member_memo'] ?? '';
                             ?>
                             (<?php echo $list[$i]['ip'] ?>)
+                                <?php } ?>
                         </div>
                         <div>
                             <?php include(G5_SNS_PATH.'/view_comment_list.sns.skin.php'); // SNS ?>
@@ -213,6 +217,7 @@
                         </div>
                     <?php } ?>
                     <div class="<?php echo $is_convert ?>">
+                            <?php if ($boset->isProfileRenderable()) { ?>
                         <?php if ($comment_depth) { ?>
                             <?php if ($parent_wr_name) { ?>
                                 <em class="da-commented-to"><strong>@<?= $parent_wr_name ?></strong>님에게 답글</em>
@@ -220,6 +225,7 @@
                                 <em class="da-commented-to">다른 누군가에게 답글</em>
                             <?php } ?>
                         <?php } ?>
+                            <?php } ?>
                         <?php
                         $is_lock = false;
                         if (strstr($list[$i]['wr_option'], "secret")) {
@@ -249,7 +255,7 @@
                             }
                         ?>
                             <?php if ($list[$i]['is_reply']) { ?>
-                                <button type="button" class="btn btn-basic" onclick="comment_box('<?php echo $comment_id ?>','c','<?php echo $comment_name;?>');" class="btn btn-basic btn-sm" title="답글">
+                                <button type="button" class="btn btn-basic" onclick="comment_box('<?php echo $comment_id ?>','c','<?php echo ($boset->isProfileRenderable()) ? $comment_name : '*'; ?>');" class="btn btn-basic btn-sm" title="답글">
                                     <i class="bi bi-chat-dots"></i>
                                     답글
                                 </button>
diff --git a/theme/damoang/skin/board/basic/list/list/list.skin.php b/theme/damoang/skin/board/basic/list/list/list.skin.php
index 9d411c865..2ca1648ba 100755
--- a/theme/damoang/skin/board/basic/list/list/list.skin.php
+++ b/theme/damoang/skin/board/basic/list/list/list.skin.php
@@ -158,7 +158,7 @@
                                     </span>
                                 <?php } ?>
 
-                                <?php if (($boset['check_list_hide_profile'] ?? null) !== '1' || ($is_admin === 'super' || $row['mb_id'] === ($member['mb_id'] ?? ''))) { ?>
+                                <?php if ($boset->isProfileRenderable() || $row['mb_id'] === ($member['mb_id'] ?? null)) { ?>
                                     <?php  /* 회원메모 출력 */
                                     if ($row['da_member_memo'] ?? '') { ?>
                                         <!-- 다모앙 회원 메모 -->
@@ -176,7 +176,7 @@
                             <div class="da-list-meta">
                                 <div class="d-flex gap-2">
                                     <?php /******** 글쓴이 프사+이름 ********/ ?>
-                                    <?php if (($boset['check_list_hide_profile'] ?? null) !== '1' || ($is_admin === 'super' || $row['mb_id'] === ($member['mb_id'] ?? ''))) { ?>
+                                    <?php if ($boset->isProfileRenderable() || $member->isAuthor($row['mb_id'])) { ?>
                                         <div class="wr-name ms-auto order-last order-md-1 text-truncate">
                                             <?php
                                                 $wr_name = ($row['mb_id']) ? str_replace('sv_member', 'sv_member text-truncate d-block', $row['name']) : str_replace('sv_guest', 'sv_guest text-truncate d-block', $row['name']);
diff --git a/theme/damoang/skin/board/basic/view/basic/view.skin.php b/theme/damoang/skin/board/basic/view/basic/view.skin.php
index e9e75bf94..9fef693db 100755
--- a/theme/damoang/skin/board/basic/view/basic/view.skin.php
+++ b/theme/damoang/skin/board/basic/view/basic/view.skin.php
@@ -51,13 +51,15 @@
         <div
             class="d-flex justify-content-end align-items-center line-top border-bottom bg-body-tertiary py-2 px-3 small">
             <div class="me-auto">
-                <span class="visually-hidden">작성자</span>
-                <span class="d-inline-block"><?= na_name_photo($view['mb_id'], $view['name']); ?></span>
-                <?php
-                // 회원 메모
-                echo $view['da_member_memo'] ?? '';
-                ?>
-                <span class="d-block"><?php echo $ip; ?></span>
+                <?php if ($boset->isProfileRenderable() || $member->isAuthor($view['mb_id'])) { ?>
+                    <span class="visually-hidden">작성자</span>
+                    <span class="d-inline-block"><?= na_name_photo($view['mb_id'], $view['name']); ?></span>
+                    <?php
+                    // 회원 메모
+                    echo $view['da_member_memo'] ?? '';
+                    ?>
+                    <span class="d-block"><?php echo $ip; ?></span>
+                <?php } ?>
             </div>
             <div>
                 <span class="visually-hidden">작성일</span>
@@ -529,32 +531,30 @@ class="btn good-border <?php echo ($bg_status == 'nogood') ? 'btn-primary' : 'bt
 
         <?php //echo na_widget('damoang-image-banner', 'board-head'); ?>
 
-        <?php if ($is_signature && $view['mb_id']) { // 서명 ?>
-            <?php
-              // 캐시에 문제가 있어서 일단 주석 구원자님 오시면 해결 후 다시 적용해야 함
-             //echo na_widget('mb-sign', "member-{$view['mb_id']}."-".$bo_table", 'cache=10');
-             ?>
-            <?php echo na_widget('mb-sign'); ?>
-        <?php } else { ?>
-            <div class="row row-cols-1 row-cols-md-2 align-items-center">
-                <div class="text-center mb-2 mb-sm-0">
-                    <img src="<?php echo na_member_photo($mbs['mb_id']) ?>" class="rounded-circle">
-                </div>
-                <div class="clearfix f-sm">
-                    <span class="float-start d-flex">
-                        <?php echo na_xp_icon($mbs['mb_id'], '', $mbs) ?>
-                        <?php echo $view['name'] ?>
-                    </span>
-                    <span class="float-end">
-                        Exp <?php echo number_format($mb['as_exp']) ?>
-                    </span>
-                </div>
-                <div class="progress" title="레벨업까지 <?php echo number_format($mbs['as_max'] - $mbs['as_exp']);?> 경험치 필요">
-                    <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="<?php echo $per ?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $per ?>%">
-                        <span class="sr-only"><?php echo $per ?>%</span>
+        <?php if ($boset->isProfileRenderable() || $member->isAuthor($view['mb_id'])) { ?>
+            <?php if ($is_signature && $view['mb_id']) { // 서명 ?>
+                <?php echo na_widget('mb-sign'); ?>
+            <?php } else { ?>
+                <div class="row row-cols-1 row-cols-md-2 align-items-center">
+                    <div class="text-center mb-2 mb-sm-0">
+                        <img src="<?php echo na_member_photo($mbs['mb_id']) ?>" class="rounded-circle">
+                    </div>
+                    <div class="clearfix f-sm">
+                        <span class="float-start d-flex">
+                            <?php echo na_xp_icon($mbs['mb_id'], '', $mbs) ?>
+                            <?php echo $view['name'] ?>
+                        </span>
+                        <span class="float-end">
+                            Exp <?php echo number_format($mb['as_exp']) ?>
+                        </span>
+                    </div>
+                    <div class="progress" title="레벨업까지 <?php echo number_format($mbs['as_max'] - $mbs['as_exp']); ?> 경험치 필요">
+                        <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="<?php echo $per ?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $per ?>%">
+                            <span class="sr-only"><?php echo $per ?>%</span>
+                        </div>
                     </div>
                 </div>
-            </div>
+            <?php } ?>
         <?php } ?>
 
         <?php if ($view['wr_8']) { ?>