From 53b5e8b5ff54b4ed34d3dc2ee519f8f3359792a3 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Mon, 13 Nov 2017 10:34:21 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A6=AC=EB=89=B4=EC=96=BC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/write.php                                        |  2 +-
 bbs/write_update.php                                 |  2 +-
 mobile/skin/board/basic/view.skin.php                |  4 ++--
 mobile/skin/latest/basic/latest.skin.php             | 10 +++++-----
 mobile/skin/latest/basic/style.css                   | 11 +++++++----
 skin/board/basic/view.skin.php                       |  4 ++--
 skin/board/gallery/view.skin.php                     |  4 ++--
 theme/basic/mobile/skin/latest/basic/latest.skin.php | 10 +++++-----
 theme/basic/mobile/skin/latest/basic/style.css       | 11 +++++++----
 theme/basic/skin/board/basic/view.skin.php           |  4 ++--
 theme/basic/skin/board/gallery/view.skin.php         |  4 ++--
 11 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/bbs/write.php b/bbs/write.php
index 7b7d1d4f2..a830033e5 100644
--- a/bbs/write.php
+++ b/bbs/write.php
@@ -386,7 +386,7 @@ else
 
 $captcha_html = '';
 $captcha_js   = '';
-$is_use_captcha = (!empty($board['bo_use_captcha']) || $is_guest) ? 1 : 0;
+$is_use_captcha = ((!empty($board['bo_use_captcha']) || $is_guest) && !$is_admin) ? 1 : 0;
 
 if ($is_use_captcha) {
     $captcha_html = captcha_html();
diff --git a/bbs/write_update.php b/bbs/write_update.php
index 7c6099168..9ea51822f 100644
--- a/bbs/write_update.php
+++ b/bbs/write_update.php
@@ -188,7 +188,7 @@ if ($w == '' || $w == 'u') {
     alert('w 값이 제대로 넘어오지 않았습니다.');
 }
 
-$is_use_captcha = (!empty($board['bo_use_captcha']) || $is_guest) ? 1 : 0;
+$is_use_captcha = ((!empty($board['bo_use_captcha']) || $is_guest) && !$is_admin) ? 1 : 0;
 
 if ($is_use_captcha && !chk_captcha()) {
     alert('자동등록방지 숫자가 틀렸습니다.');
diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php
index 144d71d1c..2d0eccf2e 100644
--- a/mobile/skin/board/basic/view.skin.php
+++ b/mobile/skin/board/basic/view.skin.php
@@ -118,8 +118,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     
     <?php
+    $cnt = 0;
     if ($view['file']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['file']); $i++) {
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view'])
                 $cnt++;
@@ -154,8 +154,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <?php } ?>
 
     <?php
+    $cnt = 0;
     if ($view['link']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['link']); $i++) {
             if (isset($view['link'][$i]['source']) && $view['link'][$i]['source'] && !$view['link'][$i]['view'])
                 $cnt++;
diff --git a/mobile/skin/latest/basic/latest.skin.php b/mobile/skin/latest/basic/latest.skin.php
index 79fef3100..a3e1c58ba 100644
--- a/mobile/skin/latest/basic/latest.skin.php
+++ b/mobile/skin/latest/basic/latest.skin.php
@@ -11,6 +11,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
     <?php for ($i=0; $i<count($list); $i++) { ?>
         <li>
             <?php
+            if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i> ";
             //echo $list[$i]['icon_reply']." ";
             echo "<a href=\"".$list[$i]['href']."\" class=\"lt_tit\">";
             if ($list[$i]['is_notice'])
@@ -21,11 +22,10 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
                 // if ($list[$i]['link']['count']) { echo "[{$list[$i]['link']['count']}]"; }
                 // if ($list[$i]['file']['count']) { echo "<{$list[$i]['file']['count']}>"; }
 
-                if (isset($list[$i]['icon_new']))    echo " " . $list[$i]['icon_new'];
-                if (isset($list[$i]['icon_hot']))    echo " " . $list[$i]['icon_hot'];
-                if (isset($list[$i]['icon_file']))   echo " " . $list[$i]['icon_file'];
-                if (isset($list[$i]['icon_link']))   echo " " . $list[$i]['icon_link'];
-                if (isset($list[$i]['icon_secret'])) echo " " . $list[$i]['icon_secret'];
+            if ($list[$i]['icon_new']) echo " <span class=\"new_icon\">NEW</span>";
+            if ($list[$i]['icon_file']) echo " <i class=\"fa fa-download\" aria-hidden=\"true\"></i>" ;
+            if ($list[$i]['icon_link']) echo " <i class=\"fa fa-link\" aria-hidden=\"true\"></i>" ;
+            if ($list[$i]['icon_hot']) echo " <i class=\"fa fa-heart\" aria-hidden=\"true\"></i>";
 
             echo "</a>";
 
diff --git a/mobile/skin/latest/basic/style.css b/mobile/skin/latest/basic/style.css
index 6cf2fa189..fa2a2ab8a 100644
--- a/mobile/skin/latest/basic/style.css
+++ b/mobile/skin/latest/basic/style.css
@@ -6,11 +6,14 @@
 .lt .lt_title {display:inline-block;background: #4162ff;color: #fff;border-radius: 13px;line-height: 24px;padding: 0 10px;border-bottom:1px solid #ccc;}
 .lt .lt_more {position:absolute;top:5px;right:10px}
 .lt .cnt_cmt {display:inline-block;margin:0 5px 0 3px;}
-.lt .lt_info{border-top: 1px solid #eee;margin: 10px 0 0;line-height: 28px;color: #666;position: relative;padding-top: 3px;}
-.lt .profile_img img{border-radius:50%}
+.lt .lt_info{border-top: 1px solid #eee;margin: 10px 0 0;line-height: 20px;color: #666;position: relative;padding-top: 10px;vertical-align:top}
+.lt .profile_img img{border-radius:50%;vertical-align:top}
 .lt .lt_tit{display: block;font-size: 1.083em;font-weight: bold;margin: 5px 0;}
-.lt .lt_tit i{font-size:12px;color:#8d96c2}
+.lt li .fa-download{width:16px;height:16px;line-height:16px;background:#ecaa30;color:#fff;text-align:center;font-size:10px;border-radius:2px}
+.lt li .fa-link{width:16px;height:16px;line-height:16px;background:#2aa974;color:#fff;text-align:center;font-size:10px;border-radius:2px}
+.lt li .fa-heart{color:#ff0000;}
+.lt li .new_icon{display:inline-block;padding: 0 3px;line-height:16px ;font-size:0.833em;color:#fff;background:#c56bed}
 .lt .lt_tit .fa-heart{color: #fe4560;}
-.lt .lt_date{position:absolute;top:3px;right:0;color:#666;font-style:italic}
+.lt .lt_date{position:absolute;top:10px;right:0;color:#666;font-style:italic}
 .lt .comment_icon{background:url(./img/icon_comment.png) no-repeat 50% 50% ;display:inline-block;width:20px;height:28px;text-indent:-999px;overflow:hidden;vertical-align:top;background-size:70%;margin:0 0px 0 5px}
 .lt .empty_li{text-align:center;padding:40px 0;color:#777}
diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php
index ec0a01af2..f9cfa7e48 100644
--- a/skin/board/basic/view.skin.php
+++ b/skin/board/basic/view.skin.php
@@ -99,8 +99,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php
+    $cnt = 0;
     if ($view['file']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['file']); $i++) {
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view'])
                 $cnt++;
@@ -137,8 +137,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php
+    $cnt = 0;
     if ($view['link']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['link']); $i++) {
             if (isset($view['link'][$i]['source']) && $view['link'][$i]['source'] && !$view['link'][$i]['view'])
                 $cnt++;
diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php
index ffa422573..c02a8c509 100644
--- a/skin/board/gallery/view.skin.php
+++ b/skin/board/gallery/view.skin.php
@@ -99,8 +99,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php
+    $cnt = 0;
     if ($view['file']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['file']); $i++) {
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view'])
                 $cnt++;
@@ -137,8 +137,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php
+    $cnt = 0;
     if ($view['link']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['link']); $i++) {
             if (isset($view['link'][$i]['source']) && $view['link'][$i]['source'] && !$view['link'][$i]['view'])
                 $cnt++;
diff --git a/theme/basic/mobile/skin/latest/basic/latest.skin.php b/theme/basic/mobile/skin/latest/basic/latest.skin.php
index 47f0574f2..c04ee5641 100644
--- a/theme/basic/mobile/skin/latest/basic/latest.skin.php
+++ b/theme/basic/mobile/skin/latest/basic/latest.skin.php
@@ -11,6 +11,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
     <?php for ($i=0; $i<count($list); $i++) { ?>
         <li>
             <?php
+            if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i> ";
             //echo $list[$i]['icon_reply']." ";
             echo "<a href=\"".$list[$i]['href']."\" class=\"lt_tit\">";
             if ($list[$i]['is_notice'])
@@ -21,11 +22,10 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
                 // if ($list[$i]['link']['count']) { echo "[{$list[$i]['link']['count']}]"; }
                 // if ($list[$i]['file']['count']) { echo "<{$list[$i]['file']['count']}>"; }
 
-                if (isset($list[$i]['icon_new']))    echo " " . $list[$i]['icon_new'];
-                if (isset($list[$i]['icon_hot']))    echo " " . $list[$i]['icon_hot'];
-                if (isset($list[$i]['icon_file']))   echo " " . $list[$i]['icon_file'];
-                if (isset($list[$i]['icon_link']))   echo " " . $list[$i]['icon_link'];
-                if (isset($list[$i]['icon_secret'])) echo " " . $list[$i]['icon_secret'];
+            if ($list[$i]['icon_new']) echo " <span class=\"new_icon\">NEW</span>";
+            if ($list[$i]['icon_file']) echo " <i class=\"fa fa-download\" aria-hidden=\"true\"></i>" ;
+            if ($list[$i]['icon_link']) echo " <i class=\"fa fa-link\" aria-hidden=\"true\"></i>" ;
+            if ($list[$i]['icon_hot']) echo " <i class=\"fa fa-heart\" aria-hidden=\"true\"></i>";
 
             echo "</a>";
 
diff --git a/theme/basic/mobile/skin/latest/basic/style.css b/theme/basic/mobile/skin/latest/basic/style.css
index 6cf2fa189..fa2a2ab8a 100644
--- a/theme/basic/mobile/skin/latest/basic/style.css
+++ b/theme/basic/mobile/skin/latest/basic/style.css
@@ -6,11 +6,14 @@
 .lt .lt_title {display:inline-block;background: #4162ff;color: #fff;border-radius: 13px;line-height: 24px;padding: 0 10px;border-bottom:1px solid #ccc;}
 .lt .lt_more {position:absolute;top:5px;right:10px}
 .lt .cnt_cmt {display:inline-block;margin:0 5px 0 3px;}
-.lt .lt_info{border-top: 1px solid #eee;margin: 10px 0 0;line-height: 28px;color: #666;position: relative;padding-top: 3px;}
-.lt .profile_img img{border-radius:50%}
+.lt .lt_info{border-top: 1px solid #eee;margin: 10px 0 0;line-height: 20px;color: #666;position: relative;padding-top: 10px;vertical-align:top}
+.lt .profile_img img{border-radius:50%;vertical-align:top}
 .lt .lt_tit{display: block;font-size: 1.083em;font-weight: bold;margin: 5px 0;}
-.lt .lt_tit i{font-size:12px;color:#8d96c2}
+.lt li .fa-download{width:16px;height:16px;line-height:16px;background:#ecaa30;color:#fff;text-align:center;font-size:10px;border-radius:2px}
+.lt li .fa-link{width:16px;height:16px;line-height:16px;background:#2aa974;color:#fff;text-align:center;font-size:10px;border-radius:2px}
+.lt li .fa-heart{color:#ff0000;}
+.lt li .new_icon{display:inline-block;padding: 0 3px;line-height:16px ;font-size:0.833em;color:#fff;background:#c56bed}
 .lt .lt_tit .fa-heart{color: #fe4560;}
-.lt .lt_date{position:absolute;top:3px;right:0;color:#666;font-style:italic}
+.lt .lt_date{position:absolute;top:10px;right:0;color:#666;font-style:italic}
 .lt .comment_icon{background:url(./img/icon_comment.png) no-repeat 50% 50% ;display:inline-block;width:20px;height:28px;text-indent:-999px;overflow:hidden;vertical-align:top;background-size:70%;margin:0 0px 0 5px}
 .lt .empty_li{text-align:center;padding:40px 0;color:#777}
diff --git a/theme/basic/skin/board/basic/view.skin.php b/theme/basic/skin/board/basic/view.skin.php
index e3f07f489..ad5a19c83 100644
--- a/theme/basic/skin/board/basic/view.skin.php
+++ b/theme/basic/skin/board/basic/view.skin.php
@@ -99,8 +99,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php
+    $cnt = 0;
     if ($view['file']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['file']); $i++) {
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view'])
                 $cnt++;
@@ -137,8 +137,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php
+    $cnt = 0;
     if ($view['link']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['link']); $i++) {
             if (isset($view['link'][$i]['source']) && $view['link'][$i]['source'] && !$view['link'][$i]['view'])
                 $cnt++;
diff --git a/theme/basic/skin/board/gallery/view.skin.php b/theme/basic/skin/board/gallery/view.skin.php
index 2a2235364..81be8e950 100644
--- a/theme/basic/skin/board/gallery/view.skin.php
+++ b/theme/basic/skin/board/gallery/view.skin.php
@@ -99,8 +99,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php
+    $cnt = 0;
     if ($view['file']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['file']); $i++) {
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view'])
                 $cnt++;
@@ -137,8 +137,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php
+    $cnt = 0;
     if ($view['link']['count']) {
-        $cnt = 0;
         for ($i=0; $i<count($view['link']); $i++) {
             if (isset($view['link'][$i]['source']) && $view['link'][$i]['source'] && !$view['link'][$i]['view'])
                 $cnt++;