From 0e2cb366e62958c7015c66c4c83b8d37f9a90b45 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Tue, 20 Oct 2020 19:06:08 +0900
Subject: [PATCH 1/7] =?UTF-8?q?5.4=20=EB=B2=84=EC=A0=84=20=EC=9D=B4?=
 =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20hook=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index d0fca65d1..ad1648eaa 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1606,15 +1606,19 @@ function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
         }
     }
 
+    $end_time = $is_debug ? get_microtime() : 0;
+
     if($result && $is_debug) {
         // 여기에 실행한 sql문을 화면에 표시하는 로직 넣기
         $g5_debug['sql'][] = array(
             'sql' => $sql,
             'start_time' => $start_time,
-            'end_time' => get_microtime(),
+            'end_time' => $end_time,
             );
     }
 
+    run_event('sql_query_after', $result, $sql, $start_time, $end_time);
+
     return $result;
 }
 

From d015f63301433dd291b0950fc39bb8eb2fc679f2 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Thu, 22 Oct 2020 14:59:30 +0900
Subject: [PATCH 2/7] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20REST=20API?=
 =?UTF-8?q?=ED=82=A4=20=EC=8B=A0=EC=B2=AD=20URL=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=86=8C=EC=85=9C=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80css=20=EC=A3=BC=EC=86=8C=EC=97=90=20?=
 =?UTF-8?q?querystring=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/config_form.php                                | 2 +-
 mobile/skin/social/social_login.skin.php           | 2 +-
 mobile/skin/social/social_outlogin.skin.1.php      | 2 +-
 mobile/skin/social/social_register.skin.php        | 2 +-
 mobile/skin/social/social_register_member.skin.php | 2 +-
 mobile/skin/social/social_u_register_form.skin.php | 2 +-
 skin/social/social_login.skin.php                  | 2 +-
 skin/social/social_outlogin.skin.1.php             | 2 +-
 skin/social/social_register.skin.php               | 2 +-
 skin/social/social_register_member.skin.php        | 2 +-
 skin/social/social_u_register_form.skin.php        | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/adm/config_form.php b/adm/config_form.php
index 016355d11..4a8bdd8e9 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -1183,7 +1183,7 @@ include_once('_rewrite_config_form.php');
         <tr>
             <th scope="row"><label for="cf_kakao_rest_key">카카오 REST API 키</label></th>
             <td>
-                <input type="text" name="cf_kakao_rest_key" value="<?php echo $config['cf_kakao_rest_key'] ?>" id="cf_kakao_rest_key" class="frm_input" size="40"> <a href="https://developers.kakao.com/apps/new" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_kakao_rest_key" value="<?php echo $config['cf_kakao_rest_key'] ?>" id="cf_kakao_rest_key" class="frm_input" size="40"> <a href="https://developers.kakao.com/product/kakaoLogin" target="_blank" class="btn_frmline">앱 등록하기</a>
             </td>
             <th scope="row"><label for="cf_kakao_client_secret">카카오 Client Secret</label></th>
             <td>
diff --git a/mobile/skin/social/social_login.skin.php b/mobile/skin/social/social_login.skin.php
index e7af20ad9..0e2871875 100644
--- a/mobile/skin/social/social_login.skin.php
+++ b/mobile/skin/social/social_login.skin.php
@@ -14,7 +14,7 @@ if( G5_SOCIAL_USE_POPUP ) {
     $self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
 }
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <div class="login-sns sns-wrap-32 sns-wrap-over" id="sns_login">
diff --git a/mobile/skin/social/social_outlogin.skin.1.php b/mobile/skin/social/social_outlogin.skin.1.php
index d5e53f562..039fee2a0 100644
--- a/mobile/skin/social/social_outlogin.skin.1.php
+++ b/mobile/skin/social/social_outlogin.skin.1.php
@@ -14,7 +14,7 @@ if( G5_SOCIAL_USE_POPUP ) {
     $self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
 }
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <div class="login-sns sns-wrap-32 sns-wrap-over" id="sns_outlogin">
diff --git a/mobile/skin/social/social_register.skin.php b/mobile/skin/social/social_register.skin.php
index c07a92c15..5d8048038 100644
--- a/mobile/skin/social/social_register.skin.php
+++ b/mobile/skin/social/social_register.skin.php
@@ -15,7 +15,7 @@ if( G5_SOCIAL_USE_POPUP ) {
 }
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 <div>
     <div class="login-sns sns-wrap-32 sns-wrap-over" id="sns_register">
diff --git a/mobile/skin/social/social_register_member.skin.php b/mobile/skin/social/social_register_member.skin.php
index e0a150434..e8e88948b 100644
--- a/mobile/skin/social/social_register_member.skin.php
+++ b/mobile/skin/social/social_register_member.skin.php
@@ -8,7 +8,7 @@ if( ! $config['cf_social_login_use']) {     //소셜 로그인을 사용하지 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/remodal/remodal.css">', 11);
 add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/remodal/remodal-default-theme.css">', 12);
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 13);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 13);
 add_javascript('<script src="'.G5_JS_URL.'/remodal/remodal.js"></script>', 10);
 
 $email_msg = $is_exists_email ? '등록할 이메일이 중복되었습니다.다른 이메일을 입력해 주세요.' : '';
