From d4a63cd1058044af77dac11bd49a7c588dbfce54 Mon Sep 17 00:00:00 2001
From: EC2 Default User
 <ec2-user@ip-172-26-10-170.ap-northeast-2.compute.internal>
Date: Wed, 23 Jun 2021 02:47:41 +0000
Subject: [PATCH 01/11] =?UTF-8?q?PHP=208.x=20=EC=97=90=EC=84=9C=20data/dbc?=
 =?UTF-8?q?onfig.php=20=EC=9D=98=20define('G5=5FUSE=5FSHOP',=20false);=20?=
 =?UTF-8?q?=EC=99=80=20=EA=B0=99=EC=9D=B4=20=EC=98=81=EC=B9=B4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EC=95=88=ED=95=A8=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=EC=8B=9C=20=EB=82=98=EC=98=A4=EB=8A=94=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20(=EB=AA=B0=EB=9D=BC=EB=AC=B4=EC=84=9C?=
 =?UTF-8?q?=EC=9B=8C=EB=8B=98=EC=99=B8,210623)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/theme_preview.php       | 44 +++++++++++++++++++------------------
 mobile/head.php             |  2 ++
 theme/basic/mobile/head.php |  2 ++
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/adm/theme_preview.php b/adm/theme_preview.php
index 4ec2521ab..208e0de53 100644
--- a/adm/theme_preview.php
+++ b/adm/theme_preview.php
@@ -100,29 +100,31 @@ for($i=1; $i<=5; $i++) {
 $default['de_mimg_width']  = (isset($tconfig['de_mimg_width']) && $tconfig['de_mimg_width']) ? $tconfig['de_mimg_width'] : $default['de_mimg_width'];
 $default['de_mimg_height'] = (isset($tconfig['de_mimg_height']) && $tconfig['de_mimg_height']) ? $tconfig['de_mimg_height'] : $default['de_mimg_height'];
 
-// 테마 경로 설정
-if(defined('G5_THEME_PATH')) {
-    define('G5_THEME_SHOP_PATH',   G5_THEME_PATH.'/'.G5_SHOP_DIR);
-    define('G5_THEME_SHOP_URL',    G5_THEME_URL.'/'.G5_SHOP_DIR);
-    define('G5_THEME_MSHOP_PATH',  G5_THEME_PATH.'/'.G5_MOBILE_DIR.'/'.G5_SHOP_DIR);
-    define('G5_THEME_MSHOP_URL',   G5_THEME_URL.'/'.G5_MOBILE_DIR.'/'.G5_SHOP_DIR);
-}
+if (defined('G5_USE_SHOP') && G5_USE_SHOP) {
+    // 테마 경로 설정
+    if(defined('G5_THEME_PATH')) {
+        define('G5_THEME_SHOP_PATH',   G5_THEME_PATH.'/'.G5_SHOP_DIR);
+        define('G5_THEME_SHOP_URL',    G5_THEME_URL.'/'.G5_SHOP_DIR);
+        define('G5_THEME_MSHOP_PATH',  G5_THEME_PATH.'/'.G5_MOBILE_DIR.'/'.G5_SHOP_DIR);
+        define('G5_THEME_MSHOP_URL',   G5_THEME_URL.'/'.G5_MOBILE_DIR.'/'.G5_SHOP_DIR);
+    }
 
-// 스킨 경로 설정
-if(preg_match('#^theme/(.+)$#', $default['de_shop_skin'], $match)) {
-    define('G5_SHOP_SKIN_PATH',  G5_THEME_PATH.'/'.G5_SKIN_DIR.'/shop/'.$match[1]);
-    define('G5_SHOP_SKIN_URL',   G5_THEME_URL .'/'.G5_SKIN_DIR.'/shop/'.$match[1]);
-} else {
-    define('G5_SHOP_SKIN_PATH',  G5_PATH.'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_skin']);
-    define('G5_SHOP_SKIN_URL',   G5_URL .'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_skin']);
-}
+    // 스킨 경로 설정
+    if(preg_match('#^theme/(.+)$#', $default['de_shop_skin'], $match)) {
+        define('G5_SHOP_SKIN_PATH',  G5_THEME_PATH.'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$match[1]);
+        define('G5_SHOP_SKIN_URL',   G5_THEME_URL .'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$match[1]);
+    } else {
+        define('G5_SHOP_SKIN_PATH',  G5_PATH.'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$default['de_shop_skin']);
+        define('G5_SHOP_SKIN_URL',   G5_URL .'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$default['de_shop_skin']);
+    }
 
-if(preg_match('#^theme/(.+)$#', $default['de_shop_mobile_skin'], $match)) {
-    define('G5_MSHOP_SKIN_PATH', G5_THEME_MOBILE_PATH.'/'.G5_SKIN_DIR.'/shop/'.$match[1]);
-    define('G5_MSHOP_SKIN_URL',  G5_THEME_URL .'/'.G5_MOBILE_DIR.'/'.G5_SKIN_DIR.'/shop/'.$match[1]);
-} else {
-    define('G5_MSHOP_SKIN_PATH', G5_MOBILE_PATH.'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_mobile_skin']);
-    define('G5_MSHOP_SKIN_URL',  G5_MOBILE_URL .'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_mobile_skin']);
+    if(preg_match('#^theme/(.+)$#', $default['de_shop_mobile_skin'], $match)) {
+        define('G5_MSHOP_SKIN_PATH', G5_THEME_MOBILE_PATH.'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$match[1]);
+        define('G5_MSHOP_SKIN_URL',  G5_THEME_URL .'/'.G5_MOBILE_DIR.'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$match[1]);
+    } else {
+        define('G5_MSHOP_SKIN_PATH', G5_MOBILE_PATH.'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$default['de_shop_mobile_skin']);
+        define('G5_MSHOP_SKIN_URL',  G5_MOBILE_URL .'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$default['de_shop_mobile_skin']);
+    }
 }
 
 $conf = sql_fetch(" select cf_theme from {$g5['config_table']} ");
diff --git a/mobile/head.php b/mobile/head.php
index cb0602b51..eea8aabe7 100644
--- a/mobile/head.php
+++ b/mobile/head.php
@@ -68,7 +68,9 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
             if ($i == 0) {  ?>
                 <li id="gnb_empty">메뉴 준비 중입니다.<?php if ($is_admin) { ?> <br><a href="<?php echo G5_ADMIN_URL; ?>/menu_list.php">관리자모드 &gt; 환경설정 &gt; 메뉴설정</a>에서 설정하세요.<?php } ?></li>
             <?php } ?>
+            <?php if (defined('G5_USE_SHOP') && G5_USE_SHOP) { ?>
                 <li class="gnb_1dli"><a href="<?php echo G5_SHOP_URL ?>" class="gnb_1da"> 쇼핑몰</a></li>
+            <?php } ?>
             </ul>
             <ul id="hd_nb">
             	<li class="hd_nb1"><a href="<?php echo G5_BBS_URL ?>/faq.php" id="snb_faq"><i class="fa fa-question" aria-hidden="true"></i>FAQ</a></li>
diff --git a/theme/basic/mobile/head.php b/theme/basic/mobile/head.php
index 7a8c3a5e5..5144ddcb8 100644
--- a/theme/basic/mobile/head.php
+++ b/theme/basic/mobile/head.php
@@ -69,7 +69,9 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
             if ($i == 0) {  ?>
                 <li id="gnb_empty">메뉴 준비 중입니다.<?php if ($is_admin) { ?> <br><a href="<?php echo G5_ADMIN_URL; ?>/menu_list.php">관리자모드 &gt; 환경설정 &gt; 메뉴설정</a>에서 설정하세요.<?php } ?></li>
             <?php } ?>
+            <?php if (defined('G5_USE_SHOP') && G5_USE_SHOP) { ?>
                 <li class="gnb_1dli"><a href="<?php echo G5_SHOP_URL ?>" class="gnb_1da"> 쇼핑몰</a></li>
+            <?php } ?>
             </ul>
 
             <ul id="hd_nb">

From cc2524e3a4e18bff92fcc57109e513514f1bd362 Mon Sep 17 00:00:00 2001
From: EC2 Default User
 <ec2-user@ip-172-26-10-170.ap-northeast-2.compute.internal>
Date: Thu, 24 Jun 2021 04:58:52 +0000
Subject: [PATCH 02/11] =?UTF-8?q?=EA=B0=A4=EB=9F=AC=EB=A6=AC=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=EC=88=98=20=EC=84=A4=EC=A0=95=EC=9D=84=20sel?=
 =?UTF-8?q?ect=20type=20=EC=97=90=EC=84=9C=20input=20type=20=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95=20(=EC=82=AC=EB=85=B8=EB=9D=BC?=
 =?UTF-8?q?=EA=B0=80=EB=85=B8=EB=9D=BC=EB=8B=98,210223)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adm/board_form.php b/adm/board_form.php
index b82ad4eb9..10054b927 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -1062,7 +1062,7 @@ $pg_anchor = '<ul class="anchor">
             <th scope="row"><label for="bo_gallery_cols">갤러리 이미지 수<strong class="sound_only">필수</strong></label></th>
             <td>
                 <?php echo help('갤러리 형식의 게시판 목록에서 이미지를 한줄에 몇장씩 보여 줄 것인지를 설정하는 값') ?>
-                <?php echo get_member_level_select('bo_gallery_cols', 1, 10, $board['bo_gallery_cols']); ?>
+                <input type="text" name="bo_gallery_cols" value="<?php echo $board['bo_gallery_cols'] ?>" id="bo_gallery_cols" required class="required numeric frm_input" size="4">
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_gallery_cols" value="1" id="chk_grp_gallery_cols">

From 911503e0556331c9fcf170c10b2c235bb01d85b1 Mon Sep 17 00:00:00 2001
From: EC2 Default User
 <ec2-user@ip-172-26-2-86.ap-northeast-2.compute.internal>
Date: Thu, 24 Jun 2021 05:39:11 +0000
Subject: [PATCH 03/11] =?UTF-8?q?$subject=20=EA=B0=80=20=EC=B2=AB=EB=B2=88?=
 =?UTF-8?q?=EC=A7=B8=20=EC=A1=B0=EA=B1=B4=EC=97=90=20=EB=A7=8C=EC=A1=B1?=
 =?UTF-8?q?=ED=95=98=EB=A9=B4=20$cont=20=EB=A5=BC=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=ED=99=94=20=ED=95=98=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EB=B3=B4=EC=95=88=20=EC=B7=A8=EC=95=BD=EC=A0=90=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20(munsiwoo=EB=8B=98,210623)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/ajax.filter.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bbs/ajax.filter.php b/bbs/ajax.filter.php
index 05d7bc4c6..c696a0628 100644
--- a/bbs/ajax.filter.php
+++ b/bbs/ajax.filter.php
@@ -11,7 +11,7 @@ for ($i=0; $i<count($filter); $i++) {
     $str = $filter[$i];
 
     // 제목 필터링 (찾으면 중지)
-    $subj = "";
+    $subj = $cont = "";
     $pos = stripos($subject, $str);
     if ($pos !== false) {
         $subj = $str;
@@ -19,7 +19,6 @@ for ($i=0; $i<count($filter); $i++) {
     }
 
     // 내용 필터링 (찾으면 중지)
-    $cont = "";
     $pos = stripos($content, $str);
     if ($pos !== false) {
         $cont = $str;

From e928df8a8c634576c490cfc79ef40a59be4fe4d7 Mon Sep 17 00:00:00 2001
From: kagla <kagla@naver.com>
Date: Thu, 24 Jun 2021 06:42:38 +0000
Subject: [PATCH 04/11] =?UTF-8?q?=ED=98=84=EC=9E=AC=20false=20=EA=B0=92?=
 =?UTF-8?q?=EB=A7=8C=20=EB=B0=98=ED=99=98=ED=95=98=EB=8A=94=20get=5Fmagic?=
 =?UTF-8?q?=5Fquotes=5Fgpc()=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0,=20PHP7.4.0=EC=97=90=EC=84=9C=20DEPRECATED?=
 =?UTF-8?q?=20=EB=90=98=EC=97=88=EC=8A=B5=EB=8B=88=EB=8B=A4.=20(=EC=97=91?=
 =?UTF-8?q?=EC=8A=A4=EC=97=A0=EC=97=98=EB=8B=98,210624)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/common.php b/common.php
index f9a6f5275..1ec4ec152 100644
--- a/common.php
+++ b/common.php
@@ -101,13 +101,6 @@ function sql_escape_string($str)
 //==============================================================================
 // SQL Injection 등으로 부터 보호를 위해 sql_escape_string() 적용
 //------------------------------------------------------------------------------
-// magic_quotes_gpc 에 의한 backslashes 제거
-if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
-    $_POST    = array_map_deep('stripslashes',  $_POST);
-    $_GET     = array_map_deep('stripslashes',  $_GET);
-    $_COOKIE  = array_map_deep('stripslashes',  $_COOKIE);
-    $_REQUEST = array_map_deep('stripslashes',  $_REQUEST);
-}
 
 // sql_escape_string 적용
 $_POST    = array_map_deep(G5_ESCAPE_FUNCTION,  $_POST);

From cfc6804ee52a213f90f40e2a950ae2934cf0c54c Mon Sep 17 00:00:00 2001
From: kagla <kagla@naver.com>
Date: Thu, 24 Jun 2021 06:46:52 +0000
Subject: [PATCH 05/11] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.4.9=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

---
 config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.php b/config.php
index 36a1bfa64..11ffa60db 100644
--- a/config.php
+++ b/config.php
@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.8');
+define('G5_GNUBOARD_VER', '5.4.9');
 // 그누보드5.4.5.5 버전과 영카트5.4.5.5.1 버전을 합쳐서 그누보드5.4.6 버전에서 시작함 (kagla-210617)
 // G5_YOUNGCART_VER 이 상수를 사용하는 곳이 있으므로 주석 처리 해제함
 define('G5_YOUNGCART_VER', '5.4.5.5.1');
@@ -234,4 +234,4 @@ if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') {   //https 통신일때
     define('G5_POSTCODE_JS', '<script src="https://spi.maps.daum.net/imap/map_js_init/postcode.v2.js"></script>');
 } else {  //http 통신일때 daum 주소 js
     define('G5_POSTCODE_JS', '<script src="http://dmaps.daum.net/map_js_init/postcode.v2.js"></script>');
-}
\ No newline at end of file
+}

From 94cd7b29795382375b56aed2754ef06d89385d5a Mon Sep 17 00:00:00 2001
From: kagla <kagla@naver.com>
Date: Thu, 1 Jul 2021 10:41:53 +0900
Subject: [PATCH 06/11] =?UTF-8?q?=EC=9D=8C=EC=88=98=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=20=ED=95=98=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/itemform.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index cffc307ce..eea31a8cf 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -1843,8 +1843,10 @@ function fitemformcheck(f)
 
     if(f.it_point_type.value == "1" || f.it_point_type.value == "2") {
         var point = parseInt(f.it_point.value);
-        if(point > 99) {
+        if(point < 0 || point > 99) {
             alert("포인트 비율을 0과 99 사이의 값으로 입력해 주십시오.");
+            f.it_point.focus();
+            f.it_point.select();
             return false;
         }
     }

From e3a7dfd319cb8bcc3c6eaac2d9f95db2cffa9096 Mon Sep 17 00:00:00 2001
From: kagla <kagla@naver.com>
Date: Thu, 1 Jul 2021 10:42:11 +0900
Subject: [PATCH 07/11] =?UTF-8?q?=EA=B4=80=EB=A0=A8=EC=83=81=ED=92=88?=
 =?UTF-8?q?=EC=9D=84=20=EC=82=AD=EC=A0=9C=ED=95=9C=20=EB=92=A4=EC=97=90=20?=
 =?UTF-8?q?=EA=B2=BD=EA=B3=A0=EA=B0=80=20=EB=85=B8=EC=B6=9C=EB=90=98?=
 =?UTF-8?q?=EC=96=B4=20=EB=93=B1=EB=A1=9D,=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=97=86=EC=9D=B4=20=EA=B4=80=EB=A0=A8=EC=83=81=ED=92=88?=
 =?UTF-8?q?=EB=A7=8C=20=EC=82=AD=EC=A0=9C=EB=90=A0=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20(squared2?=
 =?UTF-8?q?=EB=8B=98,210617)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/itemformupdate.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php
index a4c814f58..73e4c790a 100644
--- a/adm/shop_admin/itemformupdate.php
+++ b/adm/shop_admin/itemformupdate.php
@@ -218,6 +218,10 @@ if ($w == "" || $w == "u")
     @set_cookie("ck_origin", stripslashes($it_origin), time() + 86400*31);
 }
 
+// 관련상품을 삭제한 뒤에 경고가 노출되어 등록, 수정 없이 관련상품만 삭제될 수 있는 오류 수정 (squared2님,210617)
+// 포인트 비율 값 체크
+if(($it_point_type == 1 || $it_point_type == 2) && ($it_point < 0  || $it_point > 99))
+    alert("포인트 비율을 0과 99 사이의 값으로 입력해 주십시오.");
 
 // 관련상품을 우선 삭제함
 sql_query(" delete from {$g5['g5_shop_item_relation_table']} where it_id = '$it_id' ");
@@ -287,10 +291,6 @@ for($i=0; $i<$count_ii_article; $i++) {
 }
 $it_info_value = addslashes(serialize($value_array));
 
-// 포인트 비율 값 체크
-if(($it_point_type == 1 || $it_point_type == 2) && $it_point > 99)
-    alert("포인트 비율을 0과 99 사이의 값으로 입력해 주십시오.");
-
 $it_name = isset($_POST['it_name']) ? strip_tags(clean_xss_attributes(trim($_POST['it_name']))) : '';
 
 // KVE-2019-0708

From f631b3dca782588a6893d1ce3fe969c231178dd3 Mon Sep 17 00:00:00 2001
From: kagla <kagla@naver.com>
Date: Thu, 1 Jul 2021 10:59:16 +0900
Subject: [PATCH 08/11] =?UTF-8?q?KISA=20=EC=B7=A8=EC=95=BD=EC=A0=90=20?=
 =?UTF-8?q?=EA=B6=8C=EA=B3=A0=EC=82=AC=ED=95=AD=20Stored=20XSS=20(210624)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/qawrite.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bbs/qawrite.php b/bbs/qawrite.php
index fb041e0ad..0f279f3d4 100644
--- a/bbs/qawrite.php
+++ b/bbs/qawrite.php
@@ -79,7 +79,8 @@ if(is_file($skin_file)) {
         else
             $content = "\n\n\n\n====== 이전 답변내용 =======\n";
 
-        $content .= get_text($write['qa_content'], 0);
+        // KISA 취약점 권고사항 Stored XSS (210624)
+        $content .= get_text(html_purifier($write['qa_content']), 0);
     } else {
         //$content = get_text($write['qa_content'], 0);
         

From 69e37cbec9e086451981ba615a5be42ea62b1fff Mon Sep 17 00:00:00 2001
From: kagla <kagla@naver.com>
Date: Thu, 1 Jul 2021 11:43:07 +0900
Subject: [PATCH 09/11] =?UTF-8?q?=EA=B7=B8=EB=88=84=EB=B3=B4=EB=93=9C,=20?=
 =?UTF-8?q?=EC=98=81=EC=B9=B4=ED=8A=B8=20=ED=86=B5=ED=95=A9=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=98=EC=97=AC=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=ED=8C=90=EA=B7=B8=EB=A3=B9=EC=9D=84=20=EC=BB=A4=EB=AE=A4?=
 =?UTF-8?q?=EB=8B=88=ED=8B=B0(community)=EB=A1=9C=20=EC=83=9D=EC=84=B1=20(?=
 =?UTF-8?q?NaviGator=EB=8B=98,210624)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/install_db.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/install/install_db.php b/install/install_db.php
index 969703d70..a5a621354 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -241,8 +241,11 @@ if($g5_install || !$result) {
     // FAQ Master
     sql_query(" insert into `{$table_prefix}faq_master` set fm_id = '1', fm_subject = '자주하시는 질문' ", true, $dblink);
 
-    $tmp_gr_id = defined('G5_YOUNGCART_VER') ? 'shop' : 'community';
-    $tmp_gr_subject = defined('G5_YOUNGCART_VER') ? '쇼핑몰' : '커뮤니티';
+    // 그누보드, 영카트 통합으로 인하여 게시판그룹을 커뮤니티(community)로 생성 (NaviGator님,210624)
+    // $tmp_gr_id = defined('G5_YOUNGCART_VER') ? 'shop' : 'community';
+    // $tmp_gr_subject = defined('G5_YOUNGCART_VER') ? '쇼핑몰' : '커뮤니티';
+    $tmp_gr_id = 'community';
+    $tmp_gr_subject = '커뮤니티';
 
     // 게시판 그룹 생성
     sql_query(" insert into `{$table_prefix}group` set gr_id = '$tmp_gr_id', gr_subject = '$tmp_gr_subject' ", true, $dblink);

From ff9f5ee936beb7d2738a192e51e1e573d9833952 Mon Sep 17 00:00:00 2001
From: kagla <kagla@naver.com>
Date: Thu, 1 Jul 2021 11:52:11 +0900
Subject: [PATCH 10/11] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=97=B4=20=EC=95=88?=
 =?UTF-8?q?=EC=97=90=20=ED=8F=AC=ED=95=A8=EB=90=9C=20=EB=B3=80=EC=88=98?=
 =?UTF-8?q?=EC=97=90=20{=EC=A4=91=EA=B4=84=ED=98=B8}=20=EC=A0=81=EC=9A=A9?=
 =?UTF-8?q?=20(=ED=95=B4=ED=94=BC=EC=A0=95=EB=8B=98,210625)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/theme_preview.php | 4 ++--
 bbs/ajax.filter.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/adm/theme_preview.php b/adm/theme_preview.php
index 208e0de53..031ecd09f 100644
--- a/adm/theme_preview.php
+++ b/adm/theme_preview.php
@@ -30,7 +30,7 @@ $qstr_device  = '&amp;mode='.$mode.'&amp;device='.(G5_IS_MOBILE ? 'pc' : 'mobile
 $sql = " select bo_table, wr_parent from {$g5['board_new_table']} order by bn_id desc limit 1 ";
 $row = sql_fetch($sql);
 $bo_table = $row['bo_table'];
-$board = sql_fetch(" select * from {$g5['board_table']} where bo_table = '$bo_table' ");
+$board = sql_fetch(" select * from {$g5['board_table']} where bo_table = '{$bo_table}' ");
 $write_table = $g5['write_prefix'] . $bo_table;
 
 // theme.config.php 미리보기 게시판 스킨이 설정돼 있다면
@@ -172,7 +172,7 @@ require_once(G5_PATH.'/head.sub.php');
             break;
         case 'view':
             $wr_id = $row['wr_parent'];
-            $write = sql_fetch(" select * from $write_table where wr_id = '$wr_id' ");
+            $write = sql_fetch(" select * from {$write_table} where wr_id = '{$wr_id}' ");
             include(G5_BBS_PATH.'/board.php');
             break;
         case 'shop':
diff --git a/bbs/ajax.filter.php b/bbs/ajax.filter.php
index c696a0628..f0b414061 100644
--- a/bbs/ajax.filter.php
+++ b/bbs/ajax.filter.php
@@ -26,4 +26,4 @@ for ($i=0; $i<count($filter); $i++) {
     }
 }
 
-die("{\"subject\":\"$subj\",\"content\":\"$cont\"}");
\ No newline at end of file
+die("{\"subject\":\"{$subj}\",\"content\":\"{$cont}\"}");
\ No newline at end of file

From a58bc5d2fbee38a1219f62a646f8e7fae4908f81 Mon Sep 17 00:00:00 2001
From: kagla <kagla@naver.com>
Date: Thu, 1 Jul 2021 11:55:00 +0900
Subject: [PATCH 11/11] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.4.10=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

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

diff --git a/config.php b/config.php
index 11ffa60db..2c0339059 100644
--- a/config.php
+++ b/config.php
@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.9');
+define('G5_GNUBOARD_VER', '5.4.10');
 // 그누보드5.4.5.5 버전과 영카트5.4.5.5.1 버전을 합쳐서 그누보드5.4.6 버전에서 시작함 (kagla-210617)
 // G5_YOUNGCART_VER 이 상수를 사용하는 곳이 있으므로 주석 처리 해제함
 define('G5_YOUNGCART_VER', '5.4.5.5.1');