From b34f577fbdb055934a7ddcad4f12312337e5e03f Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 27 Dec 2017 18:10:40 +0900
Subject: [PATCH 01/17] =?UTF-8?q?iframe=20=ED=97=88=EC=9A=A9=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=EC=9D=98=20=EC=9E=98=EB=AA=BB=EB=90=9C=20=EC=A0=95?=
 =?UTF-8?q?=EA=B7=9C=EC=8B=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/htmlpurifier/extend.video.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/htmlpurifier/extend.video.php b/plugin/htmlpurifier/extend.video.php
index 8ba346a47..96cb5b846 100644
--- a/plugin/htmlpurifier/extend.video.php
+++ b/plugin/htmlpurifier/extend.video.php
@@ -22,8 +22,8 @@ if( !class_exists('HTMLPurifier_Filter_Iframevideo') ){
 		public function preFilter($html, $config, $context)
 		{
 			if (strstr($html, '<iframe')) {
-				$html = preg_replace_callback('/<iframe.*?src="https?:\/\/www\.youtube\.com\/embed\/([^"]*)[^>]*>(.*?)?\/iframe>/si', array($this, 'trust_url_match'), $html);
-				$html = preg_replace_callback('/<iframe.*?src="https?:\/\/player\.vimeo.com\/video\/([^"]*)[^>]*>(.*?)?\/iframe>/si', array($this, 'trust_url_match'), $html);
+				$html = preg_replace_callback('/<iframe.*?src="https?:\/\/www\.youtube\.com\/embed\/([^"]*)[^>]*>(.*?)?\/iframe>/i', array($this, 'trust_url_match'), $html);
+				$html = preg_replace_callback('/<iframe.*?src="https?:\/\/player\.vimeo.com\/video\/([^"]*)[^>]*>(.*?)?\/iframe>/i', array($this, 'trust_url_match'), $html);
 				//$html = preg_replace('#<iframe#i', '<img class="Iframevideo"', $html);
 				//$html = preg_replace('#</iframe>#i', '</img>', $html);
 			}

From fc976f2bedd6c7484844ab6de95236863b228496 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 5 Jan 2018 10:19:47 +0900
Subject: [PATCH 02/17] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=84=A4?=
 =?UTF-8?q?=EB=AC=B8=EC=A1=B0=EC=82=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=ED=95=84=ED=84=B0=EA=B5=AC=EB=AC=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/poll_form_update.php | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/adm/poll_form_update.php b/adm/poll_form_update.php
index a3cba14ad..2d01fe6dd 100644
--- a/adm/poll_form_update.php
+++ b/adm/poll_form_update.php
@@ -10,6 +10,40 @@ auth_check($auth[$sub_menu], 'w');
 
 check_admin_token();
 
+$check_keys = array(
+'po_subject',
+'po_poll1',
+'po_poll2',
+'po_poll3',
+'po_poll4',
+'po_poll5',
+'po_poll6',
+'po_poll7',
+'po_poll8',
+'po_poll9',
+'po_cnt1',
+'po_cnt2',
+'po_cnt3',
+'po_cnt4',
+'po_cnt5',
+'po_cnt6',
+'po_cnt7',
+'po_cnt8',
+'po_cnt9',
+'po_etc',
+'po_level',
+'po_point',
+'po_id'
+);
+
+foreach( $_POST as $key=>$value ){
+    if( empty($value) ) continue;
+
+    if( in_array($key, $check_keys) ) {
+        $_POST[$key] = strip_tags($value);
+    }
+}
+
 if ($w == '')
 {
     $sql = " insert {$g5['poll_table']}

From c85d6cf4140dea7eab208e5e743f3ae16e380fa0 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 5 Jan 2018 10:55:21 +0900
Subject: [PATCH 03/17] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=ED=83=80?=
 =?UTF-8?q?=EC=9D=B4=ED=8B=80=20=EC=9E=98=EB=AA=BB=EB=90=9C=20=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/board.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bbs/board.php b/bbs/board.php
index aeecf487f..4d734128c 100644
--- a/bbs/board.php
+++ b/bbs/board.php
@@ -136,7 +136,7 @@ if (isset($wr_id) && $wr_id) {
         set_session($ss_name, TRUE);
     }
 
-    $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']);
+    $g5['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']);
 } else {
     if ($member['mb_level'] < $board['bo_list_level']) {
         if ($member['mb_id'])
@@ -171,7 +171,7 @@ if (isset($wr_id) && $wr_id) {
 
     if (!isset($page) || (isset($page) && $page == 0)) $page = 1;
 
-    $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']) ;
+    $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']).' '.$page.' 페이지';
 }
 
 include_once(G5_PATH.'/head.sub.php');

From a1247d5da9289cf13da6aeea13889928127d6793 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Thu, 11 Jan 2018 20:12:26 +0900
Subject: [PATCH 04/17] =?UTF-8?q?=EC=9D=B4=EC=A0=84=EA=B8=80=20=EB=8B=A4?=
 =?UTF-8?q?=EC=9D=8C=EA=B8=80=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/view.php                                 | 10 ++++++----
 skin/board/basic/view.skin.php               |  4 ++--
 skin/board/gallery/view.skin.php             |  4 ++--
 theme/basic/skin/board/basic/view.skin.php   |  4 ++--
 theme/basic/skin/board/gallery/view.skin.php |  4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/bbs/view.php b/bbs/view.php
index 1031da62c..2f4975abd 100644
--- a/bbs/view.php
+++ b/bbs/view.php
@@ -25,20 +25,20 @@ if (!$board['bo_use_list_view']) {
         $sql_search = " and " . $sql_search;
 
     // 윗글을 얻음
-    $sql = " select wr_id, wr_subject from {$write_table} where wr_is_comment = 0 and wr_num = '{$write['wr_num']}' and wr_reply < '{$write['wr_reply']}' {$sql_search} order by wr_num desc, wr_reply desc limit 1 ";
+    $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num = '{$write['wr_num']}' and wr_reply < '{$write['wr_reply']}' {$sql_search} order by wr_num desc, wr_reply desc limit 1 ";
     $prev = sql_fetch($sql);
     // 위의 쿼리문으로 값을 얻지 못했다면
     if (!$prev['wr_id'])     {
-        $sql = " select wr_id, wr_subject from {$write_table} where wr_is_comment = 0 and wr_num < '{$write['wr_num']}' {$sql_search} order by wr_num desc, wr_reply desc limit 1 ";
+        $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num < '{$write['wr_num']}' {$sql_search} order by wr_num desc, wr_reply desc limit 1 ";
         $prev = sql_fetch($sql);
     }
 
     // 아래글을 얻음
-    $sql = " select wr_id, wr_subject from {$write_table} where wr_is_comment = 0 and wr_num = '{$write['wr_num']}' and wr_reply > '{$write['wr_reply']}' {$sql_search} order by wr_num, wr_reply limit 1 ";
+    $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num = '{$write['wr_num']}' and wr_reply > '{$write['wr_reply']}' {$sql_search} order by wr_num, wr_reply limit 1 ";
     $next = sql_fetch($sql);
     // 위의 쿼리문으로 값을 얻지 못했다면
     if (!$next['wr_id']) {
-        $sql = " select wr_id, wr_subject from {$write_table} where wr_is_comment = 0 and wr_num > '{$write['wr_num']}' {$sql_search} order by wr_num, wr_reply limit 1 ";
+        $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num > '{$write['wr_num']}' {$sql_search} order by wr_num, wr_reply limit 1 ";
         $next = sql_fetch($sql);
     }
 }
@@ -48,6 +48,7 @@ $prev_href = '';
 if (isset($prev['wr_id']) && $prev['wr_id']) {
     $prev_wr_subject = get_text(cut_str($prev['wr_subject'], 255));
     $prev_href = './board.php?bo_table='.$bo_table.'&amp;wr_id='.$prev['wr_id'].$qstr;
+    $prev_wr_date = $prev['wr_datetime'];
 }
 
 // 다음글 링크
@@ -55,6 +56,7 @@ $next_href = '';
 if (isset($next['wr_id']) && $next['wr_id']) {
     $next_wr_subject = get_text(cut_str($next['wr_subject'], 255));
     $next_href = './board.php?bo_table='.$bo_table.'&amp;wr_id='.$next['wr_id'].$qstr;
+    $next_wr_date = $next['wr_datetime'];
 }
 
 // 쓰기 링크
diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php
index bbbdb6c61..dec627207 100644
--- a/skin/board/basic/view.skin.php
+++ b/skin/board/basic/view.skin.php
@@ -186,8 +186,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <?php if ($prev_href || $next_href) { ?>
         <ul class="bo_v_nb">
-            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>">이전글제목입니다.</a> <span class="nb_date">17.07.14</span></li><?php } ?>
-            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>">다음글제목입니다.</a>  <span class="nb_date">17.07.14</span></li><?php } ?>
+            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>"><?php echo $prev_wr_subject;?></a> <span class="nb_date"><?php echo str_replace('-', '.', substr($prev_wr_date, '2', '8')); ?></span></li><?php } ?>
+            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>"><?php echo $next_wr_subject;?></a>  <span class="nb_date"><?php echo str_replace('-', '.', substr($next_wr_date, '2', '8')); ?></span></li><?php } ?>
         </ul>
         <?php } ?>
         <?php
diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php
index bbbdb6c61..dec627207 100644
--- a/skin/board/gallery/view.skin.php
+++ b/skin/board/gallery/view.skin.php
@@ -186,8 +186,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <?php if ($prev_href || $next_href) { ?>
         <ul class="bo_v_nb">
-            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>">이전글제목입니다.</a> <span class="nb_date">17.07.14</span></li><?php } ?>
-            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>">다음글제목입니다.</a>  <span class="nb_date">17.07.14</span></li><?php } ?>
+            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>"><?php echo $prev_wr_subject;?></a> <span class="nb_date"><?php echo str_replace('-', '.', substr($prev_wr_date, '2', '8')); ?></span></li><?php } ?>
+            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>"><?php echo $next_wr_subject;?></a>  <span class="nb_date"><?php echo str_replace('-', '.', substr($next_wr_date, '2', '8')); ?></span></li><?php } ?>
         </ul>
         <?php } ?>
         <?php
diff --git a/theme/basic/skin/board/basic/view.skin.php b/theme/basic/skin/board/basic/view.skin.php
index bbbdb6c61..dec627207 100644
--- a/theme/basic/skin/board/basic/view.skin.php
+++ b/theme/basic/skin/board/basic/view.skin.php
@@ -186,8 +186,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <?php if ($prev_href || $next_href) { ?>
         <ul class="bo_v_nb">
-            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>">이전글제목입니다.</a> <span class="nb_date">17.07.14</span></li><?php } ?>
-            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>">다음글제목입니다.</a>  <span class="nb_date">17.07.14</span></li><?php } ?>
+            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>"><?php echo $prev_wr_subject;?></a> <span class="nb_date"><?php echo str_replace('-', '.', substr($prev_wr_date, '2', '8')); ?></span></li><?php } ?>
+            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>"><?php echo $next_wr_subject;?></a>  <span class="nb_date"><?php echo str_replace('-', '.', substr($next_wr_date, '2', '8')); ?></span></li><?php } ?>
         </ul>
         <?php } ?>
         <?php
diff --git a/theme/basic/skin/board/gallery/view.skin.php b/theme/basic/skin/board/gallery/view.skin.php
index 0e3034d64..9398eea72 100644
--- a/theme/basic/skin/board/gallery/view.skin.php
+++ b/theme/basic/skin/board/gallery/view.skin.php
@@ -186,8 +186,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <?php if ($prev_href || $next_href) { ?>
         <ul class="bo_v_nb">
-            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>">이전글제목입니다.</a> <span class="nb_date">17.07.14</span></li><?php } ?>
-            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>">다음글제목입니다.</a>  <span class="nb_date">17.07.14</span></li><?php } ?>
+            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>"><?php echo $prev_wr_subject;?></a> <span class="nb_date"><?php echo str_replace('-', '.', substr($prev_wr_date, '2', '8')); ?></span></li><?php } ?>
+            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>"><?php echo $next_wr_subject;?></a>  <span class="nb_date"><?php echo str_replace('-', '.', substr($next_wr_date, '2', '8')); ?></span></li><?php } ?>
         </ul>
         <?php } ?>
         <?php

From e3f91c8a818185b16b68369a98b6f92a2365dea4 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Tue, 16 Jan 2018 14:55:39 +0900
Subject: [PATCH 05/17] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20css=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

---
 css/default.css                               |  7 ++++++
 skin/board/basic/style.css                    |  2 +-
 skin/board/basic/write.skin.php               | 24 +++++++++----------
 skin/board/gallery/style.css                  |  2 +-
 skin/board/gallery/write.skin.php             | 24 +++++++++----------
 theme/basic/css/default.css                   |  7 ++++++
 theme/basic/skin/board/basic/style.css        |  2 +-
 theme/basic/skin/board/basic/write.skin.php   | 24 +++++++++----------
 theme/basic/skin/board/gallery/style.css      |  2 +-
 theme/basic/skin/board/gallery/write.skin.php | 24 +++++++++----------
 10 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/css/default.css b/css/default.css
index 186147903..7c852666e 100644
--- a/css/default.css
+++ b/css/default.css
@@ -423,6 +423,13 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 box-shadow: inset 1px 1px 2px #222542;
 }
 
+/* cheditor 이슈 */
+.cheditor-popup-window *, .cheditor-popup-window :after, .cheditor-popup-window :before {
+-webkit-box-sizing: content-box;
+-moz-box-sizing: content-box;
+box-sizing: content-box;
+}
+
 /* Mobile화면으로 */
 #device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}
 
diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css
index 237797072..4b5a320a0 100644
--- a/skin/board/basic/style.css
+++ b/skin/board/basic/style.css
@@ -348,7 +348,7 @@ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 
 
 /*글쓰기*/
-#bo_w div{margin:10px 0;position:relative;}
+#bo_w .write_div{margin:10px 0;position:relative}
 #bo_w .bo_w_info:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_w .bo_w_info .frm_input{float:left;width:33%}
 #bo_w #wr_password{margin:0 0.5%  }
diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php
index 2f2b23b71..ea78e5bc4 100644
--- a/skin/board/basic/write.skin.php
+++ b/skin/board/basic/write.skin.php
@@ -55,7 +55,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     ?>
 
     <?php if ($is_category) { ?>
-    <div class="bo_w_select">
+    <div class="bo_w_select write_div">
         <label for="ca_name"  class="sound_only">분류<strong>필수</strong></label>
         <select name="ca_name" id="ca_name" required>
             <option value="">분류를 선택하세요</option>
@@ -64,7 +64,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
     <?php } ?>
 
-    <div class="bo_w_info">
+    <div class="bo_w_info write_div">
     <?php if ($is_name) { ?>
         <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
         <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input required" placeholder="이름">
@@ -82,23 +82,23 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php if ($is_homepage) { ?>
-    <div>
+    <div class="write_div">
         <label for="wr_homepage" class="sound_only">홈페이지</label>
         <input type="text" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input" size="50" placeholder="홈페이지">
     </div>
     <?php } ?>
 
     <?php if ($option) { ?>
-    <div>
+    <div class="write_div">
         <span class="sound_only">옵션</span>
         <?php echo $option ?>
     </div>
     <?php } ?>
 
-    <div class="bo_w_tit">
+    <div class="bo_w_tit write_div">
         <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
         
-        <div id="autosave_wrapper">
+        <div id="autosave_wrapper write_div">
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" size="50" maxlength="255" placeholder="제목">
             <?php if ($is_member) { // 임시 저장된 글 기능 ?>
             <script src="<?php echo G5_JS_URL; ?>/autosave.js"></script>
@@ -114,7 +114,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         
     </div>
 
-    <div>
+    <div class="write_div">
         <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
         <div class="wr_content <?php echo $is_dhtml_editor ? $config['cf_editor'] : ''; ?>">
             <?php if($write_min || $write_max) { ?>
@@ -131,15 +131,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-    <div class="bo_w_link">
+    <div class="bo_w_link write_div">
         <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i><span class="sound_only"> 링크  #<?php echo $i ?></span></label>
         <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
     </div>
     <?php } ?>
 
     <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-    <div class="bo_w_flie">
-        <div class="file_wr">
+    <div class="bo_w_flie write_div">
+        <div class="file_wr write_div">
             <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only"> 파일 #<?php echo $i+1 ?></span></label>
             <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
         </div>
@@ -158,13 +158,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php if ($is_use_captcha) { //자동등록방지  ?>
-    <div>
+    <div class="write_div">
         <?php echo $captcha_html ?>
     </div>
     <?php } ?>
 
 
-    <div class="btn_confirm">
+    <div class="btn_confirm write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel btn">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit btn">
     </div>
diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css
index 3218d469e..217c46139 100644
--- a/skin/board/gallery/style.css
+++ b/skin/board/gallery/style.css
@@ -362,7 +362,7 @@ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 #bo_vc_sns input {margin:0 5px 0 0 }
 
 /*글쓰기*/
-#bo_w div{margin:10px 0;position:relative;}
+#bo_w .write_div{margin:10px 0;position:relative}
 #bo_w .bo_w_info:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_w .bo_w_info .frm_input{float:left;width:33%}
 #bo_w #wr_password{margin:0 0.5%  }
diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php
index fe395b1cc..50330a292 100644
--- a/skin/board/gallery/write.skin.php
+++ b/skin/board/gallery/write.skin.php
@@ -55,7 +55,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     ?>
 
     <?php if ($is_category) { ?>
-    <div class="bo_w_select">
+    <div class="bo_w_select write_div">
         <label for="ca_name"  class="sound_only">분류<strong>필수</strong></label>
         <select name="ca_name" id="ca_name" required>
             <option value="">분류를 선택하세요</option>
@@ -65,7 +65,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <?php } ?>
 
 
-    <div class="bo_w_info">
+    <div class="bo_w_info write_div">
     <?php if ($is_name) { ?>
         <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
         <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input required" placeholder="이름">
@@ -83,23 +83,23 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php if ($is_homepage) { ?>
-    <div>
+    <div class="write_div">
         <label for="wr_homepage" class="sound_only">홈페이지</label>
         <input type="text" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input" size="50" placeholder="홈페이지">
     </div>
     <?php } ?>
 
     <?php if ($option) { ?>
-    <div>
+    <div class="write_div">
         <span class="sound_only">옵션</span>
         <?php echo $option ?>
     </div>
     <?php } ?>
 
-    <div class="bo_w_tit">
+    <div class="bo_w_tit write_div">
         <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
         
-        <div id="autosave_wrapper">
+        <div id="autosave_wrapper write_div">
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" size="50" maxlength="255" placeholder="제목">
             <?php if ($is_member) { // 임시 저장된 글 기능 ?>
             <script src="<?php echo G5_JS_URL; ?>/autosave.js"></script>
@@ -115,7 +115,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         
     </div>
 
-    <div>
+    <div class="write_div">
         <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
         <div class="wr_content <?php echo $is_dhtml_editor ? $config['cf_editor'] : ''; ?>">
             <?php if($write_min || $write_max) { ?>
@@ -133,15 +133,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-    <div class="bo_w_link">
+    <div class="bo_w_link write_div">
         <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i><span class="sound_only"> 링크  #<?php echo $i ?></span></label>
         <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
     </div>
     <?php } ?>
 
     <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-    <div class="bo_w_flie">
-        <div class="file_wr">
+    <div class="bo_w_flie write_div">
+        <div class="file_wr write_div">
             <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only"> 파일 #<?php echo $i+1 ?></span></label>
             <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
         </div>
@@ -160,13 +160,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php if ($is_use_captcha) { //자동등록방지  ?>
-    <div>
+    <div class="write_div">
         <?php echo $captcha_html ?>
     </div>
     <?php } ?>
 
 
-    <div class="btn_confirm">
+    <div class="btn_confirm write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel btn">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit btn">
     </div>
diff --git a/theme/basic/css/default.css b/theme/basic/css/default.css
index 12d528b8f..e964dbdda 100644
--- a/theme/basic/css/default.css
+++ b/theme/basic/css/default.css
@@ -428,6 +428,13 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 box-shadow: inset 1px 1px 2px #222542;
 }
 
+/* cheditor 이슈 */
+.cheditor-popup-window *, .cheditor-popup-window :after, .cheditor-popup-window :before {
+-webkit-box-sizing: content-box;
+-moz-box-sizing: content-box;
+box-sizing: content-box;
+}
+
 /* Mobile화면으로 */
 #device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}
 
diff --git a/theme/basic/skin/board/basic/style.css b/theme/basic/skin/board/basic/style.css
index 237797072..4b5a320a0 100644
--- a/theme/basic/skin/board/basic/style.css
+++ b/theme/basic/skin/board/basic/style.css
@@ -348,7 +348,7 @@ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 
 
 /*글쓰기*/
-#bo_w div{margin:10px 0;position:relative;}
+#bo_w .write_div{margin:10px 0;position:relative}
 #bo_w .bo_w_info:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_w .bo_w_info .frm_input{float:left;width:33%}
 #bo_w #wr_password{margin:0 0.5%  }
diff --git a/theme/basic/skin/board/basic/write.skin.php b/theme/basic/skin/board/basic/write.skin.php
index 2f2b23b71..ea78e5bc4 100644
--- a/theme/basic/skin/board/basic/write.skin.php
+++ b/theme/basic/skin/board/basic/write.skin.php
@@ -55,7 +55,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     ?>
 
     <?php if ($is_category) { ?>
-    <div class="bo_w_select">
+    <div class="bo_w_select write_div">
         <label for="ca_name"  class="sound_only">분류<strong>필수</strong></label>
         <select name="ca_name" id="ca_name" required>
             <option value="">분류를 선택하세요</option>
@@ -64,7 +64,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
     <?php } ?>
 
-    <div class="bo_w_info">
+    <div class="bo_w_info write_div">
     <?php if ($is_name) { ?>
         <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
         <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input required" placeholder="이름">
@@ -82,23 +82,23 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php if ($is_homepage) { ?>
-    <div>
+    <div class="write_div">
         <label for="wr_homepage" class="sound_only">홈페이지</label>
         <input type="text" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input" size="50" placeholder="홈페이지">
     </div>
     <?php } ?>
 
     <?php if ($option) { ?>
-    <div>
+    <div class="write_div">
         <span class="sound_only">옵션</span>
         <?php echo $option ?>
     </div>
     <?php } ?>
 
-    <div class="bo_w_tit">
+    <div class="bo_w_tit write_div">
         <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
         
-        <div id="autosave_wrapper">
+        <div id="autosave_wrapper write_div">
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" size="50" maxlength="255" placeholder="제목">
             <?php if ($is_member) { // 임시 저장된 글 기능 ?>
             <script src="<?php echo G5_JS_URL; ?>/autosave.js"></script>
@@ -114,7 +114,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         
     </div>
 
-    <div>
+    <div class="write_div">
         <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
         <div class="wr_content <?php echo $is_dhtml_editor ? $config['cf_editor'] : ''; ?>">
             <?php if($write_min || $write_max) { ?>
@@ -131,15 +131,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-    <div class="bo_w_link">
+    <div class="bo_w_link write_div">
         <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i><span class="sound_only"> 링크  #<?php echo $i ?></span></label>
         <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
     </div>
     <?php } ?>
 
     <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-    <div class="bo_w_flie">
-        <div class="file_wr">
+    <div class="bo_w_flie write_div">
+        <div class="file_wr write_div">
             <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only"> 파일 #<?php echo $i+1 ?></span></label>
             <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
         </div>
@@ -158,13 +158,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php if ($is_use_captcha) { //자동등록방지  ?>
-    <div>
+    <div class="write_div">
         <?php echo $captcha_html ?>
     </div>
     <?php } ?>
 
 
-    <div class="btn_confirm">
+    <div class="btn_confirm write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel btn">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit btn">
     </div>
diff --git a/theme/basic/skin/board/gallery/style.css b/theme/basic/skin/board/gallery/style.css
index 3218d469e..217c46139 100644
--- a/theme/basic/skin/board/gallery/style.css
+++ b/theme/basic/skin/board/gallery/style.css
@@ -362,7 +362,7 @@ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 #bo_vc_sns input {margin:0 5px 0 0 }
 
 /*글쓰기*/
-#bo_w div{margin:10px 0;position:relative;}
+#bo_w .write_div{margin:10px 0;position:relative}
 #bo_w .bo_w_info:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_w .bo_w_info .frm_input{float:left;width:33%}
 #bo_w #wr_password{margin:0 0.5%  }
diff --git a/theme/basic/skin/board/gallery/write.skin.php b/theme/basic/skin/board/gallery/write.skin.php
index fe395b1cc..50330a292 100644
--- a/theme/basic/skin/board/gallery/write.skin.php
+++ b/theme/basic/skin/board/gallery/write.skin.php
@@ -55,7 +55,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     ?>
 
     <?php if ($is_category) { ?>
-    <div class="bo_w_select">
+    <div class="bo_w_select write_div">
         <label for="ca_name"  class="sound_only">분류<strong>필수</strong></label>
         <select name="ca_name" id="ca_name" required>
             <option value="">분류를 선택하세요</option>
@@ -65,7 +65,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <?php } ?>
 
 
-    <div class="bo_w_info">
+    <div class="bo_w_info write_div">
     <?php if ($is_name) { ?>
         <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
         <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input required" placeholder="이름">
@@ -83,23 +83,23 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php if ($is_homepage) { ?>
-    <div>
+    <div class="write_div">
         <label for="wr_homepage" class="sound_only">홈페이지</label>
         <input type="text" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input" size="50" placeholder="홈페이지">
     </div>
     <?php } ?>
 
     <?php if ($option) { ?>
-    <div>
+    <div class="write_div">
         <span class="sound_only">옵션</span>
         <?php echo $option ?>
     </div>
     <?php } ?>
 
-    <div class="bo_w_tit">
+    <div class="bo_w_tit write_div">
         <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
         
-        <div id="autosave_wrapper">
+        <div id="autosave_wrapper write_div">
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" size="50" maxlength="255" placeholder="제목">
             <?php if ($is_member) { // 임시 저장된 글 기능 ?>
             <script src="<?php echo G5_JS_URL; ?>/autosave.js"></script>
@@ -115,7 +115,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         
     </div>
 
-    <div>
+    <div class="write_div">
         <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
         <div class="wr_content <?php echo $is_dhtml_editor ? $config['cf_editor'] : ''; ?>">
             <?php if($write_min || $write_max) { ?>
@@ -133,15 +133,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-    <div class="bo_w_link">
+    <div class="bo_w_link write_div">
         <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i><span class="sound_only"> 링크  #<?php echo $i ?></span></label>
         <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
     </div>
     <?php } ?>
 
     <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-    <div class="bo_w_flie">
-        <div class="file_wr">
+    <div class="bo_w_flie write_div">
+        <div class="file_wr write_div">
             <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only"> 파일 #<?php echo $i+1 ?></span></label>
             <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
         </div>
@@ -160,13 +160,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php if ($is_use_captcha) { //자동등록방지  ?>
-    <div>
+    <div class="write_div">
         <?php echo $captcha_html ?>
     </div>
     <?php } ?>
 
 
-    <div class="btn_confirm">
+    <div class="btn_confirm write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel btn">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit btn">
     </div>

From fab5f673d9cc167c95921a5f2859c04aa760f0f0 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Tue, 16 Jan 2018 15:43:14 +0900
Subject: [PATCH 06/17] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EA=B5=AC=EB=AC=B8?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/write.php                                 |  2 +-
 bbs/write_update.php                          |  2 +-
 css/mobile.css                                |  2 +-
 mobile/skin/board/basic/write.skin.php        | 28 +++++++++----------
 mobile/skin/board/gallery/write.skin.php      | 28 +++++++++----------
 theme/basic/css/mobile.css                    |  2 +-
 .../mobile/skin/board/basic/write.skin.php    | 28 +++++++++----------
 .../mobile/skin/board/gallery/write.skin.php  | 26 ++++++++---------
 8 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/bbs/write.php b/bbs/write.php
index a830033e5..78d5a975e 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) && !$is_admin) ? 1 : 0;
+$is_use_captcha = ((!empty($board['bo_use_captcha'] && $w!=='u') || $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 672a9540b..d3d1c005f 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) && !$is_admin) ? 1 : 0;
+$is_use_captcha = ((!empty($board['bo_use_captcha'] && $w!=='u') || $is_guest) && !$is_admin) ? 1 : 0;
 
 if ($is_use_captcha && !chk_captcha()) {
     alert('자동등록방지 숫자가 틀렸습니다.');
diff --git a/css/mobile.css b/css/mobile.css
index 4fbecb162..e70946244 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -236,7 +236,7 @@ a.btn_admin:focus, a.btn_admin:hover {}
 
 /* 기본폼 */
 .form_01{margin:10px}
-.form_01 div{margin:5px 0;position:relative}
+.form_01 .write_div{margin:5px 0;position:relative}
 .form_01 li{margin:5px 0;position:relative}
 .form_01 textarea, .frm_input {border:1px solid #ccc;background:#fff;color:#000;vertical-align:middle;border-radius:3px;padding:5px;}
 .form_01 textarea {width:100%;height:100px}
diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php
index eafd2f190..31e01e4cf 100644
--- a/mobile/skin/board/basic/write.skin.php
+++ b/mobile/skin/board/basic/write.skin.php
@@ -49,11 +49,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     echo $option_hidden;
     ?>
-    <div class="form_01">
+    <div class="form_01 write_div">
         <h2 class="sound_only"><?php echo $g5['title'] ?></h2>
 
         <?php if ($is_category) { ?>
-        <div class="bo_w_select">
+        <div class="bo_w_select write_div">
             <label for="ca_name" class="sound_only">분류<strong>필수</strong></label>
             <select id="ca_name" name="ca_name" required>
                 <option value="">선택하세요</option>
@@ -63,46 +63,46 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?> 
         
         <?php if ($is_name) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
             <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input full_input required" maxlength="20" placeholder="이름">
         </div>
         <?php } ?>
 
         <?php if ($is_password) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_password" class="sound_only">비밀번호<strong>필수</strong></label>
             <input type="password" name="wr_password" id="wr_password" <?php echo $password_required ?> class="frm_input full_input <?php echo $password_required ?>" maxlength="20" placeholder="비밀번호">
         </div>
         <?php } ?>
 
         <?php if ($is_email) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
             <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input  email" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 
         <?php if ($is_homepage) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_homepage" class="sound_only">홈페이지</label>
             <input type="url" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input " placeholder="홈페이지">
         </div>
         <?php } ?>
 
         <?php if ($option) { ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">옵션</span>
             <?php echo $option ?>
         </div>
         <?php } ?>
 
-        <div class="bo_w_tit">
+        <div class="bo_w_tit write_div">
             <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" placeholder="제목">
         </div>
 
-        <div>
+        <div class="write_div">
             <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
             <?php if($write_min || $write_max) { ?>
             <!-- 최소/최대 글자 수 사용 시 -->
@@ -117,7 +117,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
         <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-        <div class="bo_w_link">
+        <div class="bo_w_link write_div">
             <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i> <span class="sound_only">링크 #<?php echo $i ?></span></label>
             <input type="url" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input wr_link">
         </div>
@@ -125,8 +125,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         
         <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-        <div class="bo_w_flie">
-            <div class="file_wr">
+        <div class="bo_w_flie write_div">
+            <div class="file_wr write_div">
                 <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only">파일 #<?php echo $i+1 ?></span></label>
                 <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
             </div>
@@ -144,7 +144,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?>
 
         <?php if ($is_use_captcha) { //자동등록방지 ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">자동등록방지</span>
             <?php echo $captcha_html ?>
             
@@ -153,7 +153,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     </div>
 
-    <div class="btn_top top">
+    <div class="btn_top top write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
     </div>
diff --git a/mobile/skin/board/gallery/write.skin.php b/mobile/skin/board/gallery/write.skin.php
index eafd2f190..31e01e4cf 100644
--- a/mobile/skin/board/gallery/write.skin.php
+++ b/mobile/skin/board/gallery/write.skin.php
@@ -49,11 +49,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     echo $option_hidden;
     ?>
-    <div class="form_01">
+    <div class="form_01 write_div">
         <h2 class="sound_only"><?php echo $g5['title'] ?></h2>
 
         <?php if ($is_category) { ?>
-        <div class="bo_w_select">
+        <div class="bo_w_select write_div">
             <label for="ca_name" class="sound_only">분류<strong>필수</strong></label>
             <select id="ca_name" name="ca_name" required>
                 <option value="">선택하세요</option>
@@ -63,46 +63,46 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?> 
         
         <?php if ($is_name) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
             <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input full_input required" maxlength="20" placeholder="이름">
         </div>
         <?php } ?>
 
         <?php if ($is_password) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_password" class="sound_only">비밀번호<strong>필수</strong></label>
             <input type="password" name="wr_password" id="wr_password" <?php echo $password_required ?> class="frm_input full_input <?php echo $password_required ?>" maxlength="20" placeholder="비밀번호">
         </div>
         <?php } ?>
 
         <?php if ($is_email) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
             <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input  email" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 
         <?php if ($is_homepage) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_homepage" class="sound_only">홈페이지</label>
             <input type="url" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input " placeholder="홈페이지">
         </div>
         <?php } ?>
 
         <?php if ($option) { ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">옵션</span>
             <?php echo $option ?>
         </div>
         <?php } ?>
 
-        <div class="bo_w_tit">
+        <div class="bo_w_tit write_div">
             <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" placeholder="제목">
         </div>
 
-        <div>
+        <div class="write_div">
             <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
             <?php if($write_min || $write_max) { ?>
             <!-- 최소/최대 글자 수 사용 시 -->
@@ -117,7 +117,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
         <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-        <div class="bo_w_link">
+        <div class="bo_w_link write_div">
             <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i> <span class="sound_only">링크 #<?php echo $i ?></span></label>
             <input type="url" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input wr_link">
         </div>
@@ -125,8 +125,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         
         <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-        <div class="bo_w_flie">
-            <div class="file_wr">
+        <div class="bo_w_flie write_div">
+            <div class="file_wr write_div">
                 <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only">파일 #<?php echo $i+1 ?></span></label>
                 <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
             </div>
@@ -144,7 +144,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?>
 
         <?php if ($is_use_captcha) { //자동등록방지 ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">자동등록방지</span>
             <?php echo $captcha_html ?>
             
@@ -153,7 +153,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     </div>
 
-    <div class="btn_top top">
+    <div class="btn_top top write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
     </div>
diff --git a/theme/basic/css/mobile.css b/theme/basic/css/mobile.css
index 1139d0293..57bcb752d 100644
--- a/theme/basic/css/mobile.css
+++ b/theme/basic/css/mobile.css
@@ -236,7 +236,7 @@ a.btn_admin:focus, a.btn_admin:hover {}
 
 /* 기본폼 */
 .form_01{margin:10px}
-.form_01 div{margin:5px 0;position:relative}
+.form_01 .write_div{margin:5px 0;position:relative}
 .form_01 li{margin:5px 0;position:relative}
 .form_01 textarea, .frm_input {border:1px solid #ccc;background:#fff;color:#000;vertical-align:middle;border-radius:3px;padding:5px;}
 .form_01 textarea {width:100%;height:100px}
diff --git a/theme/basic/mobile/skin/board/basic/write.skin.php b/theme/basic/mobile/skin/board/basic/write.skin.php
index eafd2f190..31e01e4cf 100644
--- a/theme/basic/mobile/skin/board/basic/write.skin.php
+++ b/theme/basic/mobile/skin/board/basic/write.skin.php
@@ -49,11 +49,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     echo $option_hidden;
     ?>
-    <div class="form_01">
+    <div class="form_01 write_div">
         <h2 class="sound_only"><?php echo $g5['title'] ?></h2>
 
         <?php if ($is_category) { ?>
-        <div class="bo_w_select">
+        <div class="bo_w_select write_div">
             <label for="ca_name" class="sound_only">분류<strong>필수</strong></label>
             <select id="ca_name" name="ca_name" required>
                 <option value="">선택하세요</option>
@@ -63,46 +63,46 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?> 
         
         <?php if ($is_name) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
             <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input full_input required" maxlength="20" placeholder="이름">
         </div>
         <?php } ?>
 
         <?php if ($is_password) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_password" class="sound_only">비밀번호<strong>필수</strong></label>
             <input type="password" name="wr_password" id="wr_password" <?php echo $password_required ?> class="frm_input full_input <?php echo $password_required ?>" maxlength="20" placeholder="비밀번호">
         </div>
         <?php } ?>
 
         <?php if ($is_email) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
             <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input  email" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 
         <?php if ($is_homepage) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_homepage" class="sound_only">홈페이지</label>
             <input type="url" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input " placeholder="홈페이지">
         </div>
         <?php } ?>
 
         <?php if ($option) { ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">옵션</span>
             <?php echo $option ?>
         </div>
         <?php } ?>
 
-        <div class="bo_w_tit">
+        <div class="bo_w_tit write_div">
             <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" placeholder="제목">
         </div>
 
-        <div>
+        <div class="write_div">
             <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
             <?php if($write_min || $write_max) { ?>
             <!-- 최소/최대 글자 수 사용 시 -->
@@ -117,7 +117,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
         <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-        <div class="bo_w_link">
+        <div class="bo_w_link write_div">
             <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i> <span class="sound_only">링크 #<?php echo $i ?></span></label>
             <input type="url" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input wr_link">
         </div>
@@ -125,8 +125,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         
         <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-        <div class="bo_w_flie">
-            <div class="file_wr">
+        <div class="bo_w_flie write_div">
+            <div class="file_wr write_div">
                 <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only">파일 #<?php echo $i+1 ?></span></label>
                 <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
             </div>
@@ -144,7 +144,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?>
 
         <?php if ($is_use_captcha) { //자동등록방지 ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">자동등록방지</span>
             <?php echo $captcha_html ?>
             
@@ -153,7 +153,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     </div>
 
-    <div class="btn_top top">
+    <div class="btn_top top write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
     </div>
diff --git a/theme/basic/mobile/skin/board/gallery/write.skin.php b/theme/basic/mobile/skin/board/gallery/write.skin.php
index eafd2f190..8f58887da 100644
--- a/theme/basic/mobile/skin/board/gallery/write.skin.php
+++ b/theme/basic/mobile/skin/board/gallery/write.skin.php
@@ -49,7 +49,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     echo $option_hidden;
     ?>
-    <div class="form_01">
+    <div class="form_01 write_div">
         <h2 class="sound_only"><?php echo $g5['title'] ?></h2>
 
         <?php if ($is_category) { ?>
@@ -63,46 +63,46 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?> 
         
         <?php if ($is_name) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
             <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input full_input required" maxlength="20" placeholder="이름">
         </div>
         <?php } ?>
 
         <?php if ($is_password) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_password" class="sound_only">비밀번호<strong>필수</strong></label>
             <input type="password" name="wr_password" id="wr_password" <?php echo $password_required ?> class="frm_input full_input <?php echo $password_required ?>" maxlength="20" placeholder="비밀번호">
         </div>
         <?php } ?>
 
         <?php if ($is_email) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
             <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input  email" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 
         <?php if ($is_homepage) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_homepage" class="sound_only">홈페이지</label>
             <input type="url" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input " placeholder="홈페이지">
         </div>
         <?php } ?>
 
         <?php if ($option) { ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">옵션</span>
             <?php echo $option ?>
         </div>
         <?php } ?>
 
-        <div class="bo_w_tit">
+        <div class="bo_w_tit write_div">
             <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" placeholder="제목">
         </div>
 
-        <div>
+        <div class="write_div">
             <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
             <?php if($write_min || $write_max) { ?>
             <!-- 최소/최대 글자 수 사용 시 -->
@@ -117,7 +117,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
         <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-        <div class="bo_w_link">
+        <div class="bo_w_link write_div">
             <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i> <span class="sound_only">링크 #<?php echo $i ?></span></label>
             <input type="url" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input wr_link">
         </div>
@@ -125,8 +125,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         
         <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-        <div class="bo_w_flie">
-            <div class="file_wr">
+        <div class="bo_w_flie write_div">
+            <div class="file_wr write_div">
                 <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only">파일 #<?php echo $i+1 ?></span></label>
                 <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
             </div>
@@ -144,7 +144,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?>
 
         <?php if ($is_use_captcha) { //자동등록방지 ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">자동등록방지</span>
             <?php echo $captcha_html ?>
             
@@ -153,7 +153,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     </div>
 
-    <div class="btn_top top">
+    <div class="btn_top top write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
     </div>

From d250c772afed8e2d990ea2f00da6d86f45cea8e0 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Tue, 16 Jan 2018 17:23:45 +0900
Subject: [PATCH 07/17] =?UTF-8?q?=EC=86=8C=EC=85=9C=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/social/Hybrid/Providers/Facebook.php |  1 +
 plugin/social/includes/functions.php        |  1 +
 plugin/social/register_member_update.php    | 32 +++++++++++++--------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/plugin/social/Hybrid/Providers/Facebook.php b/plugin/social/Hybrid/Providers/Facebook.php
index 8fd9149a1..d71d68a9b 100644
--- a/plugin/social/Hybrid/Providers/Facebook.php
+++ b/plugin/social/Hybrid/Providers/Facebook.php
@@ -53,6 +53,7 @@ class Hybrid_Providers_Facebook extends Hybrid_Provider_Model_OAuth2 {
             "client_id" => $this->api->client_id,
             "redirect_uri" => $this->api->redirect_uri,
             "state" => $token,
+            "scope" => $this->scope,
             );
         
         Hybrid_Auth::redirect($this->api->authorizeUrl($parameters));
diff --git a/plugin/social/includes/functions.php b/plugin/social/includes/functions.php
index a44dbd2d5..6f71eecc2 100644
--- a/plugin/social/includes/functions.php
+++ b/plugin/social/includes/functions.php
@@ -317,6 +317,7 @@ function social_extends_get_keys($provider){
                     "keys" => array("id" => $config['cf_facebook_appid'], "secret" => $config['cf_facebook_secret']),
                     "display"   =>  "popup",
                     "redirect_uri" => get_social_callbackurl('facebook'),
+                    "scope"   => array('email'), // optional
                     "trustForwarded" => false
                 );
 
diff --git a/plugin/social/register_member_update.php b/plugin/social/register_member_update.php
index 943775ff8..0d10211f3 100644
--- a/plugin/social/register_member_update.php
+++ b/plugin/social/register_member_update.php
@@ -24,20 +24,23 @@ $sm_id = $user_profile->sid;
 $mb_id = trim($_POST['mb_id']);
 $mb_password    = trim($_POST['mb_password']);
 $mb_password_re = trim($_POST['mb_password_re']);
-$mb_nick        = trim($_POST['mb_nick']);
+$mb_nick        = trim(strip_tags($_POST['mb_nick']));
 $mb_email       = trim($_POST['mb_email']);
-$mb_name        = clean_xss_tags(trim($_POST['mb_name']));
+$mb_name        = clean_xss_tags(trim(strip_tags($_POST['mb_name'])));
 $mb_email       = get_email_address($mb_email);
 
-// 이름, 닉네임에 utf-8 이외의 문자가 포함됐다면 오류
-// 서버환경에 따라 정상적으로 체크되지 않을 수 있음.
-$tmp_mb_name = iconv('UTF-8', 'UTF-8//IGNORE', $mb_name);
-if($tmp_mb_name != $mb_name) {
-    alert('이름을 올바르게 입력해 주십시오.');
+if( function_exists('filter_var') ){
+    $mb_nick = filter_var($mb_nick, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_HIGH);
+    $mb_name = filter_var($mb_name, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_HIGH);
+} else {
+    $mb_nick = sql_real_escape_string($mb_nick);
+    $mb_name = sql_real_escape_string($mb_name);
 }
-$tmp_mb_nick = iconv('UTF-8', 'UTF-8//IGNORE', $mb_nick);
-if($tmp_mb_nick != $mb_nick) {
-    alert('닉네임을 올바르게 입력해 주십시오.');
+
+if( ! $mb_nick || ! $mb_name ){
+    $tmp = explode('@', $mb_email);
+    $mb_nick = $mb_nick ? $mb_nick : $tmp[0];
+    $mb_name = $mb_name ? $mb_name : $tmp[0];
 }
 
 if( ! isset($mb_password) || ! $mb_password ){
@@ -76,6 +79,11 @@ if( defined('G5_SOCIAL_CERTIFY_MAIL') && G5_SOCIAL_CERTIFY_MAIL && $config['cf_u
     $mb_email_certify = '';
 }
 
+//회원 메일 동의
+$mb_mailling = (isset($_POST['mb_mailling']) && $_POST['mb_mailling']) ? 1 : 0;
+//회원 정보 공개
+$mb_open = (isset($_POST['mb_open']) && $_POST['mb_open']) ? 1 : 0;
+
 // 회원정보 입력
 $sql = " insert into {$g5['member_table']}
             set mb_id = '{$mb_id}',
@@ -90,9 +98,9 @@ $sql = " insert into {$g5['member_table']}
                 mb_ip = '{$_SERVER['REMOTE_ADDR']}',
                 mb_level = '{$config['cf_register_level']}',
                 mb_login_ip = '{$_SERVER['REMOTE_ADDR']}',
-                mb_mailling = '0',
+                mb_mailling = '{$mb_mailling}',
                 mb_sms = '0',
-                mb_open = '0',
+                mb_open = '{$mb_open}',
                 mb_open_date = '".G5_TIME_YMD."' ";
 
 $result = sql_query($sql, false);

From 99a02d692fd72c224435118b8db8233140274d9c Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 17 Jan 2018 16:53:41 +0900
Subject: [PATCH 08/17] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=EC=BD=98=20=EB=B6=88=ED=8E=B8=ED=95=9C=20=EC=A0=90=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

---
 adm/member_form.php                      |  9 +++-
 adm/member_form_update.php               | 69 ++++++++++++++++--------
 bbs/register_form_update.php             | 62 ++++++++++++++-------
 skin/board/basic/view_comment.skin.php   | 21 +++++---
 skin/member/basic/register_form.skin.php | 18 +++++--
 5 files changed, 126 insertions(+), 53 deletions(-)

diff --git a/adm/member_form.php b/adm/member_form.php
index 503fd0830..efeed3d77 100644
--- a/adm/member_form.php
+++ b/adm/member_form.php
@@ -463,8 +463,13 @@ this.form.mb_intercept_date.value=this.form.mb_intercept_date.defaultValue; }">
 <script>
 function fmember_submit(f)
 {
-    if (!f.mb_icon.value.match(/\.gif$/i) && f.mb_icon.value) {
-        alert('아이콘은 gif 파일만 가능합니다.');
+    if (!f.mb_icon.value.match(/\.(gif|jpe?g|png)$/i) && f.mb_icon.value) {
+        alert('아이콘은 이미지 파일만 가능합니다.');
+        return false;
+    }
+
+    if (!f.mb_img.value.match(/\.(gif|jpe?g|png)$/i) && f.mb_img.value) {
+        alert('회원이미지는 이미지 파일만 가능합니다.');
         return false;
     }
 
diff --git a/adm/member_form_update.php b/adm/member_form_update.php
index 93e6cbf61..30dd4e7d5 100644
--- a/adm/member_form_update.php
+++ b/adm/member_form_update.php
@@ -2,6 +2,7 @@
 $sub_menu = "200100";
 include_once("./_common.php");
 include_once(G5_LIB_PATH."/register.lib.php");
+include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 
 if ($w == 'u')
     check_demo();
@@ -120,62 +121,88 @@ else if ($w == 'u')
     if ($del_mb_icon)
         @unlink(G5_DATA_PATH.'/member/'.$mb_dir.'/'.$mb_id.'.gif');
 
+    $image_regex = "/(\.(gif|jpe?g|png))$/i";
+    $mb_icon_img = $mb_id.'.gif';
+
     // 아이콘 업로드
     if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name'])) {
-        if (!preg_match("/(\.gif)$/i", $_FILES['mb_icon']['name'])) {
-            alert($_FILES['mb_icon']['name'] . '은(는) gif 파일이 아닙니다.');
+        if (!preg_match($image_regex, $_FILES['mb_icon']['name'])) {
+            alert($_FILES['mb_icon']['name'] . '은(는) 이미지 파일이 아닙니다.');
         }
 
-        if (preg_match("/(\.gif)$/i", $_FILES['mb_icon']['name'])) {
-            @mkdir(G5_DATA_PATH.'/member/'.$mb_dir, G5_DIR_PERMISSION);
-            @chmod(G5_DATA_PATH.'/member/'.$mb_dir, G5_DIR_PERMISSION);
+        if (preg_match($image_regex, $_FILES['mb_icon']['name'])) {
+            $mb_icon_dir = G5_DATA_PATH.'/member/'.$mb_dir;
+            @mkdir($mb_icon_dir, G5_DIR_PERMISSION);
+            @chmod($mb_icon_dir, G5_DIR_PERMISSION);
 
-            $dest_path = G5_DATA_PATH.'/member/'.$mb_dir.'/'.$mb_id.'.gif';
+            $dest_path = $mb_icon_dir.'/'.$mb_icon_img;
 
             move_uploaded_file($_FILES['mb_icon']['tmp_name'], $dest_path);
             chmod($dest_path, G5_FILE_PERMISSION);
-
+            
             if (file_exists($dest_path)) {
-                $size = getimagesize($dest_path);
-                // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                $size = @getimagesize($dest_path);
                 if ($size[0] > $config['cf_member_icon_width'] || $size[1] > $config['cf_member_icon_height']) {
-                    @unlink($dest_path);
+                    $thumb = null;
+                    if($size[2] === 2 || $size[2] === 3) {
+                        //jpg 또는 png 파일 적용
+                        $thumb = thumbnail($mb_icon_img, $mb_icon_dir, $mb_icon_dir, $config['cf_member_icon_width'], $config['cf_member_icon_height'], true, true);
+                        if($thumb) {
+                            @unlink($dest_path);
+                            rename($mb_icon_dir.'/'.$thumb, $dest_path);
+                        }
+                    }
+                    if( !$thumb ){
+                        // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                        @unlink($dest_path);
+                    }
                 }
             }
         }
     }
     
     $mb_img_dir = G5_DATA_PATH.'/member_image/';
-    $mb_dir = substr($mb_id,0,2);
     if( !is_dir($mb_img_dir) ){
         @mkdir($mb_img_dir, G5_DIR_PERMISSION);
         @chmod($mb_img_dir, G5_DIR_PERMISSION);
     }
+    $mb_img_dir .= substr($mb_id,0,2);
 
     // 회원 이미지 삭제
     if ($del_mb_img)
-        @unlink($mb_img_dir.$mb_dir.'/'.$mb_id.'.gif');
+        @unlink($mb_img_dir.'/'.$mb_icon_img);
 
     // 아이콘 업로드
     if (isset($_FILES['mb_img']) && is_uploaded_file($_FILES['mb_img']['tmp_name'])) {
-        if (!preg_match("/(\.gif)$/i", $_FILES['mb_img']['name'])) {
-            alert($_FILES['mb_img']['name'] . '은(는) gif 파일이 아닙니다.');
+        if (!preg_match($image_regex, $_FILES['mb_img']['name'])) {
+            alert($_FILES['mb_img']['name'] . '은(는) 이미지 파일이 아닙니다.');
         }
         
-        if (preg_match("/(\.gif)$/i", $_FILES['mb_img']['name'])) {
-            @mkdir($mb_img_dir.$mb_dir, G5_DIR_PERMISSION);
-            @chmod($mb_img_dir.$mb_dir, G5_DIR_PERMISSION);
+        if (preg_match($image_regex, $_FILES['mb_img']['name'])) {
+            @mkdir($mb_img_dir, G5_DIR_PERMISSION);
+            @chmod($mb_img_dir, G5_DIR_PERMISSION);
             
-            $dest_path = $mb_img_dir.$mb_dir.'/'.$mb_id.'.gif';
+            $dest_path = $mb_img_dir.'/'.$mb_icon_img;
             
             move_uploaded_file($_FILES['mb_img']['tmp_name'], $dest_path);
             chmod($dest_path, G5_FILE_PERMISSION);
 
             if (file_exists($dest_path)) {
-                $size = getimagesize($dest_path);
-                // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                $size = @getimagesize($dest_path);
                 if ($size[0] > $config['cf_member_img_width'] || $size[1] > $config['cf_member_img_height']) {
-                    @unlink($dest_path);
+                    $thumb = null;
+                    if($size[2] === 2 || $size[2] === 3) {
+                        //jpg 또는 png 파일 적용
+                        $thumb = thumbnail($mb_icon_img, $mb_img_dir, $mb_img_dir, $config['cf_member_img_width'], $config['cf_member_img_height'], true, true);
+                        if($thumb) {
+                            @unlink($dest_path);
+                            rename($mb_img_dir.'/'.$thumb, $dest_path);
+                        }
+                    }
+                    if( !$thumb ){
+                        // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                        @unlink($dest_path);
+                    }
                 }
             }
         }
diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index 278c23edc..c1a6e4d92 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -3,6 +3,7 @@ include_once('./_common.php');
 include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 include_once(G5_LIB_PATH.'/register.lib.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');
+include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 
 // 리퍼러 체크
 referer_check();
@@ -362,13 +363,16 @@ $msg = "";
 
 // 아이콘 업로드
 $mb_icon = '';
+$image_regex = "/(\.(gif|jpe?g|png))$/i";
+$mb_icon_img = $mb_id.'.gif';
+
 if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name'])) {
-    if (preg_match("/(\.gif)$/i", $_FILES['mb_icon']['name'])) {
+    if (preg_match($image_regex, $_FILES['mb_icon']['name'])) {
         // 아이콘 용량이 설정값보다 이하만 업로드 가능
         if ($_FILES['mb_icon']['size'] <= $config['cf_member_icon_size']) {
             @mkdir($mb_dir, G5_DIR_PERMISSION);
             @chmod($mb_dir, G5_DIR_PERMISSION);
-            $dest_path = $mb_dir.'/'.$mb_id.'.gif';
+            $dest_path = $mb_dir.'/'.$mb_icon_img;
             move_uploaded_file($_FILES['mb_icon']['tmp_name'], $dest_path);
             chmod($dest_path, G5_FILE_PERMISSION);
             if (file_exists($dest_path)) {
@@ -377,13 +381,24 @@ if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name']
                 // gif 파일에 악성코드를 심어 업로드 하는 경우를 방지
                 // 에러메세지는 출력하지 않는다.
                 //-----------------------------------------------------------------
-                $size = getimagesize($dest_path);
-                if ($size[2] != 1) // gif 파일이 아니면 올라간 이미지를 삭제한다.
-                    @unlink($dest_path);
-                else
-                // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
-                if ($size[0] > $config['cf_member_icon_width'] || $size[1] > $config['cf_member_icon_height'])
+                $size = @getimagesize($dest_path);
+                if (!($size[2] === 1 || $size[2] === 2 || $size[2] === 3)) { // jpg, gif, png 파일이 아니면 올라간 이미지를 삭제한다.
                     @unlink($dest_path);
+                } else if ($size[0] > $config['cf_member_icon_width'] || $size[1] > $config['cf_member_icon_height']) {
+                    $thumb = null;
+                    if($size[2] === 2 || $size[2] === 3) {
+                        //jpg 또는 png 파일 적용
+                        $thumb = thumbnail($mb_icon_img, $mb_dir, $mb_dir, $config['cf_member_icon_width'], $config['cf_member_icon_height'], true, true);
+                        if($thumb) {
+                            @unlink($dest_path);
+                            rename($mb_dir.'/'.$thumb, $dest_path);
+                        }
+                    }
+                    if( !$thumb ){
+                        // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                        @unlink($dest_path);
+                    }
+                }
                 //=================================================================\
             }
         } else {
@@ -391,7 +406,7 @@ if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name']
         }
 
     } else {
-        $msg .= $_FILES['mb_icon']['name'].'은(는) gif 파일이 아닙니다.';
+        $msg .= $_FILES['mb_icon']['name'].'은(는) 이미지 파일이 아닙니다.';
     }
 }
 
@@ -406,7 +421,7 @@ if( $config['cf_member_img_size'] && $config['cf_member_img_width'] && $config['
 
     // 아이콘 삭제
     if (isset($_POST['del_mb_img'])) {
-        @unlink($mb_dir.'/'.$mb_id.'.gif');
+        @unlink($mb_dir.'/'.$mb_icon_img);
     }
 
     $msg = '';
@@ -414,22 +429,33 @@ if( $config['cf_member_img_size'] && $config['cf_member_img_width'] && $config['
     // 회원 프로필 이미지 업로드
     $mb_img = '';
     if (isset($_FILES['mb_img']) && is_uploaded_file($_FILES['mb_img']['tmp_name'])) {
-        if (preg_match("/(\.gif)$/i", $_FILES['mb_img']['name']) || preg_match("/(\.jpg)$/i", $_FILES['mb_img']['name'])) {
+        if (preg_match($image_regex, $_FILES['mb_img']['name'])) {
             // 아이콘 용량이 설정값보다 이하만 업로드 가능
             if ($_FILES['mb_icon']['size'] <= $config['cf_member_img_size']) {
                 @mkdir($mb_dir, G5_DIR_PERMISSION);
                 @chmod($mb_dir, G5_DIR_PERMISSION);
-                $dest_path = $mb_dir.'/'.$mb_id.'.gif';
+                $dest_path = $mb_dir.'/'.$mb_icon_img;
                 move_uploaded_file($_FILES['mb_img']['tmp_name'], $dest_path);
                 chmod($dest_path, G5_FILE_PERMISSION);
                 if (file_exists($dest_path)) {
-                    $size = getimagesize($dest_path);
-                    if ( ! ($size[2] === 1 || $size[2] === 2) ) // gif 또는 jpg 파일이 아니면 올라간 이미지를 삭제한다.
-                        @unlink($dest_path);
-                    else
-                    // 이미지의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
-                    if ($size[0] > $config['cf_member_img_width'] || $size[1] > $config['cf_member_img_height'])
+                    $size = @getimagesize($dest_path);
+                    if (!($size[2] === 1 || $size[2] === 2 || $size[2] === 3)) { // gif jpg png 파일이 아니면 올라간 이미지를 삭제한다.
                         @unlink($dest_path);
+                    } else if ($size[0] > $config['cf_member_img_width'] || $size[1] > $config['cf_member_img_height']) {
+                        $thumb = null;
+                        if($size[2] === 2 || $size[2] === 3) {
+                            //jpg 또는 png 파일 적용
+                            $thumb = thumbnail($mb_icon_img, $mb_dir, $mb_dir, $config['cf_member_img_width'], $config['cf_member_img_height'], true, true);
+                            if($thumb) {
+                                @unlink($dest_path);
+                                rename($mb_dir.'/'.$thumb, $dest_path);
+                            }
+                        }
+                        if( !$thumb ){
+                            // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                            @unlink($dest_path);
+                        }
+                    }
                     //=================================================================\
                 }
             } else {
diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php
index 9f5e56b1d..a372ff01f 100644
--- a/skin/board/basic/view_comment.skin.php
+++ b/skin/board/basic/view_comment.skin.php
@@ -88,7 +88,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 <!-- 댓글 쓰기 시작 { -->
 <aside id="bo_vc_w" class="bo_vc_w">
     <h2>댓글쓰기</h2>
-    <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
+    <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
     <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
     <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
     <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -107,10 +107,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
     <script>
     $(document).on("keyup change", "textarea#wr_content[maxlength]", function() {
-        var sdiv = $(this).val()
-        var mx = parseInt($(this).atdiv("maxlength"))
-        if (sdiv.length > mx) {
-            $(this).val(sdiv.subsdiv(0, mx));
+        var str = $(this).val()
+        var mx = parseInt($(this).attr("maxlength"))
+        if (str.length > mx) {
+            $(this).val(str.substr(0, mx));
             return false;
         }
     });
@@ -245,7 +245,10 @@ function fviewcomment_submit(f)
 
 function comment_box(comment_id, work)
 {
-    var el_id;
+    var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
     // 댓글 아이디가 넘어오면 답변, 수정
     if (comment_id)
     {
@@ -262,11 +265,13 @@ function comment_box(comment_id, work)
         if (save_before)
         {
             document.getElementById(save_before).style.display = 'none';
-            document.getElementById(save_before).innerHTML = '';
         }
 
         document.getElementById(el_id).style.display = '';
-        document.getElementById(el_id).innerHTML = save_html;
+        document.getElementById(el_id).appendChild(respond);
+        //입력값 초기화
+        document.getElementById('wr_content').value = '';
+        
         // 댓글 수정
         if (work == 'cu')
         {
diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php
index 863d3d5c2..933dfc5a1 100644
--- a/skin/member/basic/register_form.skin.php
+++ b/skin/member/basic/register_form.skin.php
@@ -177,7 +177,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                                 
                 <span class="frm_info">
                     이미지 크기는 가로 <?php echo $config['cf_member_icon_width'] ?>픽셀, 세로 <?php echo $config['cf_member_icon_height'] ?>픽셀 이하로 해주세요.<br>
-                    gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
+                    gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
                 </span>
 
                 <?php if ($w == 'u' && file_exists($mb_icon_path)) {  ?>
@@ -196,7 +196,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                                 
                 <span class="frm_info">
                     이미지 크기는 가로 <?php echo $config['cf_member_img_width'] ?>픽셀, 세로 <?php echo $config['cf_member_img_height'] ?>픽셀 이하로 해주세요.<br>
-                    gif 또는 jpg만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
+                    gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
                 </span>
 
                 <?php if ($w == 'u' && file_exists($mb_img_path)) {  ?>
@@ -417,14 +417,24 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 
         if (typeof f.mb_icon != "undefined") {
             if (f.mb_icon.value) {
-                if (!f.mb_icon.value.toLowerCase().match(/.(gif)$/i)) {
-                    alert("회원아이콘이 gif 파일이 아닙니다.");
+                if (!f.mb_icon.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원아이콘이 이미지 파일이 아닙니다.");
                     f.mb_icon.focus();
                     return false;
                 }
             }
         }
 
+        if (typeof f.mb_img != "undefined") {
+            if (f.mb_img.value) {
+                if (!f.mb_img.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원이미지가 이미지 파일이 아닙니다.");
+                    f.mb_img.focus();
+                    return false;
+                }
+            }
+        }
+
         if (typeof(f.mb_recommend) != "undefined" && f.mb_recommend.value) {
             if (f.mb_id.value == f.mb_recommend.value) {
                 alert("본인을 추천할 수 없습니다.");

From eff027939cdaee9ed260fb5cf1e8a4dc611f60ef Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 17 Jan 2018 17:07:38 +0900
Subject: [PATCH 09/17] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EB=B6=80=EB=B6=84?=
 =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skin/board/gallery/view_comment.skin.php      | 21 ++++++++++++-------
 .../skin/board/basic/view_comment.skin.php    | 21 ++++++++++++-------
 .../skin/board/gallery/view_comment.skin.php  | 21 ++++++++++++-------
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php
index 9f5e56b1d..a372ff01f 100644
--- a/skin/board/gallery/view_comment.skin.php
+++ b/skin/board/gallery/view_comment.skin.php
@@ -88,7 +88,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 <!-- 댓글 쓰기 시작 { -->
 <aside id="bo_vc_w" class="bo_vc_w">
     <h2>댓글쓰기</h2>
-    <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
+    <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
     <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
     <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
     <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -107,10 +107,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
     <script>
     $(document).on("keyup change", "textarea#wr_content[maxlength]", function() {
-        var sdiv = $(this).val()
-        var mx = parseInt($(this).atdiv("maxlength"))
-        if (sdiv.length > mx) {
-            $(this).val(sdiv.subsdiv(0, mx));
+        var str = $(this).val()
+        var mx = parseInt($(this).attr("maxlength"))
+        if (str.length > mx) {
+            $(this).val(str.substr(0, mx));
             return false;
         }
     });
@@ -245,7 +245,10 @@ function fviewcomment_submit(f)
 
 function comment_box(comment_id, work)
 {
-    var el_id;
+    var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
     // 댓글 아이디가 넘어오면 답변, 수정
     if (comment_id)
     {
@@ -262,11 +265,13 @@ function comment_box(comment_id, work)
         if (save_before)
         {
             document.getElementById(save_before).style.display = 'none';
-            document.getElementById(save_before).innerHTML = '';
         }
 
         document.getElementById(el_id).style.display = '';
-        document.getElementById(el_id).innerHTML = save_html;
+        document.getElementById(el_id).appendChild(respond);
+        //입력값 초기화
+        document.getElementById('wr_content').value = '';
+        
         // 댓글 수정
         if (work == 'cu')
         {
diff --git a/theme/basic/skin/board/basic/view_comment.skin.php b/theme/basic/skin/board/basic/view_comment.skin.php
index 9f5e56b1d..a372ff01f 100644
--- a/theme/basic/skin/board/basic/view_comment.skin.php
+++ b/theme/basic/skin/board/basic/view_comment.skin.php
@@ -88,7 +88,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 <!-- 댓글 쓰기 시작 { -->
 <aside id="bo_vc_w" class="bo_vc_w">
     <h2>댓글쓰기</h2>
-    <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
+    <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
     <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
     <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
     <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -107,10 +107,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
     <script>
     $(document).on("keyup change", "textarea#wr_content[maxlength]", function() {
-        var sdiv = $(this).val()
-        var mx = parseInt($(this).atdiv("maxlength"))
-        if (sdiv.length > mx) {
-            $(this).val(sdiv.subsdiv(0, mx));
+        var str = $(this).val()
+        var mx = parseInt($(this).attr("maxlength"))
+        if (str.length > mx) {
+            $(this).val(str.substr(0, mx));
             return false;
         }
     });
@@ -245,7 +245,10 @@ function fviewcomment_submit(f)
 
 function comment_box(comment_id, work)
 {
-    var el_id;
+    var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
     // 댓글 아이디가 넘어오면 답변, 수정
     if (comment_id)
     {
@@ -262,11 +265,13 @@ function comment_box(comment_id, work)
         if (save_before)
         {
             document.getElementById(save_before).style.display = 'none';
-            document.getElementById(save_before).innerHTML = '';
         }
 
         document.getElementById(el_id).style.display = '';
-        document.getElementById(el_id).innerHTML = save_html;
+        document.getElementById(el_id).appendChild(respond);
+        //입력값 초기화
+        document.getElementById('wr_content').value = '';
+        
         // 댓글 수정
         if (work == 'cu')
         {
diff --git a/theme/basic/skin/board/gallery/view_comment.skin.php b/theme/basic/skin/board/gallery/view_comment.skin.php
index 9f5e56b1d..a372ff01f 100644
--- a/theme/basic/skin/board/gallery/view_comment.skin.php
+++ b/theme/basic/skin/board/gallery/view_comment.skin.php
@@ -88,7 +88,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 <!-- 댓글 쓰기 시작 { -->
 <aside id="bo_vc_w" class="bo_vc_w">
     <h2>댓글쓰기</h2>
-    <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
+    <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
     <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
     <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
     <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -107,10 +107,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
     <script>
     $(document).on("keyup change", "textarea#wr_content[maxlength]", function() {
-        var sdiv = $(this).val()
-        var mx = parseInt($(this).atdiv("maxlength"))
-        if (sdiv.length > mx) {
-            $(this).val(sdiv.subsdiv(0, mx));
+        var str = $(this).val()
+        var mx = parseInt($(this).attr("maxlength"))
+        if (str.length > mx) {
+            $(this).val(str.substr(0, mx));
             return false;
         }
     });
@@ -245,7 +245,10 @@ function fviewcomment_submit(f)
 
 function comment_box(comment_id, work)
 {
-    var el_id;
+    var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
     // 댓글 아이디가 넘어오면 답변, 수정
     if (comment_id)
     {
@@ -262,11 +265,13 @@ function comment_box(comment_id, work)
         if (save_before)
         {
             document.getElementById(save_before).style.display = 'none';
-            document.getElementById(save_before).innerHTML = '';
         }
 
         document.getElementById(el_id).style.display = '';
-        document.getElementById(el_id).innerHTML = save_html;
+        document.getElementById(el_id).appendChild(respond);
+        //입력값 초기화
+        document.getElementById('wr_content').value = '';
+        
         // 댓글 수정
         if (work == 'cu')
         {

From 75b8241e9180407b980603ec3aff4514e885102d Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 17 Jan 2018 17:24:52 +0900
Subject: [PATCH 10/17] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=8A=A4?=
 =?UTF-8?q?=ED=82=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/skin/board/basic/view_comment.skin.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/mobile/skin/board/basic/view_comment.skin.php b/mobile/skin/board/basic/view_comment.skin.php
index 09e4c0b5e..06dd49ea2 100644
--- a/mobile/skin/board/basic/view_comment.skin.php
+++ b/mobile/skin/board/basic/view_comment.skin.php
@@ -84,7 +84,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     ?>
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
-        <form name="fviewcomment" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
+        <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
         <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
         <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
         <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -246,7 +246,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
     function comment_box(comment_id, work)
     {
-        var el_id;
+        var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
         // 댓글 아이디가 넘어오면 답변, 수정
         if (comment_id)
         {
@@ -263,11 +266,13 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             if (save_before)
             {
                 document.getElementById(save_before).style.display = 'none';
-                document.getElementById(save_before).innerHTML = '';
             }
 
             document.getElementById(el_id).style.display = '';
-            document.getElementById(el_id).innerHTML = save_html;
+            document.getElementById(el_id).appendChild(respond);
+            //입력값 초기화
+            document.getElementById('wr_content').value = '';
+
             // 댓글 수정
             if (work == 'cu')
             {

From 365b5e53a9f23f50713f6cf98a6baf8b91c8104d Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 17 Jan 2018 17:33:46 +0900
Subject: [PATCH 11/17] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EB=8C=93?=
 =?UTF-8?q?=EA=B8=80=20=EC=8A=A4=ED=82=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/skin/board/gallery/view_comment.skin.php     | 13 +++++++++----
 .../mobile/skin/board/basic/view_comment.skin.php   | 13 +++++++++----
 .../mobile/skin/board/gallery/view_comment.skin.php | 13 +++++++++----
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/mobile/skin/board/gallery/view_comment.skin.php b/mobile/skin/board/gallery/view_comment.skin.php
index 09e4c0b5e..06dd49ea2 100644
--- a/mobile/skin/board/gallery/view_comment.skin.php
+++ b/mobile/skin/board/gallery/view_comment.skin.php
@@ -84,7 +84,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     ?>
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
-        <form name="fviewcomment" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
+        <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
         <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
         <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
         <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -246,7 +246,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
     function comment_box(comment_id, work)
     {
-        var el_id;
+        var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
         // 댓글 아이디가 넘어오면 답변, 수정
         if (comment_id)
         {
@@ -263,11 +266,13 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             if (save_before)
             {
                 document.getElementById(save_before).style.display = 'none';
-                document.getElementById(save_before).innerHTML = '';
             }
 
             document.getElementById(el_id).style.display = '';
-            document.getElementById(el_id).innerHTML = save_html;
+            document.getElementById(el_id).appendChild(respond);
+            //입력값 초기화
+            document.getElementById('wr_content').value = '';
+
             // 댓글 수정
             if (work == 'cu')
             {
diff --git a/theme/basic/mobile/skin/board/basic/view_comment.skin.php b/theme/basic/mobile/skin/board/basic/view_comment.skin.php
index fd25ffa59..06dd49ea2 100644
--- a/theme/basic/mobile/skin/board/basic/view_comment.skin.php
+++ b/theme/basic/mobile/skin/board/basic/view_comment.skin.php
@@ -84,7 +84,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     ?>
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
-        <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
+        <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
         <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
         <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
         <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -246,7 +246,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
     function comment_box(comment_id, work)
     {
-        var el_id;
+        var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
         // 댓글 아이디가 넘어오면 답변, 수정
         if (comment_id)
         {
@@ -263,11 +266,13 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             if (save_before)
             {
                 document.getElementById(save_before).style.display = 'none';
-                document.getElementById(save_before).innerHTML = '';
             }
 
             document.getElementById(el_id).style.display = '';
-            document.getElementById(el_id).innerHTML = save_html;
+            document.getElementById(el_id).appendChild(respond);
+            //입력값 초기화
+            document.getElementById('wr_content').value = '';
+
             // 댓글 수정
             if (work == 'cu')
             {
diff --git a/theme/basic/mobile/skin/board/gallery/view_comment.skin.php b/theme/basic/mobile/skin/board/gallery/view_comment.skin.php
index fd25ffa59..06dd49ea2 100644
--- a/theme/basic/mobile/skin/board/gallery/view_comment.skin.php
+++ b/theme/basic/mobile/skin/board/gallery/view_comment.skin.php
@@ -84,7 +84,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     ?>
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
-        <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
+        <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
         <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
         <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
         <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -246,7 +246,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
     function comment_box(comment_id, work)
     {
-        var el_id;
+        var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
         // 댓글 아이디가 넘어오면 답변, 수정
         if (comment_id)
         {
@@ -263,11 +266,13 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             if (save_before)
             {
                 document.getElementById(save_before).style.display = 'none';
-                document.getElementById(save_before).innerHTML = '';
             }
 
             document.getElementById(el_id).style.display = '';
-            document.getElementById(el_id).innerHTML = save_html;
+            document.getElementById(el_id).appendChild(respond);
+            //입력값 초기화
+            document.getElementById('wr_content').value = '';
+
             // 댓글 수정
             if (work == 'cu')
             {

From ffb3cb7fd86f622f2d7f4a4c01eeab5a597ea376 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Thu, 18 Jan 2018 10:33:37 +0900
Subject: [PATCH 12/17] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EC=86=8C=EC=85=9C?=
 =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=86=8C=EC=8A=A4=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

---
 plugin/social/includes/functions.php     |  7 +++++++
 plugin/social/register_member_update.php | 15 +++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/plugin/social/includes/functions.php b/plugin/social/includes/functions.php
index 6f71eecc2..ed06441ec 100644
--- a/plugin/social/includes/functions.php
+++ b/plugin/social/includes/functions.php
@@ -327,6 +327,9 @@ function social_extends_get_keys($provider){
                     "keys" => array("id" => $config['cf_google_clientid'],
                     "secret" => $config['cf_google_secret']),
                     "redirect_uri" => get_social_callbackurl('google'),
+                    "scope"   => "https://www.googleapis.com/auth/plus.login ". // optional
+                                    "https://www.googleapis.com/auth/plus.me ". // optional
+                                    "https://www.googleapis.com/auth/plus.profile.emails.read", // optional
                     //"access_type"     => "offline",   // optional
                     //"approval_prompt" => "force",     // optional
                 );
@@ -470,6 +473,10 @@ function social_check_login_before($p_service=''){
             // then grab the user profile 
             $user_profile = $adapter->getUserProfile();
 
+            if( ! (isset($_SESSION['sl_userprofile']) && is_array($_SESSION['sl_userprofile'])) ){ 
+                $_SESSION['sl_userprofile'] = array(); 
+            }
+
             if( ! $is_member ){ 
                 $_SESSION['sl_userprofile'][$provider_name] = json_encode( $user_profile );
             }
diff --git a/plugin/social/register_member_update.php b/plugin/social/register_member_update.php
index 0d10211f3..2fbec2f98 100644
--- a/plugin/social/register_member_update.php
+++ b/plugin/social/register_member_update.php
@@ -29,12 +29,15 @@ $mb_email       = trim($_POST['mb_email']);
 $mb_name        = clean_xss_tags(trim(strip_tags($_POST['mb_name'])));
 $mb_email       = get_email_address($mb_email);
 
-if( function_exists('filter_var') ){
-    $mb_nick = filter_var($mb_nick, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_HIGH);
-    $mb_name = filter_var($mb_name, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_HIGH);
-} else {
-    $mb_nick = sql_real_escape_string($mb_nick);
-    $mb_name = sql_real_escape_string($mb_name);
+// 이름, 닉네임에 utf-8 이외의 문자가 포함됐다면 오류
+// 서버환경에 따라 정상적으로 체크되지 않을 수 있음.
+$tmp_mb_name = iconv('UTF-8', 'UTF-8//IGNORE', $mb_name);
+if($tmp_mb_name != $mb_name) {
+    $mb_name = $tmp_mb_name;
+}
+$tmp_mb_nick = iconv('UTF-8', 'UTF-8//IGNORE', $mb_nick);
+if($tmp_mb_nick != $mb_nick) {
+    $mb_nick = $tmp_mb_nick;
 }
 
 if( ! $mb_nick || ! $mb_name ){

From 06459ceeeb73dd952576c381b2dff4bc5fbcfb0e Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Thu, 18 Jan 2018 11:42:34 +0900
Subject: [PATCH 13/17] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=93=B1=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/register_form_update.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index c1a6e4d92..af778dbc9 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -424,14 +424,15 @@ if( $config['cf_member_img_size'] && $config['cf_member_img_width'] && $config['
         @unlink($mb_dir.'/'.$mb_icon_img);
     }
 
-    $msg = '';
-
     // 회원 프로필 이미지 업로드
     $mb_img = '';
     if (isset($_FILES['mb_img']) && is_uploaded_file($_FILES['mb_img']['tmp_name'])) {
+
+        $msg = $msg ? $msg."\\r\\n" : '';
+
         if (preg_match($image_regex, $_FILES['mb_img']['name'])) {
             // 아이콘 용량이 설정값보다 이하만 업로드 가능
-            if ($_FILES['mb_icon']['size'] <= $config['cf_member_img_size']) {
+            if ($_FILES['mb_img']['size'] <= $config['cf_member_img_size']) {
                 @mkdir($mb_dir, G5_DIR_PERMISSION);
                 @chmod($mb_dir, G5_DIR_PERMISSION);
                 $dest_path = $mb_dir.'/'.$mb_icon_img;
@@ -459,7 +460,7 @@ if( $config['cf_member_img_size'] && $config['cf_member_img_width'] && $config['
                     //=================================================================\
                 }
             } else {
-                $msg .= '회원아이콘을 '.number_format($config['cf_member_img_size']).'바이트 이하로 업로드 해주십시오.';
+                $msg .= '회원이미지을 '.number_format($config['cf_member_img_size']).'바이트 이하로 업로드 해주십시오.';
             }
 
         } else {

From 97483e7fdb32fd9a3ecbeddc077208f16b6ce970 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Thu, 18 Jan 2018 12:22:46 +0900
Subject: [PATCH 14/17] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?=
 =?UTF-8?q?=EC=8A=A4=ED=82=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/mobile.css                                |  2 +-
 .../skin/member/basic/register_form.skin.php  | 18 +++++++++++++----
 theme/basic/css/mobile.css                    |  2 +-
 .../skin/member/basic/register_form.skin.php  | 20 ++++++++++++++-----
 .../skin/member/basic/register_form.skin.php  | 18 +++++++++++++----
 5 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/css/mobile.css b/css/mobile.css
index e70946244..b0b9a4df3 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -237,7 +237,7 @@ a.btn_admin:focus, a.btn_admin:hover {}
 /* 기본폼 */
 .form_01{margin:10px}
 .form_01 .write_div{margin:5px 0;position:relative}
-.form_01 li{margin:5px 0;position:relative}
+.form_01 li{margin:5px 0;position:relative;list-style:none}
 .form_01 textarea, .frm_input {border:1px solid #ccc;background:#fff;color:#000;vertical-align:middle;border-radius:3px;padding:5px;}
 .form_01 textarea {width:100%;height:100px}
 .frm_input {height:40px;}
diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php
index a7978cb3d..72136e1cf 100644
--- a/mobile/skin/member/basic/register_form.skin.php
+++ b/mobile/skin/member/basic/register_form.skin.php
@@ -171,7 +171,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="file" name="mb_icon" id="reg_mb_icon">
             <span class="frm_info">
                 이미지 크기는 가로 <?php echo $config['cf_member_icon_width'] ?>픽셀, 세로 <?php echo $config['cf_member_icon_height'] ?>픽셀 이하로 해주세요.<br>
-                gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
+                gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
             </span>
             <?php if ($w == 'u' && file_exists($mb_icon_path)) { ?>
             <img src="<?php echo $mb_icon_url ?>" alt="회원아이콘">
@@ -188,7 +188,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="file" name="mb_img" id="reg_mb_img" >
             <span class="frm_info">
                 이미지 크기는 가로 <?php echo $config['cf_member_img_width'] ?>픽셀, 세로 <?php echo $config['cf_member_img_height'] ?>픽셀 이하로 해주세요.<br>
-                gif 또는 jpg만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
+                gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
             </span>
             <?php if ($w == 'u' && file_exists($mb_img_path)) {  ?>
             <img src="<?php echo $mb_img_url ?>" alt="회원아이콘">
@@ -418,14 +418,24 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 
         if (typeof f.mb_icon != 'undefined') {
             if (f.mb_icon.value) {
-                if (!f.mb_icon.value.toLowerCase().match(/.(gif)$/i)) {
-                    alert('회원아이콘이 gif 파일이 아닙니다.');
+                if (!f.mb_icon.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert('회원아이콘이 이미지 파일이 아닙니다.');
                     f.mb_icon.focus();
                     return false;
                 }
             }
         }
 
+        if (typeof f.mb_img != "undefined") {
+            if (f.mb_img.value) {
+                if (!f.mb_img.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원이미지가 이미지 파일이 아닙니다.");
+                    f.mb_img.focus();
+                    return false;
+                }
+            }
+        }
+
         if (typeof(f.mb_recommend) != 'undefined' && f.mb_recommend.value) {
             if (f.mb_id.value == f.mb_recommend.value) {
                 alert('본인을 추천할 수 없습니다.');
diff --git a/theme/basic/css/mobile.css b/theme/basic/css/mobile.css
index 57bcb752d..d243978e6 100644
--- a/theme/basic/css/mobile.css
+++ b/theme/basic/css/mobile.css
@@ -237,7 +237,7 @@ a.btn_admin:focus, a.btn_admin:hover {}
 /* 기본폼 */
 .form_01{margin:10px}
 .form_01 .write_div{margin:5px 0;position:relative}
-.form_01 li{margin:5px 0;position:relative}
+.form_01 li{margin:5px 0;position:relative;list-style:none}
 .form_01 textarea, .frm_input {border:1px solid #ccc;background:#fff;color:#000;vertical-align:middle;border-radius:3px;padding:5px;}
 .form_01 textarea {width:100%;height:100px}
 .frm_input {height:40px;}
diff --git a/theme/basic/mobile/skin/member/basic/register_form.skin.php b/theme/basic/mobile/skin/member/basic/register_form.skin.php
index a7978cb3d..796f664ac 100644
--- a/theme/basic/mobile/skin/member/basic/register_form.skin.php
+++ b/theme/basic/mobile/skin/member/basic/register_form.skin.php
@@ -171,7 +171,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="file" name="mb_icon" id="reg_mb_icon">
             <span class="frm_info">
                 이미지 크기는 가로 <?php echo $config['cf_member_icon_width'] ?>픽셀, 세로 <?php echo $config['cf_member_icon_height'] ?>픽셀 이하로 해주세요.<br>
-                gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
+                gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
             </span>
             <?php if ($w == 'u' && file_exists($mb_icon_path)) { ?>
             <img src="<?php echo $mb_icon_url ?>" alt="회원아이콘">
@@ -188,7 +188,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="file" name="mb_img" id="reg_mb_img" >
             <span class="frm_info">
                 이미지 크기는 가로 <?php echo $config['cf_member_img_width'] ?>픽셀, 세로 <?php echo $config['cf_member_img_height'] ?>픽셀 이하로 해주세요.<br>
-                gif 또는 jpg만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
+                gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
             </span>
             <?php if ($w == 'u' && file_exists($mb_img_path)) {  ?>
             <img src="<?php echo $mb_img_url ?>" alt="회원아이콘">
@@ -416,16 +416,26 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         }
         <?php } ?>
 
-        if (typeof f.mb_icon != 'undefined') {
+        if (typeof f.mb_icon != "undefined") {
             if (f.mb_icon.value) {
-                if (!f.mb_icon.value.toLowerCase().match(/.(gif)$/i)) {
-                    alert('회원아이콘이 gif 파일이 아닙니다.');
+                if (!f.mb_icon.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원아이콘이 이미지 파일이 아닙니다.");
                     f.mb_icon.focus();
                     return false;
                 }
             }
         }
 
+        if (typeof f.mb_img != "undefined") {
+            if (f.mb_img.value) {
+                if (!f.mb_img.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원이미지가 이미지 파일이 아닙니다.");
+                    f.mb_img.focus();
+                    return false;
+                }
+            }
+        }
+
         if (typeof(f.mb_recommend) != 'undefined' && f.mb_recommend.value) {
             if (f.mb_id.value == f.mb_recommend.value) {
                 alert('본인을 추천할 수 없습니다.');
diff --git a/theme/basic/skin/member/basic/register_form.skin.php b/theme/basic/skin/member/basic/register_form.skin.php
index 863d3d5c2..933dfc5a1 100644
--- a/theme/basic/skin/member/basic/register_form.skin.php
+++ b/theme/basic/skin/member/basic/register_form.skin.php
@@ -177,7 +177,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                                 
                 <span class="frm_info">
                     이미지 크기는 가로 <?php echo $config['cf_member_icon_width'] ?>픽셀, 세로 <?php echo $config['cf_member_icon_height'] ?>픽셀 이하로 해주세요.<br>
-                    gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
+                    gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
                 </span>
 
                 <?php if ($w == 'u' && file_exists($mb_icon_path)) {  ?>
@@ -196,7 +196,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                                 
                 <span class="frm_info">
                     이미지 크기는 가로 <?php echo $config['cf_member_img_width'] ?>픽셀, 세로 <?php echo $config['cf_member_img_height'] ?>픽셀 이하로 해주세요.<br>
-                    gif 또는 jpg만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
+                    gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
                 </span>
 
                 <?php if ($w == 'u' && file_exists($mb_img_path)) {  ?>
@@ -417,14 +417,24 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 
         if (typeof f.mb_icon != "undefined") {
             if (f.mb_icon.value) {
-                if (!f.mb_icon.value.toLowerCase().match(/.(gif)$/i)) {
-                    alert("회원아이콘이 gif 파일이 아닙니다.");
+                if (!f.mb_icon.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원아이콘이 이미지 파일이 아닙니다.");
                     f.mb_icon.focus();
                     return false;
                 }
             }
         }
 
+        if (typeof f.mb_img != "undefined") {
+            if (f.mb_img.value) {
+                if (!f.mb_img.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원이미지가 이미지 파일이 아닙니다.");
+                    f.mb_img.focus();
+                    return false;
+                }
+            }
+        }
+
         if (typeof(f.mb_recommend) != "undefined" && f.mb_recommend.value) {
             if (f.mb_id.value == f.mb_recommend.value) {
                 alert("본인을 추천할 수 없습니다.");

From 18749864c094b574c946d97f30c6774bcdbf5a72 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 19 Jan 2018 16:05:33 +0900
Subject: [PATCH 15/17] =?UTF-8?q?=EB=A9=94=EB=AA=A8=EC=97=90=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=95=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/memo.php                                         | 10 ++++++++--
 bbs/memo_view.php                                    | 12 ++++++++++--
 mobile/skin/member/basic/memo.skin.php               |  3 +++
 mobile/skin/member/basic/memo_view.skin.php          |  2 +-
 skin/member/basic/memo.skin.php                      |  3 +++
 skin/member/basic/memo_view.skin.php                 |  2 +-
 theme/basic/mobile/skin/member/basic/memo.skin.php   |  3 +++
 .../mobile/skin/member/basic/memo_view.skin.php      |  2 +-
 theme/basic/skin/member/basic/memo.skin.php          |  3 +++
 theme/basic/skin/member/basic/memo_view.skin.php     |  2 +-
 10 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/bbs/memo.php b/bbs/memo.php
index 56288d93f..5d0de7892 100644
--- a/bbs/memo.php
+++ b/bbs/memo.php
@@ -22,6 +22,10 @@ $sql = " select count(*) as cnt from {$g5['memo_table']} where me_{$kind}_mb_id
 $row = sql_fetch($sql);
 $total_count = number_format($row['cnt']);
 
+$total_page  = ceil($total_count / $config['cf_page_rows']);  // 전체 페이지 계산
+if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
+$from_record = ((int) $page - 1) * $config['cf_page_rows']; // 시작 열을 구함
+
 if ($kind == 'recv')
 {
     $kind_title = '받은';
@@ -41,7 +45,7 @@ $sql = " select a.*, b.mb_id, b.mb_nick, b.mb_email, b.mb_homepage
             from {$g5['memo_table']} a
             left join {$g5['member_table']} b on (a.me_{$unkind}_mb_id = b.mb_id)
             where a.me_{$kind}_mb_id = '{$member['mb_id']}'
-            order by a.me_id desc ";
+            order by a.me_id desc limit $from_record, {$config['cf_page_rows']} ";
 $result = sql_query($sql);
 for ($i=0; $row=sql_fetch_array($result); $i++)
 {
@@ -66,10 +70,12 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     $list[$i]['name'] = $name;
     $list[$i]['send_datetime'] = $send_datetime;
     $list[$i]['read_datetime'] = $read_datetime;
-    $list[$i]['view_href'] = './memo_view.php?me_id='.$row['me_id'].'&amp;kind='.$kind;
+    $list[$i]['view_href'] = './memo_view.php?me_id='.$row['me_id'].'&amp;kind='.$kind.'&amp;page='.$page;
     $list[$i]['del_href'] = './memo_delete.php?me_id='.$row['me_id'].'&amp;token='.$token.'&amp;kind='.$kind;
 }
 
+$write_pages = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "./memo.php?kind=$kind".$qstr."&amp;page=");
+
 include_once($member_skin_path.'/memo.skin.php');
 
 include_once(G5_PATH.'/tail.sub.php');
diff --git a/bbs/memo_view.php b/bbs/memo_view.php
index 19d021108..e032c9fca 100644
--- a/bbs/memo_view.php
+++ b/bbs/memo_view.php
@@ -57,14 +57,22 @@ $sql = " select * from {$g5[memo_table]}
             order by me_id desc
             limit 1 ";
 $next = sql_fetch($sql);
-if ($next[me_id])
-    $next_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$next[me_id];
+if ($next['me_id'])
+    $next_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$next['me_id'];
 else
     //$next_link = 'javascript:alert(\'쪽지의 마지막입니다.\');';
     $next_link = '';
 
 $mb = get_member($memo['me_'.$unkind.'_mb_id']);
 
+$list_link = './memo.php?kind='.$kind;
+
+if(isset($page) && $page){
+    $prev_link .= '&amp;page='.(int) $page;
+    $next_link .= '&amp;page='.(int) $page;
+    $list_link .= '&amp;page='.(int) $page;
+}
+
 include_once($member_skin_path.'/memo_view.skin.php');
 
 include_once(G5_PATH.'/tail.sub.php');
diff --git a/mobile/skin/member/basic/memo.skin.php b/mobile/skin/member/basic/memo.skin.php
index fafd275a2..59bf5dbc6 100644
--- a/mobile/skin/member/basic/memo.skin.php
+++ b/mobile/skin/member/basic/memo.skin.php
@@ -30,6 +30,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <?php if ($i==0) { echo "<li class=\"empty_list\">자료가 없습니다.</li>"; } ?>
     </ul>
 
+    <!-- 페이지 -->
+    <?php echo $write_pages;  ?>
+
     <p class="win_desc">
         쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
     </p>
diff --git a/mobile/skin/member/basic/memo_view.skin.php b/mobile/skin/member/basic/memo_view.skin.php
index ae87bfacf..0247ca624 100644
--- a/mobile/skin/member/basic/memo_view.skin.php
+++ b/mobile/skin/member/basic/memo_view.skin.php
@@ -50,7 +50,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <a href="<?php echo $next_link ?>">다음쪽지</a>
         <?php } ?>
         <?php if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>" class="btn01">답장</a><?php } ?>
-        <a href="./memo.php?kind=<?php echo $kind ?>">목록보기</a>
+        <a href="<?php echo $list_link ?>">목록보기</a>
         <button type="button" onclick="window.close();">창닫기</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/skin/member/basic/memo.skin.php b/skin/member/basic/memo.skin.php
index f7477b5bf..e6dbdad84 100644
--- a/skin/member/basic/memo.skin.php
+++ b/skin/member/basic/memo.skin.php
@@ -42,6 +42,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         </table>
     </div>
 
+    <!-- 페이지 -->
+    <?php echo $write_pages;  ?>
+
     <p class="win_desc">
         쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
     </p>
diff --git a/skin/member/basic/memo_view.skin.php b/skin/member/basic/memo_view.skin.php
index 87f15ce42..be66df47b 100644
--- a/skin/member/basic/memo_view.skin.php
+++ b/skin/member/basic/memo_view.skin.php
@@ -53,7 +53,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <a href="<?php echo $next_link ?>">다음쪽지</a>
         <?php }  ?>
         <?php if ($kind == 'recv') {  ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>">답장</a><?php }  ?>
-        <a href="./memo.php?kind=<?php echo $kind ?>">목록보기</a>
+        <a href="<?php echo $list_link ?>">목록보기</a>
         <button type="button" onclick="window.close();">창닫기</button>
     </div>
 </div>
diff --git a/theme/basic/mobile/skin/member/basic/memo.skin.php b/theme/basic/mobile/skin/member/basic/memo.skin.php
index fafd275a2..59bf5dbc6 100644
--- a/theme/basic/mobile/skin/member/basic/memo.skin.php
+++ b/theme/basic/mobile/skin/member/basic/memo.skin.php
@@ -30,6 +30,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <?php if ($i==0) { echo "<li class=\"empty_list\">자료가 없습니다.</li>"; } ?>
     </ul>
 
+    <!-- 페이지 -->
+    <?php echo $write_pages;  ?>
+
     <p class="win_desc">
         쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
     </p>
diff --git a/theme/basic/mobile/skin/member/basic/memo_view.skin.php b/theme/basic/mobile/skin/member/basic/memo_view.skin.php
index ae87bfacf..0247ca624 100644
--- a/theme/basic/mobile/skin/member/basic/memo_view.skin.php
+++ b/theme/basic/mobile/skin/member/basic/memo_view.skin.php
@@ -50,7 +50,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <a href="<?php echo $next_link ?>">다음쪽지</a>
         <?php } ?>
         <?php if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>" class="btn01">답장</a><?php } ?>
-        <a href="./memo.php?kind=<?php echo $kind ?>">목록보기</a>
+        <a href="<?php echo $list_link ?>">목록보기</a>
         <button type="button" onclick="window.close();">창닫기</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/theme/basic/skin/member/basic/memo.skin.php b/theme/basic/skin/member/basic/memo.skin.php
index f7477b5bf..e6dbdad84 100644
--- a/theme/basic/skin/member/basic/memo.skin.php
+++ b/theme/basic/skin/member/basic/memo.skin.php
@@ -42,6 +42,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         </table>
     </div>
 
+    <!-- 페이지 -->
+    <?php echo $write_pages;  ?>
+
     <p class="win_desc">
         쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
     </p>
diff --git a/theme/basic/skin/member/basic/memo_view.skin.php b/theme/basic/skin/member/basic/memo_view.skin.php
index 87f15ce42..be66df47b 100644
--- a/theme/basic/skin/member/basic/memo_view.skin.php
+++ b/theme/basic/skin/member/basic/memo_view.skin.php
@@ -53,7 +53,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <a href="<?php echo $next_link ?>">다음쪽지</a>
         <?php }  ?>
         <?php if ($kind == 'recv') {  ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>">답장</a><?php }  ?>
-        <a href="./memo.php?kind=<?php echo $kind ?>">목록보기</a>
+        <a href="<?php echo $list_link ?>">목록보기</a>
         <button type="button" onclick="window.close();">창닫기</button>
     </div>
 </div>

From 80d47facff0bd92e63b1dd525716c273b481e800 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 19 Jan 2018 18:23:57 +0900
Subject: [PATCH 16/17] =?UTF-8?q?=EB=AC=B8=EB=B2=95=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/editor/cheditor5/editor.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/editor/cheditor5/editor.lib.php b/plugin/editor/cheditor5/editor.lib.php
index 6c0c578d2..1bd4df6a4 100644
--- a/plugin/editor/cheditor5/editor.lib.php
+++ b/plugin/editor/cheditor5/editor.lib.php
@@ -15,7 +15,7 @@ function editor_html($id, $content, $is_dhtml_editor=true)
 
     $width  = isset($editor_width)  ? $editor_width  : "100%";
     $height = isset($editor_height) ? $editor_height : "250px";
-    if (defined(G5_PUNYCODE))
+    if (defined('G5_PUNYCODE'))
         $editor_url = G5_PUNYCODE.'/'.G5_EDITOR_DIR.'/'.$config['cf_editor'];
     else
         $editor_url = G5_EDITOR_URL.'/'.$config['cf_editor'];

From 3eac4672598e4ff65dbbe72a7df5d30f67f175d0 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 24 Jan 2018 18:35:45 +0900
Subject: [PATCH 17/17] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.3.0.2=20=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
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 98a15b21e..aa40c212a 100644
--- a/config.php
+++ b/config.php
@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.3.0.1');
+define('G5_GNUBOARD_VER', '5.3.0.2');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);