From 0d36d343f1b4a567a183116eef51200781a252ba Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Mar 2013 10:12:51 +0900
Subject: [PATCH 01/11] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=A9=94?=
 =?UTF-8?q?=EB=89=B4=20=EB=B3=B4=EC=9D=B4=EA=B8=B0=20=ED=95=84=EB=93=9C=20?=
 =?UTF-8?q?=EC=BF=BC=EB=A6=AC=EC=97=90=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/head.php b/head.php
index 11e841f5a..02ed55ba8 100644
--- a/head.php
+++ b/head.php
@@ -139,7 +139,7 @@ if ($config['cf_include_head']) {
             <a href="<?=G4_BBS_URL?>/group.php?gr_id=<?=$row['gr_id']?>"><?=$row['gr_subject']?></a>
             <ul class="gnb_sub_ul">
                 <?
-                $sql2 = " select * from {$g4['board_table']} where gr_id = '{$row['gr_id']}' order by bo_order ";
+                $sql2 = " select * from {$g4['board_table']} where gr_id = '{$row['gr_id']}' and bo_show_menu = '1' order by bo_order ";
                 $result2 = sql_query($sql2);
                 for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
                 ?>

From 1121808276e24911c8d46c12afece1e42f86bf11 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Mar 2013 10:16:58 +0900
Subject: [PATCH 02/11] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=A9=94?=
 =?UTF-8?q?=EB=89=B4=20=EB=B3=B4=EC=9D=B4=EA=B8=B0=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EB=B9=A0=EC=A7=84=20=EB=B6=80=EB=B6=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_form_update.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/adm/board_form_update.php b/adm/board_form_update.php
index c2e4bb93f..70bcad394 100644
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@@ -109,6 +109,7 @@ $sql_common = " gr_id               = '{$_POST['gr_id']}',
                 bo_reply_order      = '{$_POST['bo_reply_order']}',
                 bo_use_search       = '{$_POST['bo_use_search']}',
                 bo_order            = '{$_POST['bo_order']}',
+                bo_show_menu        = '{$_POST['bo_show_menu']}',
                 bo_write_min        = '{$_POST['bo_write_min']}',
                 bo_write_max        = '{$_POST['bo_write_max']}',
                 bo_comment_min      = '{$_POST['bo_comment_min']}',
@@ -362,6 +363,7 @@ if (is_checked('chk_all_content_tail'))         $all_fields .= " , bo_content_ta
 if (is_checked('chk_all_insert_content'))       $all_fields .= " , bo_insert_content = '{$bo_insert_content}' ";
 if (is_checked('chk_all_use_search'))           $all_fields .= " , bo_use_search = '{$bo_use_search}' ";
 if (is_checked('chk_all_order'))                $all_fields .= " , bo_order = '{$bo_order}' ";
+if (is_checked('chk_all_show_menu'))            $all_fields .= " , bo_show_menu = '{$bo_show_menu}' ";
 for ($i=1; $i<=10; $i++) {
     if (is_checked('chk_all_'.$i)) {
         $all_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' ";

From 4bf9ca83493eb9e4b46454a526a5e06c4f6c9849 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Mar 2013 10:33:29 +0900
Subject: [PATCH 03/11] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=B3=B5?=
 =?UTF-8?q?=EC=82=AC=EC=8B=9C=20=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=8A=A4?=
 =?UTF-8?q?=ED=82=A8=20=EB=B3=B5=EC=82=AC=EB=90=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8A=94=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

---
 adm/board_copy_update.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php
index b153dba7d..7fc7452bd 100644
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@@ -68,6 +68,7 @@ $sql = " insert into {$g4['board_table']}
                 bo_hot = '{$board[bo_hot]}',
                 bo_image_width = '{$board[bo_image_width]}',
                 bo_skin = '{$board['bo_skin']}',
+                bo_mobile_skin = '{$board['bo_mobile']}',
                 bo_include_head = '{$board['bo_include_head']}',
                 bo_include_tail = '{$board['bo_include_tail']}',
                 bo_content_head = '".addslashes($board['bo_content_head'])."',

From ffd1148637c8656b95f78063a88cad14c3ad8fe0 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Mar 2013 10:34:12 +0900
Subject: [PATCH 04/11] =?UTF-8?q?=EC=A0=91=EC=86=8D=EA=B8=B0=EA=B8=B0=20?=
 =?UTF-8?q?=EA=B7=B8=EB=A3=B9=EC=A0=81=EC=9A=A9,=20=EC=A0=84=EC=B2=B4?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?=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

---
 adm/board_form.php        | 8 ++++----
 adm/board_form_update.php | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/adm/board_form.php b/adm/board_form.php
index 180d8841d..8ddc81c08 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -160,10 +160,10 @@ $pg_anchor = "<ul class=\"anchor\">
             </select>
         </td>
         <td class="group_setting">
-            <input type="checkbox" name="chk_grp_use" value="1" id="chk_grp_use">
-            <label for="chk_grp_use">그룹적용</label>
-            <input type="checkbox" name="chk_all_use" value="1" id="chk_all_use">
-            <label for="chk_all_use">전체적용</label>
+            <input type="checkbox" name="chk_grp_device" value="1" id="chk_grp_device">
+            <label for="chk_grp_device">그룹적용</label>
+            <input type="checkbox" name="chk_all_device" value="1" id="chk_all_device">
+            <label for="chk_all_device">전체적용</label>
         </td>
     </tr>
     <tr>
diff --git a/adm/board_form_update.php b/adm/board_form_update.php
index 70bcad394..c93ea6d1d 100644
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@@ -53,7 +53,7 @@ $bo_category_list = str_replace($src_char, $dst_char, $bo_category_list);
 
 $sql_common = " gr_id               = '{$_POST['gr_id']}',
                 bo_subject          = '{$_POST['bo_subject']}',
-                bo_device        = '{$_POST['bo_device']}',
+                bo_device           = '{$_POST['bo_device']}',
                 bo_admin            = '{$_POST['bo_admin']}',
                 bo_list_level       = '{$_POST['bo_list_level']}',
                 bo_read_level       = '{$_POST['bo_read_level']}',
@@ -223,7 +223,7 @@ if ($w == '') {
 
 // 같은 그룹내 게시판 동일 옵션 적용
 $grp_fields = '';
-if (is_checked('chk_grp_use'))                  $grp_fields .= " , bo_use = '{$bo_use}' ";
+if (is_checked('chk_grp_device'))               $grp_fields .= " , bo_device = '{$bo_device}' ";
 if (is_checked('chk_grp_admin'))                $grp_fields .= " , bo_admin = '{$bo_admin}' ";
 if (is_checked('chk_grp_list_level'))           $grp_fields .= " , bo_list_level = '{$bo_list_level}' ";
 if (is_checked('chk_grp_read_level'))           $grp_fields .= " , bo_read_level = '{$bo_read_level}' ";
@@ -300,7 +300,7 @@ if ($grp_fields) {
 
 // 모든 게시판 동일 옵션 적용
 $all_fields = '';
-if (is_checked('chk_all_use'))                  $all_fields .= " , bo_use = '{$bo_use}' ";
+if (is_checked('chk_all_device'))               $all_fields .= " , bo_device = '{$bo_device}' ";
 if (is_checked('chk_all_admin'))                $all_fields .= " , bo_admin = '{$bo_admin}' ";
 if (is_checked('chk_all_list_level'))           $all_fields .= " , bo_list_level = '{$bo_list_level}' ";
 if (is_checked('chk_all_read_level'))           $all_fields .= " , bo_read_level = '{$bo_read_level}' ";

From d0958418355b795f9a47e43348d7fccf06e0c9ad Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Mar 2013 10:38:07 +0900
Subject: [PATCH 05/11] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EB=A9=94=EB=89=B4=EB=B3=B4=EC=9D=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EA=B7=B8=EB=A3=B9=EC=A0=81=EC=9A=A9=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_form_update.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/adm/board_form_update.php b/adm/board_form_update.php
index c93ea6d1d..4f8e67210 100644
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@@ -286,6 +286,7 @@ if (is_checked('chk_grp_content_tail'))         $grp_fields .= " , bo_content_ta
 if (is_checked('chk_grp_insert_content'))       $grp_fields .= " , bo_insert_content = '{$bo_insert_content}' ";
 if (is_checked('chk_grp_use_search'))           $grp_fields .= " , bo_use_search = '{$bo_use_search}' ";
 if (is_checked('chk_grp_order'))                $grp_fields .= " , bo_order = '{$bo_order}' ";
+if (is_checked('chk_grp_show_menu'))            $grp_fields .= " , bo_show_menu = '{$bo_show_menu}' ";
 for ($i=1; $i<=10; $i++) {
     if (is_checked('chk_grp_'.$i)) {
         $grp_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' ";

From 192efe981e53e4d46384134bcc34651d39301fad Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Mon, 18 Mar 2013 11:53:26 +0900
Subject: [PATCH 06/11] =?UTF-8?q?noscript=20=EC=9D=BC=20=EA=B2=BD=EC=9A=B0?=
 =?UTF-8?q?=20=EB=8B=A8=EC=B6=95=ED=82=A4=20=EC=9D=BC=EB=9E=8C=20=EC=B6=9C?=
 =?UTF-8?q?=EB=A0=A5=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/ckeditor/ckeditor.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bbs/ckeditor/ckeditor.lib.php b/bbs/ckeditor/ckeditor.lib.php
index ec55bfb21..2d96f1f7e 100644
--- a/bbs/ckeditor/ckeditor.lib.php
+++ b/bbs/ckeditor/ckeditor.lib.php
@@ -8,7 +8,7 @@ function editor_html($id, $content, $ckeditor=true, $class="")
 
     $html = "";
     $html .= "<span class=\"sound_only\">웹에디터 시작</span>";
-    $html .= "<div class=\"cke_sc\"><button type=\"button\" class=\"btn_cke_sc\">단축키 일람</button></div>";
+    $html .= '<script>document.write("<div class=\'cke_sc\'><button type=\'button\' class=\'btn_cke_sc\'>단축키 일람</button></div>");</script>';
 
     if ($js) {
         $html .= "\n".'<script src="'.G4_CKEDITOR_URL.'/ckeditor.js"></script>';

From 92e4b0aa9edcb008d0925f5a634bd3a5ef74dc8c Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Mon, 18 Mar 2013 11:53:52 +0900
Subject: [PATCH 07/11] =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EB=AC=B8=EC=A0=9C?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common.php b/common.php
index 720dda438..d380accc4 100644
--- a/common.php
+++ b/common.php
@@ -71,7 +71,8 @@ function g4_path()
 {
     $path           = dirname(__FILE__);                                        // 예) /home/sir/www/g4s
     $linux_dir      = str_replace("\\", "/", $path);                            // 예) /home/sir/www/g4s
-    $document_root  = str_replace("\\", "/", $_SERVER['DOCUMENT_ROOT']);        // 예) /home/sir/www
+    //$document_root  = str_replace("\\", "/", $_SERVER['DOCUMENT_ROOT']);        // 예) /home/sir/www
+	$document_root  = str_replace("\\", "/", realpath($_SERVER['DOCUMENT_ROOT']));
     $base_dir       = preg_replace('#^'.$document_root.'#i', '', $linux_dir);   // 예) /g4s
     $port           = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : '';
     $http           = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://';

From cad9888a3ee66b1b6e7168c9c36aa803472e769d Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Mar 2013 13:42:09 +0900
Subject: [PATCH 08/11] =?UTF-8?q?=EA=B0=A4=EB=9F=AC=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=82=A8=EC=97=90=EC=84=9C=20=EC=97=90=EB=94=94=ED=84=B0?=
 =?UTF-8?q?=EB=A1=9C=20=EC=B2=A8=EB=B6=80=EB=90=9C=20=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=83=9D=EC=84=B1=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/thumbnail.lib.php                   | 57 ++++++++++++++++++++++++-
 mobile/skin/board/gallery/list.skin.php | 11 ++---
 skin/board/gallery/list.skin.php        |  9 ++--
 3 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php
index 755058a60..baf036d69 100644
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@@ -9,9 +9,62 @@ function it_img_thumb($filename, $filepath, $thumb_width, $thumb_height, $is_cre
 }
 
 // 게시글리스트 썸네일 생성
-function get_list_thumbnail($filename, $filepath, $thumb_width, $thumb_height, $is_create=false, $is_crop=true)
+function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_create=false, $is_crop=true)
 {
-    return thumbnail($filename, $filepath, $filepath, $thumb_width, $thumb_height, $is_create, $is_crop);
+    global $g4, $config;
+    $filename = $alt = "";
+    $edt = false;
+
+    $sql = " select bf_file, bf_content from {$g4['board_file_table']}
+                where bo_table = '$bo_table' and wr_id = '$wr_id' and bf_type between '1' and '3' order by bf_no limit 0, 1 ";
+    $row = sql_fetch($sql);
+
+    if($row['bf_file']) {
+        $filename = $row['bf_file'];
+        $filepath = G4_DATA_PATH.'/file/'.$bo_table;
+        $src_url = G4_DATA_URL.'/file/'.$bo_table;
+        $alt = get_text($row['bf_content']);
+    } else {
+        $write_table = $g4['write_prefix'].$bo_table;
+        $sql = " select wr_content from $write_table where wr_id = '$wr_id' ";
+        $write = sql_fetch($sql);
+        $matchs = get_editor_image($write['wr_content']);
+        $edt = true;
+
+        for($i=0; $i<count($matchs[1]); $i++)
+        {
+            // 이미지 path 구함
+            $imgurl = parse_url($matchs[1][$i]);
+            $srcfile = $_SERVER['DOCUMENT_ROOT'].$imgurl['path'];
+            $src_url = $matchs[1][$i];
+
+            if(preg_match("/\.({$config['cf_image_extension']})$/i", $srcfile) && is_file($srcfile)) {
+                $filename = basename($srcfile);
+                $filepath = dirname($srcfile);
+
+                break;
+            }
+        }
+    }
+
+    if(!$filename)
+        return false;
+
+    $tname = thumbnail($filename, $filepath, $filepath, $thumb_width, $thumb_height, $is_create, $is_crop);
+
+    if($tname) {
+        if($edt) {
+            $src = str_replace($filename, $tname, $src_url);
+        } else {
+            $src = $src_url.'/'.$tname;
+        }
+    } else {
+        return false;
+    }
+
+    $thumb = array("src"=>$src, "alt"=>$alt);
+
+    return $thumb;
 }
 
 // 게시글보기 썸네일 생성
diff --git a/mobile/skin/board/gallery/list.skin.php b/mobile/skin/board/gallery/list.skin.php
index 8dc2e80b3..3f2e04926 100644
--- a/mobile/skin/board/gallery/list.skin.php
+++ b/mobile/skin/board/gallery/list.skin.php
@@ -87,15 +87,12 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
                         <strong style="width:<?=$board['bo_mobile_gallery_width']?>px;height:<?=$board['bo_mobile_gallery_height']?>px">공지</strong>
                     <?
                     } else {
-                        $file = get_list_file($bo_table, $list[$i]['wr_id']);
+                        $thumb = get_list_thumbnail($board['bo_table'], $list[$i]['wr_id'], $board['bo_gallery_width'], $board['bo_gallery_height']);
 
-                        $filepath = G4_DATA_PATH.'/file/'.$bo_table;
-                        if(preg_match("/\.({$config['cf_image_extension']})$/i", $file['bf_file']) && is_file($filepath.'/'.$file['bf_file'])) {
-                            $thumb = get_list_thumbnail($file['bf_file'], $filepath, $board['bo_mobile_gallery_width'], $board['bo_mobile_gallery_height']);
-                            $imgsrc = G4_DATA_URL.'/file/'.$bo_table.'/'.$thumb;
-                            $img_content = '<img src="'.$imgsrc.'" alt="'.$file['bf_content'].'" width="'.$board['bo_mobile_gallery_width'].'" height="'.$board['bo_mobile_gallery_height'].'">';
+                        if($thumb['src']) {
+                            $img_content = '<img src="'.$thumb['src'].'" alt="'.$thumb['alt'].'" width="'.$board['bo_gallery_width'].'" height="'.$board['bo_gallery_height'].'">';
                         } else {
-                            $img_content = '<span style="width:'.$board['bo_mobile_gallery_width'].'px;height:'.$board['bo_mobile_gallery_height'].'px">no image</span>';
+                            $img_content = '<span style="width:'.$board['bo_gallery_width'].'px;height:'.$board['bo_gallery_height'].'px">no image</span>';
                         }
 
                         echo $img_content;
diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php
index f15321fc9..e5f382fd6 100644
--- a/skin/board/gallery/list.skin.php
+++ b/skin/board/gallery/list.skin.php
@@ -72,13 +72,10 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
                         <strong style="width:<?=$board['bo_gallery_width']?>px;height:<?=$board['bo_gallery_height']?>px">공지</strong>
                     <?
                     } else {
-                        $file = get_list_file($bo_table, $list[$i]['wr_id']);
+                        $thumb = get_list_thumbnail($board['bo_table'], $list[$i]['wr_id'], $board['bo_gallery_width'], $board['bo_gallery_height']);
 
-                        $filepath = G4_DATA_PATH.'/file/'.$bo_table;
-                        if(preg_match("/\.({$config['cf_image_extension']})$/i", $file['bf_file']) && is_file($filepath.'/'.$file['bf_file'])) {
-                            $thumb = get_list_thumbnail($file['bf_file'], $filepath, $board['bo_gallery_width'], $board['bo_gallery_height']);
-                            $imgsrc = G4_DATA_URL.'/file/'.$bo_table.'/'.$thumb;
-                            $img_content = '<img src="'.$imgsrc.'" alt="'.$file['bf_content'].'" width="'.$board['bo_gallery_width'].'" height="'.$board['bo_gallery_height'].'">';
+                        if($thumb['src']) {
+                            $img_content = '<img src="'.$thumb['src'].'" alt="'.$thumb['alt'].'" width="'.$board['bo_gallery_width'].'" height="'.$board['bo_gallery_height'].'">';
                         } else {
                             $img_content = '<span style="width:'.$board['bo_gallery_width'].'px;height:'.$board['bo_gallery_height'].'px">no image</span>';
                         }

From 7956b4f02ffa096750c1ca3add7676a54a6b12db Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Mar 2013 13:52:53 +0900
Subject: [PATCH 09/11] =?UTF-8?q?gmail=EB=A1=9C=20=EB=A9=94=EC=9D=BC=20?=
 =?UTF-8?q?=EB=B0=9C=EC=86=A1=EC=8B=9C=20=EC=A0=9C=EB=AA=A9=20=EA=B9=A8?=
 =?UTF-8?q?=EC=A7=80=EB=8A=94=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

---
 lib/mailer.lib.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/mailer.lib.php b/lib/mailer.lib.php
index d6f58c05f..f816a3d7d 100644
--- a/lib/mailer.lib.php
+++ b/lib/mailer.lib.php
@@ -11,8 +11,10 @@ function mailer($fname, $fmail, $to, $subject, $content, $type=0, $file='', $cc=
     // 메일발송 사용을 하지 않는다면
     if (!$config['cf_email_use']) return;
 
-    $fname   = "=?$g4[charset]?B?" . base64_encode($fname) . "?=";
-    $subject = "=?$g4[charset]?B?" . base64_encode($subject) . "?=";
+    //$fname   = "=?$g4[charset]?B?" . base64_encode($fname) . "?=";
+    //$subject = "=?$g4[charset]?B?" . base64_encode($subject) . "?=";
+    $fname   = "=?utf-8?B?" . base64_encode($fname) . "?=";
+    $subject = "=?utf-8?B?" . base64_encode($subject) . "?=";
     //$g4[charset] = ($g4[charset] != "") ? "charset=$g4[charset]" : "";
 
     $header  = "Return-Path: <$fmail>\n";
@@ -31,11 +33,11 @@ function mailer($fname, $fmail, $to, $subject, $content, $type=0, $file='', $cc=
     }
 
     if ($type) {
-        $header .= "Content-Type: TEXT/HTML; charset=$g4[charset]\n";
+        $header .= "Content-Type: TEXT/HTML; charset=utf-8\n";
         if ($type == 2)
             $content = nl2br($content);
     } else {
-        $header .= "Content-Type: TEXT/PLAIN; charset=$g4[charset]\n";
+        $header .= "Content-Type: TEXT/PLAIN; charset=utf-8\n";
         $content = stripslashes($content);
     }
     $header .= "Content-Transfer-Encoding: BASE64\n\n";

From 3c3710a092409d49f2235b7ce35c411b1ba1d63b Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Mar 2013 14:04:52 +0900
Subject: [PATCH 10/11] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC=20=EC=98=A4=EB=A5=98=EB=A9=94=EC=84=B8=EC=A7=80=20\n?=
 =?UTF-8?q?=EC=9D=84=20\\n=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/login_check.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bbs/login_check.php b/bbs/login_check.php
index 8bb298a68..011cae8ea 100644
--- a/bbs/login_check.php
+++ b/bbs/login_check.php
@@ -11,27 +11,27 @@ if (!trim($mb_id) || !trim($mb_password))
 
 $mb = get_member($mb_id);
 
-// 가입된 회원이 아니다. 패스워드가 틀리다. 라는 메세지를 따로 보여주지 않는 이유는 
+// 가입된 회원이 아니다. 패스워드가 틀리다. 라는 메세지를 따로 보여주지 않는 이유는
 // 회원아이디를 입력해 보고 맞으면 또 패스워드를 입력해보는 경우를 방지하기 위해서입니다.
 // 불법사용자의 경우 회원아이디가 틀린지, 패스워드가 틀린지를 알기까지는 많은 시간이 소요되기 때문입니다.
 if (!$mb['mb_id'] || (sql_password($mb_password) != $mb['mb_password'])) {
-    alert('가입된 회원아이디가 아니거나 패스워드가 틀립니다.\n패스워드는 대소문자를 구분합니다.');
+    alert('가입된 회원아이디가 아니거나 패스워드가 틀립니다.\\n패스워드는 대소문자를 구분합니다.');
 }
 
 // 차단된 아이디인가?
 if ($mb['mb_intercept_date'] && $mb['mb_intercept_date'] <= date("Ymd", G4_SERVER_TIME)) {
-    $date = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})/", "\\1년 \\2월 \\3일", $mb['mb_intercept_date']); 
+    $date = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})/", "\\1년 \\2월 \\3일", $mb['mb_intercept_date']);
     alert('회원님의 아이디는 접근이 금지되어 있습니다.\n처리일 : '.$date);
 }
 
 // 탈퇴한 아이디인가?
 if ($mb['mb_leave_date'] && $mb['mb_leave_date'] <= date("Ymd", G4_SERVER_TIME)) {
-    $date = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})/", "\\1년 \\2월 \\3일", $mb['mb_leave_date']); 
+    $date = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})/", "\\1년 \\2월 \\3일", $mb['mb_leave_date']);
     alert('탈퇴한 아이디이므로 접근하실 수 없습니다.\n탈퇴일 : '.$date);
 }
 
 if ($config['cf_use_email_certify'] && !preg_match("/[1-9]/", $mb['mb_email_certify']))
-    alert('메일인증을 받으셔야 로그인 하실 수 있습니다.\n회원님의 메일주소는 '.$mb['mb_email'].' 입니다.');
+    alert('메일인증을 받으셔야 로그인 하실 수 있습니다.\\n회원님의 메일주소는 '.$mb['mb_email'].' 입니다.');
 
 @include_once($member_skin_path.'/login_check.skin.php');
 
@@ -59,9 +59,9 @@ if ($url) {
     $link = urldecode($url);
     // 2003-06-14 추가 (다른 변수들을 넘겨주기 위함)
     if (preg_match("/\?/", $link))
-        $split= "&amp;"; 
+        $split= "&amp;";
     else
-        $split= "?"; 
+        $split= "?";
 
     // $_POST 배열변수에서 아래의 이름을 가지지 않은 것만 넘김
     foreach($_POST as $key=>$value) {

From d69aaab3a4a99e56f22d9816d6b6d041429181ec Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Mon, 18 Mar 2013 14:41:33 +0900
Subject: [PATCH 11/11] =?UTF-8?q?=EC=9C=88=EB=8F=84=EC=9A=B0=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=ED=95=9C=EA=B8=80=ED=8C=8C=EC=9D=BC=20=EC=97=85?=
 =?UTF-8?q?=EB=A1=9C=EB=93=9C=EC=8B=9C=20=EC=98=A4=EB=A5=98=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/ckeditor/upload.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/bbs/ckeditor/upload.php b/bbs/ckeditor/upload.php
index 091246f60..7d8a40d09 100644
--- a/bbs/ckeditor/upload.php
+++ b/bbs/ckeditor/upload.php
@@ -14,13 +14,18 @@ $CKEditor = $_GET['CKEditor'] ;
 $langCode = $_GET['langCode'] ;
  
 if(isset($_FILES['upload']['tmp_name'])) {
-    $file_name = $_FILES['upload']['name'];
-    $ext = substr($file_name, (strrpos($file_name, '.') + 1));
-    if (!preg_match("/\.(jpe?g|gif|png)$/i", $file_name)) {
-        echo '이미지만 가능';
+    $file = $_FILES['upload']['name'];
+    $pos = strrpos($file, '.');
+    $filename  = substr($file, 0, $pos);
+    $extension = substr($file, $pos, strlen($file) - $pos);
+
+    if (!preg_match("/\.(jpe?g|gif|png)$/i", $extension)) {
+        echo '이미지 파일만 가능합니다.';
         return false;
     }
- 
+
+    // 윈도우에서 한글파일명으로 업로드 되지 않는 오류 해결
+    $file_name = sprintf('%u', ip2long($_SERVER['REMOTE_ADDR'])).'_'.get_microtime().$extension;
     $save_dir = sprintf('%s/%s', $data_dir, $file_name);
     $save_url = sprintf('%s/%s', $data_url, $file_name);