diff --git a/mobile/skin/social/social_u_register_form.skin.php b/mobile/skin/social/social_u_register_form.skin.php
index ddf329627..3bd5ac0fe 100644
--- a/mobile/skin/social/social_u_register_form.skin.php
+++ b/mobile/skin/social/social_u_register_form.skin.php
@@ -9,7 +9,7 @@ $socials = social_get_provider_service_name('', 'all');
 
 $session_id = session_id();
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <li>
diff --git a/skin/social/social_login.skin.php b/skin/social/social_login.skin.php
index e81d1393a..f93fd403f 100644
--- a/skin/social/social_login.skin.php
+++ b/skin/social/social_login.skin.php
@@ -14,7 +14,7 @@ if( G5_SOCIAL_USE_POPUP ) {
     $self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
 }
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <div id="sns_login" class="login-sns sns-wrap-32 sns-wrap-over">
diff --git a/skin/social/social_outlogin.skin.1.php b/skin/social/social_outlogin.skin.1.php
index 228cd80d3..a6a55a2d2 100644
--- a/skin/social/social_outlogin.skin.1.php
+++ b/skin/social/social_outlogin.skin.1.php
@@ -14,7 +14,7 @@ if( G5_SOCIAL_USE_POPUP ) {
     $self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
 }
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <div class="login-sns sns-wrap-32 sns-wrap-over" id="sns_outlogin">
diff --git a/skin/social/social_register.skin.php b/skin/social/social_register.skin.php
index 0a26c6e88..f2beab376 100644
--- a/skin/social/social_register.skin.php
+++ b/skin/social/social_register.skin.php
@@ -15,7 +15,7 @@ if( G5_SOCIAL_USE_POPUP ) {
 }
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 <div>
 
diff --git a/skin/social/social_register_member.skin.php b/skin/social/social_register_member.skin.php
index 13fd8ee27..8885783ed 100644
--- a/skin/social/social_register_member.skin.php
+++ b/skin/social/social_register_member.skin.php
@@ -8,7 +8,7 @@ if( ! $config['cf_social_login_use']) {     //소셜 로그인을 사용하지 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/remodal/remodal.css">', 11);
 add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/remodal/remodal-default-theme.css">', 12);
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 13);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 13);
 add_javascript('<script src="'.G5_JS_URL.'/remodal/remodal.js"></script>', 10);
 
 $email_msg = $is_exists_email ? '등록할 이메일이 중복되었습니다.다른 이메일을 입력해 주세요.' : '';
diff --git a/skin/social/social_u_register_form.skin.php b/skin/social/social_u_register_form.skin.php
index 2c036b1c9..e361c3aba 100644
--- a/skin/social/social_u_register_form.skin.php
+++ b/skin/social/social_u_register_form.skin.php
@@ -9,7 +9,7 @@ $socials = social_get_provider_service_name('', 'all');
 
 $session_id = session_id();
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <li>

From f1f639070d3dc6ba24d29497bd1fd5b888acdcd3 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Mon, 26 Oct 2020 13:52:06 +0900
Subject: [PATCH 3/7] =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EB=B3=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EC=A0=9C=EB=8C=80=EB=A1=9C=20=EC=B6=9C=EB=A0=A5=20=EC=95=88?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=9E=AC=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/skin/board/basic/view.skin.php               | 2 +-
 mobile/skin/board/gallery/view.skin.php             | 2 +-
 skin/board/basic/view.skin.php                      | 2 +-
 skin/board/gallery/view.skin.php                    | 2 +-
 theme/basic/mobile/skin/board/basic/view.skin.php   | 2 +-
 theme/basic/mobile/skin/board/gallery/view.skin.php | 2 +-
 theme/basic/skin/board/basic/view.skin.php          | 2 +-
 theme/basic/skin/board/gallery/view.skin.php        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php
index 3cd9811ba..1810b6f39 100644
--- a/mobile/skin/board/basic/view.skin.php
+++ b/mobile/skin/board/basic/view.skin.php
@@ -159,7 +159,7 @@ jQuery(function($){
     </section>
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>
diff --git a/mobile/skin/board/gallery/view.skin.php b/mobile/skin/board/gallery/view.skin.php
index edaba07a1..e003a7faf 100644
--- a/mobile/skin/board/gallery/view.skin.php
+++ b/mobile/skin/board/gallery/view.skin.php
@@ -161,7 +161,7 @@ jQuery(function($){
     </section>
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>
diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php
index 3b67931d0..56cf28a20 100644
--- a/skin/board/basic/view.skin.php
+++ b/skin/board/basic/view.skin.php
@@ -176,7 +176,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <!-- } 첨부파일 끝 -->
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>
diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php
index 358c6d844..c5af84d3f 100644
--- a/skin/board/gallery/view.skin.php
+++ b/skin/board/gallery/view.skin.php
@@ -176,7 +176,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <!-- } 첨부파일 끝 -->
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>
diff --git a/theme/basic/mobile/skin/board/basic/view.skin.php b/theme/basic/mobile/skin/board/basic/view.skin.php
index 3cd9811ba..1810b6f39 100644
--- a/theme/basic/mobile/skin/board/basic/view.skin.php
+++ b/theme/basic/mobile/skin/board/basic/view.skin.php
@@ -159,7 +159,7 @@ jQuery(function($){
     </section>
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>
diff --git a/theme/basic/mobile/skin/board/gallery/view.skin.php b/theme/basic/mobile/skin/board/gallery/view.skin.php
index edaba07a1..e003a7faf 100644
--- a/theme/basic/mobile/skin/board/gallery/view.skin.php
+++ b/theme/basic/mobile/skin/board/gallery/view.skin.php
@@ -161,7 +161,7 @@ jQuery(function($){
     </section>
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>
diff --git a/theme/basic/skin/board/basic/view.skin.php b/theme/basic/skin/board/basic/view.skin.php
index 3b67931d0..56cf28a20 100644
--- a/theme/basic/skin/board/basic/view.skin.php
+++ b/theme/basic/skin/board/basic/view.skin.php
@@ -176,7 +176,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <!-- } 첨부파일 끝 -->
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>
diff --git a/theme/basic/skin/board/gallery/view.skin.php b/theme/basic/skin/board/gallery/view.skin.php
index 358c6d844..c5af84d3f 100644
--- a/theme/basic/skin/board/gallery/view.skin.php
+++ b/theme/basic/skin/board/gallery/view.skin.php
@@ -176,7 +176,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <!-- } 첨부파일 끝 -->
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>

From 2e3f53ed8a2f8ccd3adc1cea8b856d524676550a Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Tue, 27 Oct 2020 16:34:39 +0900
Subject: [PATCH 4/7] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=ED=83=AD=20=EA=B0=84=EA=B2=A9=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common.php      | 42 +++++++++++------------
 lib/uri.lib.php | 90 ++++++++++++++++++++++++-------------------------
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/common.php b/common.php
index 8100e85ca..fc22fb036 100644
--- a/common.php
+++ b/common.php
@@ -225,36 +225,36 @@ $config = get_config(true);
 
 // 본인인증 또는 쇼핑몰 사용시에만 secure; SameSite=None 로 설정합니다.
 if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER) ) {
-	// Chrome 80 버전부터 아래 이슈 대응
-	// https://developers-kr.googleblog.com/2020/01/developers-get-ready-for-new.html?fbclid=IwAR0wnJFGd6Fg9_WIbQPK3_FxSSpFLqDCr9bjicXdzy--CCLJhJgC9pJe5ss
-	if(!function_exists('session_start_samesite')) {
-		function session_start_samesite($options = array())
-		{
+    // Chrome 80 버전부터 아래 이슈 대응
+    // https://developers-kr.googleblog.com/2020/01/developers-get-ready-for-new.html?fbclid=IwAR0wnJFGd6Fg9_WIbQPK3_FxSSpFLqDCr9bjicXdzy--CCLJhJgC9pJe5ss
+    if(!function_exists('session_start_samesite')) {
+        function session_start_samesite($options = array())
+        {
             global $g5;
-    
-			$res = @session_start($options);
-			
+
+            $res = @session_start($options);
+
             // IE 브라우저 또는 엣지브라우저 또는 IOS 모바일과 http환경에서는 secure; SameSite=None을 설정하지 않습니다.
             if( preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']) || preg_match('/(iPhone|iPod|iPad).*AppleWebKit.*Safari/i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~Trident/7.0(; Touch)?; rv:11.0~',$_SERVER['HTTP_USER_AGENT']) || ! (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ){
                 return $res;
             }
 
-			$headers = headers_list();
-			krsort($headers);
-			foreach ($headers as $header) {
-				if (!preg_match('~^Set-Cookie: PHPSESSID=~', $header)) continue;
-				$header = preg_replace('~; secure(; HttpOnly)?$~', '', $header) . '; secure; SameSite=None';
-				header($header, false);
+            $headers = headers_list();
+            krsort($headers);
+            foreach ($headers as $header) {
+                if (!preg_match('~^Set-Cookie: PHPSESSID=~', $header)) continue;
+                $header = preg_replace('~; secure(; HttpOnly)?$~', '', $header) . '; secure; SameSite=None';
+                header($header, false);
                 $g5['session_cookie_samesite'] = 'none';
-				break;
-			}
-			return $res;
-		}
-	}
+                break;
+            }
+            return $res;
+        }
+    }
 
-	session_start_samesite();
+    session_start_samesite();
 } else {
-	@session_start();
+    @session_start();
 }
 //==============================================================================
 
diff --git a/lib/uri.lib.php b/lib/uri.lib.php
index 6221fc865..ed889d711 100644
--- a/lib/uri.lib.php
+++ b/lib/uri.lib.php
@@ -16,13 +16,13 @@ function get_pretty_url($folder, $no='', $query_string='', $action='')
         return $url;
     }
 
-	// use shortten url
-	if($config['cf_bbs_rewrite']) {
-        
+    // use shortten url
+    if($config['cf_bbs_rewrite']) {
+
         $segments[0] = G5_URL;
 
         if( $folder === 'content' && $no ){     // 내용관리
-            
+
             $segments[1] = $folder;
 
             if( $config['cf_bbs_rewrite'] > 1 ){
@@ -36,32 +36,32 @@ function get_pretty_url($folder, $no='', $query_string='', $action='')
 
         } else if(in_array($folder, $boards)) {     // 게시판
 
-			$segments[1] = $folder;
+            $segments[1] = $folder;
 
-			if($no) {
+            if($no) {
 
                 if( $config['cf_bbs_rewrite'] > 1 ){
 
-                    $get_write = get_write( $g5['write_prefix'].$folder, $no , true);
-                    
-                    $segments[2] = $get_write['wr_seo_title'] ? urlencode($get_write['wr_seo_title']).'/' : urlencode($no);
+                $get_write = get_write( $g5['write_prefix'].$folder, $no , true);
+
+                $segments[2] = $get_write['wr_seo_title'] ? urlencode($get_write['wr_seo_title']).'/' : urlencode($no);
 
                 } else {
                     $segments[2] = urlencode($no);
                 }
 
-			} else if($action) {
+            } else if($action) {
                 $segments[2] = urlencode($action);
             }
 
-		} else {
+        } else {
             $segments[1] = $folder;
-			if($no) {
-				$no_array = explode("=", $no);
-				$no_value = end($no_array);
+            if($no) {
+                $no_array = explode("=", $no);
+                $no_value = end($no_array);
                 $segments[2] = urlencode($no_value);
-			}
-		}
+            }
+        }
 
         if($query_string) {
             // If the first character of the query string is '&', replace it with '?'.
@@ -72,33 +72,33 @@ function get_pretty_url($folder, $no='', $query_string='', $action='')
             }
         }
 
-	} else { // don't use shortten url
-		if(in_array($folder, $boards)) {
-			$url = G5_BBS_URL. '/board.php?bo_table='. $folder;
-			if($no) {
-				$url .= '&amp;wr_id='. $no;
-			}
-			if($query_string) {
+    } else { // don't use shortten url
+        if(in_array($folder, $boards)) {
+            $url = G5_BBS_URL. '/board.php?bo_table='. $folder;
+            if($no) {
+                $url .= '&amp;wr_id='. $no;
+            }
+            if($query_string) {
                 if(substr($query_string, 0, 1) !== '&') {
                     $url .= '&amp;';
                 }
 
-				$url .= $query_string;
-			}
-		} else {
-			$url = G5_BBS_URL. '/'.$folder.'.php';
+                $url .= $query_string;
+            }
+        } else {
+            $url = G5_BBS_URL. '/'.$folder.'.php';
             if($no) {
-				$url .= ($folder === 'content') ? '?co_id='. $no : '?'. $no;
-			}
+                $url .= ($folder === 'content') ? '?co_id='. $no : '?'. $no;
+            }
             if($query_string) {
                 $url .= ($no ? '?' : '&amp;'). $query_string;
-			}
-		}
+            }
+        }
 
         $segments[0] = $url;
-	}
+    }
 
-	return implode('/', $segments).$add_query;
+    return implode('/', $segments).$add_query;
 }
 
 function short_url_clean($string_url, $add_qry=''){
@@ -110,7 +110,7 @@ function short_url_clean($string_url, $add_qry=''){
         $string_url = str_replace('&amp;', '&', $string_url);
         $url=parse_url($string_url);
         $page_name = basename($url['path'],".php");
-        
+
         $array_page_names = run_replace('url_clean_page_names', array('board', 'write', 'content'));
 
         if( stripos(preg_replace('/^https?:/i', '', $string_url), preg_replace('/^https?:/i', '', G5_BBS_URL)) === false || ! in_array($page_name, $array_page_names) ){   //게시판이 아니면 리턴
@@ -119,19 +119,19 @@ function short_url_clean($string_url, $add_qry=''){
 
         $return_url = '';
         parse_str($url['query'], $vars);
-		
-		/*
+
+        /*
         // 예) Array ( [scheme] => http [host] => sir.kr [path] => /bbs/board.php [query] => wr_id=1110870&bo_table=cm_free&cpage=1 [fragment] => c_1110946 )
-		foreach($vars as $k => $v) { $page_name .= "/".$v; }
-		*/
-        
+        foreach($vars as $k => $v) { $page_name .= "/".$v; }
+        */
+
         if( $page_name === 'write' ){
             $vars['action'] = 'write';
             $allow_param_keys = array('bo_table'=>'', 'action'=>'');
         } else if( $page_name === 'content' ){
-			$vars['action'] = 'content';
-			$allow_param_keys = array('action'=>'', 'co_id'=>'');
-		} else {
+            $vars['action'] = 'content';
+            $allow_param_keys = array('action'=>'', 'co_id'=>'');
+        } else {
             $allow_param_keys = array('bo_table'=>'', 'wr_id'=>'');
         }
 
@@ -145,7 +145,7 @@ function short_url_clean($string_url, $add_qry=''){
 
         if( $config['cf_bbs_rewrite'] > 1 && $page_name === 'board' && (isset($s['wr_id']) && $s['wr_id']) && (isset($s['bo_table']) && $s['bo_table']) ){
             $get_write = get_write( get_write_table_name($s['bo_table']), $s['wr_id'], true);
-            
+
             if( $get_write['wr_seo_title'] ){
                 unset($s['wr_id']);
                 $s['wr_seo_title'] = urlencode($get_write['wr_seo_title']).'/';
@@ -175,8 +175,8 @@ function short_url_clean($string_url, $add_qry=''){
         if( $add_qry ){
             $add_param .= $add_param ? '&amp;'.$add_qry : '?'.$add_qry;
         }
-		
-		foreach($s as $k => $v) { $return_url .= '/'.$v; }
+
+        foreach($s as $k => $v) { $return_url .= '/'.$v; }
 
         return $host.$return_url.$add_param.$fragment;
     }

From dff5c711e1c3ff92daa823c229aa713f5437588f Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 28 Oct 2020 12:03:32 +0900
Subject: [PATCH 5/7] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.4.3=20=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.php b/config.php
index 1c54cdc90..a6aea249c 100644
--- a/config.php
+++ b/config.php
@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.2.9');
+define('G5_GNUBOARD_VER', '5.4.3');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);

From 9093603494ae02a63b37aaed304154c677063e65 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 28 Oct 2020 15:01:40 +0900
Subject: [PATCH 6/7] =?UTF-8?q?common.js=20=EC=9E=90=EB=B0=94=EC=8A=A4?=
 =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=ED=95=A8=EC=88=98=20get=5Fcookie?=
 =?UTF-8?q?,=20font=5Fresize=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/common.js | 38 ++++++++------------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/js/common.js b/js/common.js
index 071245a70..f5e61e91e 100644
--- a/js/common.js
+++ b/js/common.js
@@ -165,33 +165,9 @@ function set_cookie(name, value, expirehours, domain)
 // 쿠키 얻음
 function get_cookie(name)
 {
-    var find_sw = false;
-    var start, end;
-    var i = 0;
-
-    for (i=0; i<= document.cookie.length; i++)
-    {
-        start = i;
-        end = start + name.length;
-
-        if(document.cookie.substring(start, end) == name)
-        {
-            find_sw = true
-            break
-        }
-    }
-
-    if (find_sw == true)
-    {
-        start = end + 1;
-        end = document.cookie.indexOf(";", start);
-
-        if(end < start)
-            end = document.cookie.length;
-
-        return unescape(document.cookie.substring(start, end));
-    }
-    return "";
+	var match = document.cookie.match(new RegExp('(^| )' + name + '=([^;]+)'));
+	if (match) return unescape(match[2]);
+	return "";
 }
 
 // 쿠키 지움
@@ -559,10 +535,12 @@ function font_resize(id, rmv_class, add_class, othis)
 {
     var $el = $("#"+id);
 
-    $el.removeClass(rmv_class).addClass(add_class);
+	if((typeof rmv_class !== "undefined" && rmv_class) || (typeof add_class !== "undefined" && add_class)){
+		$el.removeClass(rmv_class).addClass(add_class);
 
-    set_cookie("ck_font_resize_rmv_class", rmv_class, 1, g5_cookie_domain);
-    set_cookie("ck_font_resize_add_class", add_class, 1, g5_cookie_domain);
+		set_cookie("ck_font_resize_rmv_class", rmv_class, 1, g5_cookie_domain);
+		set_cookie("ck_font_resize_add_class", add_class, 1, g5_cookie_domain);
+	}
 
     if(typeof othis !== "undefined"){
         $(othis).addClass('select').siblings().removeClass('select');

From c5ca99cd201fd8dc3fcd2a91a3ce4e47f0ede715 Mon Sep 17 00:00:00 2001
From: seeoya <seeoya@naver.com>
Date: Thu, 29 Oct 2020 10:19:52 +0900
Subject: [PATCH 7/7] =?UTF-8?q?CSS=20:=20#93=20=EC=A4=91=EB=B3=B5/?=
 =?UTF-8?q?=EB=AF=B8=EC=82=AC=EC=9A=A9=20=EC=BD=94=EB=93=9C=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/sms_admin/css/sms5.css          | 2 +-
 css/default.css                     | 2 +-
 mobile/skin/board/basic/style.css   | 8 ++++----
 mobile/skin/board/gallery/style.css | 6 +++---
 mobile/skin/latest/basic/style.css  | 2 +-
 skin/board/gallery/style.css        | 6 +++---
 skin/latest/pic_block/style.css     | 2 +-
 skin/latest/pic_list/style.css      | 4 ++--
 theme/basic/css/default.css         | 2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/adm/sms_admin/css/sms5.css b/adm/sms_admin/css/sms5.css
index 03187e7ea..31a4096f9 100644
--- a/adm/sms_admin/css/sms5.css
+++ b/adm/sms_admin/css/sms5.css
@@ -126,7 +126,7 @@
 
 /* 휴대폰번호 파일 */
 #sms5_fileup_frm {margin:0 0 10px;padding:0 0;border-bottom:1px solid #e9e9e9}
-#sms5_fileup_frm div {padding:5px 0;;border-bottom:1px solid #f4f4f4}
+#sms5_fileup_frm div {padding:5px 0;border-bottom:1px solid #f4f4f4}
 #sms5_fileup_frm div.sch_last {margin:0;border:0}
 #sms5_fileup_frm strong {display:inline-block;width:80px}
 #sms5_fileup_frm strong.sch_long {width:160px}
diff --git a/css/default.css b/css/default.css
index 98f21daaa..d70724799 100644
--- a/css/default.css
+++ b/css/default.css
@@ -80,7 +80,7 @@ border:1px solid #558ab7 !important;
 
 #logo {float:left;padding:30px 0 0}
 
-.hd_sch_wr {float:left;padding:30px 0;;width:445px;margin-left:65px}
+.hd_sch_wr {float:left;padding:30px 0;width:445px;margin-left:65px}
 #hd_sch h3 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #hd_sch {border-radius:30px;overflow:hidden}
 #hd_sch #sch_stx {float:left;width:385px;height:45px;padding-left:10px;border-radius:30px 0 0 30px;background:#2c2c2c;border:0;border-right:0;font-size:1.25em;color:#fff}
diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css
index 17b5be269..6d548bfe0 100644
--- a/mobile/skin/board/basic/style.css
+++ b/mobile/skin/board/basic/style.css
@@ -44,7 +44,7 @@
 #bo_list .bo_subject .fa-link {width:16px;line-height:16px;background:#edd3fd;color:#b451fd;text-align:center;font-size:10px;border-radius:2px;vertical-align:baseline}
 #bo_list .bo_subject .fa-heart {color:#ff0000;text-align:center;font-size:10px;border-radius:2px}
 #bo_list .bo_subject .new_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#23db79;background:#b9ffda;text-align:center;border-radius:2px;margin:0 4px;font-weight:bold;vertical-align:middle}
-#bo_list .bo_subject .fa-lock {display:inline-block;line-height:16px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:baseline}
+#bo_list .bo_subject .fa-lock {display:inline-block;line-height:16px;width:16px;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:baseline}
 
 
 #bo_cate h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
@@ -77,7 +77,7 @@
 .bo_fx {margin-bottom:5px;padding:0 10px}
 .bo_fx:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_fx ul {margin:0;padding:0;list-style:none}
-#bo_list_total {margin:10px;text-align:center;padding:10px;text-align:center;background:#e3e7ec;color:#8b8b8b;border-radius:3px}
+#bo_list_total {margin:10px;padding:10px;text-align:center;background:#e3e7ec;color:#8b8b8b;border-radius:3px}
 
 .btn_bo_user > li {float:left;text-align:center;margin-left:5px}
 .btn_bo_adm button {border:0;padding:0 10px;background:#d13f4a;color:#fff;text-decoration:none;vertical-align:middle}
@@ -142,7 +142,7 @@
 #bo_sch:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
 #bo_sch select {border:0;height:38px;border-right:1px solid #f8f8f8;float:left;width:30%}
-#bo_sch .sch_input {height:38px;border:0;padding:0;background-color:transparent;float:left;width:70%;padding:0 40px 0 10px}
+#bo_sch .sch_input {height:38px;border:0;background-color:transparent;float:left;width:70%;padding:0 40px 0 10px}
 #bo_sch .sch_btn {height:38px;position:absolute;top:0;right:0;border:0;width:40px;background:none;font-size:15px}
 
 .view_is_list.btn_top {position:relative;z-index:auto;top:0;left:0}
@@ -165,7 +165,7 @@
 #bo_v_table {padding:10px;color:#999;font-size:0.9em;font-weight:bold}
 
 #bo_v_title {}
-.bo_v_cate {display:inline-block;background:#e2eaf6;color:#3a8afd;border-radius:13px;line-height:20px;border-radius:5px;padding:0 5px;font-weight:bold}
+.bo_v_cate {display:inline-block;background:#e2eaf6;color:#3a8afd;line-height:20px;border-radius:5px;padding:0 5px;font-weight:bold}
 .bo_v_tit {display:block;font-size:1.5em;margin:10px 0 0}
 
 #bo_v_info {padding:15px 0;color:#8e8e8e;line-height:20px}
diff --git a/mobile/skin/board/gallery/style.css b/mobile/skin/board/gallery/style.css
index a1a7762b2..e30d5014b 100644
--- a/mobile/skin/board/gallery/style.css
+++ b/mobile/skin/board/gallery/style.css
@@ -66,7 +66,7 @@
 .bo_fx {margin-bottom:5px;padding:0 10px}
 .bo_fx:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_fx ul {margin:0;padding:0;list-style:none}
-#bo_list_total {margin:10px;text-align:center;padding:10px;text-align:center;background:#e3e7ec;color:#8b8b8b;border-radius:3px}
+#bo_list_total {margin:10px;text-align:center;padding:10px;background:#e3e7ec;color:#8b8b8b;border-radius:3px}
 
 .btn_bo_user > li {float:left;text-align:center;margin-left:5px}
 .btn_bo_adm button {border:0;padding:0 10px;background:#d13f4a;color:#fff;text-decoration:none;vertical-align:middle}
@@ -108,7 +108,7 @@
 #bo_sch:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
 #bo_sch select {border:0;height:38px;border-right:1px solid #f8f8f8;float:left;width:30%}
-#bo_sch .sch_input {height:38px;border:0;padding:0;background-color:transparent;float:left;width:70%;padding:0 40px 0 10px}
+#bo_sch .sch_input {height:38px;border:0;background-color:transparent;float:left;width:70%;padding:0 40px 0 10px}
 #bo_sch .sch_btn {height:38px;position:absolute;top:0;right:0;border:0;width:40px;background:none;font-size:15px}
 
 .view_is_list.btn_top {position:relative;z-index:auto;top:0;left:0}
@@ -197,7 +197,7 @@
 #bo_v_table {padding:10px;color:#999;font-size:0.9em;font-weight:bold}
 
 #bo_v_title {}
-.bo_v_cate {display:inline-block;background:#e2eaf6;color:#3a8afd;border-radius:13px;line-height:20px;border-radius:5px;padding:0 5px;font-weight:bold}
+.bo_v_cate {display:inline-block;background:#e2eaf6;color:#3a8afd;line-height:20px;border-radius:5px;padding:0 5px;font-weight:bold}
 .bo_v_tit {display:block;font-size:1.5em;margin:10px 0 0}
 
 #bo_v_info {padding:15px 0;color:#8e8e8e;line-height:20px}
diff --git a/mobile/skin/latest/basic/style.css b/mobile/skin/latest/basic/style.css
index b5730bdb2..bc5efbeb0 100644
--- a/mobile/skin/latest/basic/style.css
+++ b/mobile/skin/latest/basic/style.css
@@ -19,7 +19,7 @@
 .lt .lt_cmt {background:#e9eff5;color:#3a8afd;font-size:11px;height:16px;line-height:16px;padding:0 5px;border-radius:3px;vertical-align:middle}
 
 .lt .profile_img img {border-radius:50%;vertical-align:top}
-.lt li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
+.lt li .fa-lock {display:inline-block;line-height:14px;width:16px;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
 .lt li .fa-download {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#daae37;background:#ffefb9;text-align:center;border-radius:2px;vertical-align:middle}
 .lt li .fa-link {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#b451fd;background:#edd3fd;text-align:center;border-radius:2px;vertical-align:middle}
 .lt li .hot_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#ff0000;background:#ffb9b9;text-align:center;border-radius:2px;vertical-align:middle}
diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css
index e41dc44d1..4c1830e12 100644
--- a/skin/board/gallery/style.css
+++ b/skin/board/gallery/style.css
@@ -139,7 +139,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall .profile_img img {border-radius:50%}
 #bo_gall .bo_tit .fa-download {width:16px;height:16px;line-height:16px;background:#e89f31;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle}
 #bo_gall .bo_tit .fa-link {width:16px;height:16px;line-height:16px;background:#ad68d8;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle;font-weight:normal}
-#bo_gall .bo_tit .fa-link {width:16px;height:16px;line-height:16px;background:#ad68d8;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle;margin-right:2px}
+#bo_gall .bo_tit .fa-link {width:16px;height:16px;line-height:16px;background:#ad68d8;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle;}
 #bo_gall .bo_tit .new_icon {display:inline-block;width:16px;line-height:16px;font-size:0.825em;color:#23db79;background:#b9ffda;text-align:center;border-radius:2px;margin-left:2px;font-weight:bold;vertical-align:baseline}
 #bo_gall .bo_tit .hot_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#fff;background:#e52955;text-align:center;border-radius:2px;vertical-align:middle;margin-right:2px}
 #bo_gall .bo_tit .fa-lock {display:inline-block;line-height:16px;color:#999;text-align:center;vertical-align:middle}
@@ -194,12 +194,12 @@ box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2)}
 #bo_gall li.empty_list {padding:85px 0;text-align:center}
 
 .bo_sch_wrap {display:none;width:100%;height:100%;position:fixed;top:0;left:0;z-index:999}
-.bo_sch {position:absolute;top:50%;left:50%;background:#fff;text-align:left;width:330px;max-height:300px;margin-left:-125px;margin-top:-180px;overflow-y:auto;border-radius:5px;-webkit-box-shadow:1px 1px 18px rgba(0,0,0,0.2);-moz-box-shadow:1px 1px 18px rgba(0,0,0,0.2);box-shadow:1px 1px 18px rgba(0,0,0,0.2);border:1px solid #dde7e9;background:#fff;border-radius:3px}
+.bo_sch {position:absolute;top:50%;left:50%;background:#fff;text-align:left;width:330px;max-height:300px;margin-left:-125px;margin-top:-180px;overflow-y:auto;-webkit-box-shadow:1px 1px 18px rgba(0,0,0,0.2);-moz-box-shadow:1px 1px 18px rgba(0,0,0,0.2);box-shadow:1px 1px 18px rgba(0,0,0,0.2);border:1px solid #dde7e9;background:#fff;border-radius:3px;}
 .bo_sch:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_sch h3 {padding:15px;border-bottom:1px solid #e8e8e8}
 .bo_sch legend {background:red}
 .bo_sch form {padding:15px;display:block}
-.bo_sch select {border:0;width:100%;height:40px;border:1px solid #d0d3db;border-radius:2px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, .075);
+.bo_sch select {width:100%;height:40px;border:1px solid #d0d3db;border-radius:2px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, .075);
 -moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, .075);
 box-shadow:inset 0 1px 1px rgba(0, 0, 0, .075)}
 .bo_sch .sch_bar {display:inline-block;width:100%;clear:both;margin-top:15px;border:1px solid #d0d3db;border-radius:2px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, .075);
diff --git a/skin/latest/pic_block/style.css b/skin/latest/pic_block/style.css
index b76196799..dc059ad04 100644
--- a/skin/latest/pic_block/style.css
+++ b/skin/latest/pic_block/style.css
@@ -15,7 +15,7 @@
 .pic_lt li .lt_img img, .pic_lt li .lt_img video {width:100%;height:auto}
 .pic_lt li a:hover {color:#a22121}
 .pic_lt li .fa-heart {color:#ff0000}
-.pic_lt li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
+.pic_lt li .fa-lock {display:inline-block;line-height:14px;width:16px;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
 .pic_lt li .new_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#23db79;background:#b9ffda;text-align:center;border-radius:2px;margin-left:2px;font-weight:bold;vertical-align:middle}
 .pic_lt li .hot_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#ff0000;background:#ffb9b9;text-align:center;border-radius:2px;vertical-align:middle}
 .pic_lt li .fa-caret-right {color:#bbb}
diff --git a/skin/latest/pic_list/style.css b/skin/latest/pic_list/style.css
index b263aa2f0..576a80cd3 100644
--- a/skin/latest/pic_list/style.css
+++ b/skin/latest/pic_list/style.css
@@ -11,12 +11,12 @@
 .pic_li_lt ul:after {display:block;visibility:hidden;clear:both;content:""}
 .pic_li_lt li {border-bottom:1px solid #e5ecee;margin-bottom:10px}
 .pic_li_lt li .lt_img {display:none}
-.pic_li_lt li:first-child .lt_img {display:block;margin:0 0 10px;display:block}
+.pic_li_lt li:first-child .lt_img {display:block;margin:0 0 10px;}
 .pic_li_lt li:first-child .lt_img img, .pic_li_lt li .lt_img video {width:100%;height:auto}
 .pic_li_lt li .pic_li_tit {font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle}
 
 .pic_li_lt li .fa-heart {color:#ff0000}
-.pic_li_lt li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
+.pic_li_lt li .fa-lock {display:inline-block;line-height:14px;width:16px;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
 .pic_li_lt li .new_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#23db79;background:#b9ffda;text-align:center;border-radius:2px;margin-left:2px;font-weight:bold;vertical-align:middle}
 .pic_li_lt li .hot_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#ff0000;background:#ffb9b9;text-align:center;border-radius:2px;vertical-align:middle}
 .pic_li_lt li .fa-caret-right {color:#bbb}
diff --git a/theme/basic/css/default.css b/theme/basic/css/default.css
index cb89ff049..3f6107dc7 100644
--- a/theme/basic/css/default.css
+++ b/theme/basic/css/default.css
@@ -80,7 +80,7 @@ border:1px solid #558ab7 !important;
 
 #logo {float:left;padding:30px 0 0}
 
-.hd_sch_wr {float:left;padding:30px 0;;width:445px;margin-left:65px}
+.hd_sch_wr {float:left;padding:30px 0;width:445px;margin-left:65px}
 #hd_sch h3 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #hd_sch {border-radius:30px;overflow:hidden}
 #hd_sch #sch_stx {float:left;width:385px;height:45px;padding-left:10px;border-radius:30px 0 0 30px;background:#2c2c2c;border:0;border-right:0;font-size:1.25em;color:#fff}