From acc6bb8b369ed2b5c5373650d7e4a430437d0293 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Mar 2013 09:24:29 +0900
Subject: [PATCH 01/13] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=ED=8F=AD=EC=9D=84=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=ED=8C=90=20=ED=8F=AD=EC=9C=BC=EB=A1=9C=20=EA=B8=B0=EB=B3=B8?=
 =?UTF-8?q?=EA=B0=92=EC=9D=84=20100=20=EC=9C=BC=EB=A1=9C=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/adm/board_form.php b/adm/board_form.php
index 325a1a5a4..2a739257b 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -53,7 +53,7 @@ if ($w == '') {
     $board['bo_mobile_gallery_cols'] = 2;
     $board['bo_mobile_gallery_width'] = 160;
     $board['bo_mobile_gallery_height'] = 120;
-    $board['bo_table_width'] = 97;
+    $board['bo_table_width'] = 100;
     $board['bo_page_rows'] = $config['cf_page_rows'];
     $board['bo_subject_len'] = 60;
     $board['bo_new'] = 24;
@@ -765,7 +765,7 @@ $pg_anchor = "<ul class=\"anchor\">
         </td>
     </tr>
     <tr>
-        <th scope="row"><label for="bo_table_width">게시판 테이블 폭<strong class="sound_only">필수</strong></label></th>
+        <th scope="row"><label for="bo_table_width">게시판 폭<strong class="sound_only">필수</strong></label></th>
         <td>
             <?=help('100 이하는 %')?>
             <input type="text" id="bo_table_width" name="bo_table_width" class="required numeric frm_input" required value="<?=$board['bo_table_width']?>" size="4">

From 703310e06b608b7b0d1853f23001c326b2c21f0f Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Mar 2013 09:39:36 +0900
Subject: [PATCH 02/13] =?UTF-8?q?=EB=AC=B8=EA=B5=AC=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/adm/config_form.php b/adm/config_form.php
index 67d4cc8b8..0433353c1 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -475,7 +475,7 @@ $pg_anchor = "
         </td>
         <th scope="row"><label for="cf_prohibit_email">입력 금지 메일</label></th>
         <td>
-            <?=help('hanmail.net과 같은 메일 주소는 입력을 못합니다. 엔터로 구분')?>
+            <?=help('hotmail.com과 같은 메일 주소는 사용하지 못하도록 못합니다. 엔터로 구분')?>
             <textarea id="cf_prohibit_email" name="cf_prohibit_email" rows="5"><?=$config['cf_prohibit_email']?></textarea>
         </td>
     </tr>

From 5ebf49aa07f824f1e37ff2823bcd65130195d2e9 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Mar 2013 09:45:57 +0900
Subject: [PATCH 03/13] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?=
 =?UTF-8?q?=EC=8B=9C=20=EA=B4=80=EB=A6=AC=EC=9E=90=EC=97=90=EA=B2=8C=20?=
 =?UTF-8?q?=EB=B3=B4=EB=82=B4=EB=8A=94=20=EB=A9=94=EC=9D=BC=EC=9D=98=20?=
 =?UTF-8?q?=EB=A7=81=ED=81=AC=EB=A5=BC=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=EC=A3=BC=EC=86=8C=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

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

diff --git a/bbs/register_form_update_mail2.php b/bbs/register_form_update_mail2.php
index e05ba30d7..802c659c1 100644
--- a/bbs/register_form_update_mail2.php
+++ b/bbs/register_form_update_mail2.php
@@ -27,7 +27,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             회원 별명 : <?=$mb_nick?><br>
             추천인아이디 : <?=$mb_recommend?>
         </p>
-        <a href="<?=G4_BBS_URL?>/member_form.php?w=u&amp;mb_id=<?=$mb_id?>" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">관리자에서 회원정보 확인하기</a>
+        <a href="<?=G4_ADMIN_URL?>/member_form.php?w=u&amp;mb_id=<?=$mb_id?>" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">관리자에서 회원정보 확인하기</a>
     </div>
 </div>
 

From 58918b3528c5945215be90227f5d74759b172042 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Mar 2013 09:46:21 +0900
Subject: [PATCH 04/13] =?UTF-8?q?=EC=84=A4=EC=B9=98=EC=8B=9C=20=ED=99=88?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A0=9C=EB=AA=A9=EC=9D=84=20?=
 =?UTF-8?q?=EA=B7=B8=EB=88=84=EB=B3=B4=EB=93=9C4S=20=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/install_db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/install_db.php b/install/install_db.php
index 64aa217b3..ba89d7e9e 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -74,7 +74,7 @@ $download_point = -20;
 //-------------------------------------------------------------------------------------------------
 // config 테이블 설정
 $sql = " insert into `{$table_prefix}config`
-            set cf_title = '그누보드4',
+            set cf_title = '그누보드4S',
                 cf_admin = '$admin_id',
                 cf_use_point = '1',
                 cf_use_norobot = '1',

From 2d0add10ce6b8747d952d70254546ddb68c9929d Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Fri, 8 Mar 2013 10:11:19 +0900
Subject: [PATCH 05/13] =?UTF-8?q?=EC=84=A4=EC=B9=98:=20=EC=84=A4=EC=B9=98?=
 =?UTF-8?q?=20=EA=B3=BC=EC=A0=95=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/install.inc.php    |   9 +-
 install/install_config.php |   7 +-
 install/install_db.php     | 176 ++++++++++++++++++++-----------------
 3 files changed, 105 insertions(+), 87 deletions(-)

diff --git a/install/install.inc.php b/install/install.inc.php
index 0e8c51e0f..1395578a1 100644
--- a/install/install.inc.php
+++ b/install/install.inc.php
@@ -13,17 +13,18 @@ if (!$title) $title = "그누보드4S 설치";
 <style>
 body {margin:0;padding:0;background:#f7f7f7}
 h1 {margin:50px auto 30px;width:540px;font-size:1.4em}
+h2 {font-size:1.2em}
 p {line-height:1.5em}
-table {width:100%;border-collapse:collapse;border-spacing:0;font-size:0.895em}
+table {width:100%;border:0;border-collapse:collapse;border-spacing:0;font-size:0.895em}
 caption {padding:0 0 20px;font-weight:bold;text-align:left}
-th,td {padding:5px;border:1px solid #ddd}
+th,td {padding:5px;border:0;border-top:1px solid #ddd;border-bottom:1px solid #ddd}
 th {text-align:left}
 td span {display:block;margin:0 0 5px;color:#666;font-size:0.9em}
 
-#wrapper {margin:0 auto;padding:20px;width:500px;border:1px solid #eee;background:#fff}
+#wrapper {margin:0 auto 20px;padding:20px;width:500px;border:1px solid #eee;background:#fff}
 
 #idx_license {padding:10px;width:480px;height:300px;border:1px solid #ccc;background:#000;color:#fff}
-#idx_agree {padding:20px;font-weight:bold;text-align:center}
+#idx_agree {padding:0 20px 20px;font-weight:bold;text-align:center}
 
 #btn_confirm {text-align:center}
 
diff --git a/install/install_config.php b/install/install_config.php
index 7e8b55342..2a533879e 100644
--- a/install/install_config.php
+++ b/install/install_config.php
@@ -11,9 +11,8 @@ header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
 header('Pragma: no-cache'); // HTTP/1.0
 
 if ($_POST['agree'] != '동의함') {
-    echo '<meta http-equiv="content-type" content="text/html; charset=utf-8">'.PHP_EOL;
-    echo '<div>라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.</div>'.PHP_EOL;
-    echo '<div><a href="./">뒤로가기</a></div>'.PHP_EOL;
+    echo "<div>라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.</div>".PHP_EOL;
+    echo "<div><a href=\"./\">뒤로가기</a></div>".PHP_EOL;
     exit;
 }
 ?>
@@ -105,7 +104,7 @@ if ($_POST['agree'] != '동의함') {
 
 <p class="outside">
     <strong class="st_strong">주의! 이미 그누보드4S가 존재한다면 DB 자료가 망실되므로 주의하십시오.</strong><br>
-    주의사항을 읽으셨다면 다음을 눌러 설치를 계속하십시오.
+    주의사항을 이해하고, 새로 설치하시려면 다음을 눌러 설치를 계속하십시오.
 </p>
 
 <div id="btn_confirm">
diff --git a/install/install_db.php b/install/install_db.php
index 64aa217b3..a200841bc 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -42,14 +42,10 @@ if (!$select_db) {
     exit;
 }
 ?>
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<title>그누보드4 설치 (3/3) - DB</title>
-</head>
 
-<body>
-<div>그누보드4S 설치시작</div>
+<h2>그누보드4S 설치가 시작되었습니다.</h2>
+
+<ol>
 <?
 // 테이블 생성 ------------------------------------
 $file = implode('', file('./gnuboard4s.sql'));
@@ -63,9 +59,11 @@ for ($i=0; $i<count($f); $i++) {
     mysql_query($f[$i]) or die(mysql_error());
 }
 // 테이블 생성 ------------------------------------
+?>
 
-echo '<div>전체 테이블 생성 완료</div>';
+    <li>전체 테이블 생성 완료</li>
 
+<?
 $read_point = -1;
 $write_point = 5;
 $comment_point = 1;
@@ -75,79 +73,81 @@ $download_point = -20;
 // config 테이블 설정
 $sql = " insert into `{$table_prefix}config`
             set cf_title = '그누보드4',
-                cf_admin = '$admin_id',
-                cf_use_point = '1',
-                cf_use_norobot = '1',
-                cf_use_copy_log = '1',
-                cf_login_point = '100',
-                cf_memo_send_point = '500',
-                cf_cut_name = '15',
-                cf_nick_modify = '60',
-                cf_new_skin = 'basic',
-                cf_new_rows = '15',
-                cf_search_skin = 'basic',
-                cf_connect_skin = 'basic',
-                cf_read_point = '$read_point',
-                cf_write_point = '$write_point',
-                cf_comment_point = '$comment_point',
-                cf_download_point = '$download_point',
-                cf_search_bgcolor = 'YELLOW',
-                cf_search_color = 'RED',
-                cf_write_pages = '10',
-                cf_mobile_pages = '5',
-                cf_link_target = '_blank',
-                cf_delay_sec = '30',
-                cf_filter = '18아,18놈,18새끼,18년,18뇬,18노,18것,18넘,개년,개놈,개뇬,개새,개색끼,개세끼,개세이,개쉐이,개쉑,개쉽,개시키,개자식,개좆,게색기,게색끼,광뇬,뇬,눈깔,뉘미럴,니귀미,니기미,니미,도촬,되질래,뒈져라,뒈진다,디져라,디진다,디질래,병쉰,병신,뻐큐,뻑큐,뽁큐,삐리넷,새꺄,쉬발,쉬밸,쉬팔,쉽알,스패킹,스팽,시벌,시부랄,시부럴,시부리,시불,시브랄,시팍,시팔,시펄,실밸,십8,십쌔,십창,싶알,쌉년,썅놈,쌔끼,쌩쑈,썅,써벌,썩을년,쎄꺄,쎄엑,쓰바,쓰발,쓰벌,쓰팔,씨8,씨댕,씨바,씨발,씨뱅,씨봉알,씨부랄,씨부럴,씨부렁,씨부리,씨불,씨브랄,씨빠,씨빨,씨뽀랄,씨팍,씨팔,씨펄,씹,아가리,아갈이,엄창,접년,잡놈,재랄,저주글,조까,조빠,조쟁이,조지냐,조진다,조질래,존나,존니,좀물,좁년,좃,좆,좇,쥐랄,쥐롤,쥬디,지랄,지럴,지롤,지미랄,쫍빱,凸,퍽큐,뻑큐,빠큐,ㅅㅂㄹㅁ',
-                cf_possible_ip = '',
-                cf_intercept_ip = '',
-                cf_member_skin = 'basic',
-                cf_register_level = '2',
-                cf_register_point = '1000',
-                cf_icon_level = '2',
-                cf_leave_day = '30',
-                cf_search_part = '10000',
-                cf_email_use = '1',
-                cf_prohibit_id = 'admin,administrator,관리자,운영자,어드민,주인장,webmaster,웹마스터,sysop,시삽,시샵,manager,매니저,메니저,root,루트,su,guest,방문객',
-                cf_prohibit_email = '',
-                cf_new_del = '30',
-                cf_memo_del = '180',
-                cf_visit_del = '180',
-                cf_popular_del = '180',
-                cf_use_member_icon = '2',
-                cf_member_icon_size = '5000',
-                cf_member_icon_width = '22',
-                cf_member_icon_height = '22',
-                cf_login_minutes = '10',
-                cf_image_extension = 'gif|jpg|jpeg|png',
-                cf_flash_extension = 'swf',
-                cf_movie_extension = 'asx|asf|wmv|wma|mpg|mpeg|mov|avi|mp3',
-                cf_formmail_is_member = '1',
-                cf_page_rows = '15',
-                cf_stipulation = '해당 홈페이지에 맞는 회원가입약관을 입력합니다.',
-                cf_privacy = '해당 홈페이지에 맞는 개인정보취급방침을 입력합니다.'
-                ";
+                 cf_admin = '$admin_id',
+                 cf_use_point = '1',
+                 cf_use_norobot = '1',
+                 cf_use_copy_log = '1',
+                 cf_login_point = '100',
+                 cf_memo_send_point = '500',
+                 cf_cut_name = '15',
+                 cf_nick_modify = '60',
+                 cf_new_skin = 'basic',
+                 cf_new_rows = '15',
+                 cf_search_skin = 'basic',
+                 cf_connect_skin = 'basic',
+                 cf_read_point = '$read_point',
+                 cf_write_point = '$write_point',
+                 cf_comment_point = '$comment_point',
+                 cf_download_point = '$download_point',
+                 cf_search_bgcolor = 'YELLOW',
+                 cf_search_color = 'RED',
+                 cf_write_pages = '10',
+                 cf_mobile_pages = '5',
+                 cf_link_target = '_blank',
+                 cf_delay_sec = '30',
+                 cf_filter = '18아,18놈,18새끼,18년,18뇬,18노,18것,18넘,개년,개놈,개뇬,개새,개색끼,개세끼,개세이,개쉐이,개쉑,개쉽,개시키,개자식,개좆,게색기,게색끼,광뇬,뇬,눈깔,뉘미럴,니귀미,니기미,니미,도촬,되질래,뒈져라,뒈진다,디져라,디진다,디질래,병쉰,병신,뻐큐,뻑큐,뽁큐,삐리넷,새꺄,쉬발,쉬밸,쉬팔,쉽알,스패킹,스팽,시벌,시부랄,시부럴,시부리,시불,시브랄,시팍,시팔,시펄,실밸,십8,십쌔,십창,싶알,쌉년,썅놈,쌔끼,쌩쑈,썅,써벌,썩을년,쎄꺄,쎄엑,쓰바,쓰발,쓰벌,쓰팔,씨8,씨댕,씨바,씨발,씨뱅,씨봉알,씨부랄,씨부럴,씨부렁,씨부리,씨불,씨브랄,씨빠,씨빨,씨뽀랄,씨팍,씨팔,씨펄,씹,아가리,아갈이,엄창,접년,잡놈,재랄,저주글,조까,조빠,조쟁이,조지냐,조진다,조질래,존나,존니,좀물,좁년,좃,좆,좇,쥐랄,쥐롤,쥬디,지랄,지럴,지롤,지미랄,쫍빱,凸,퍽큐,뻑큐,빠큐,ㅅㅂㄹㅁ',
+                 cf_possible_ip = '',
+                 cf_intercept_ip = '',
+                 cf_member_skin = 'basic',
+                 cf_register_level = '2',
+                 cf_register_point = '1000',
+                 cf_icon_level = '2',
+                 cf_leave_day = '30',
+                 cf_search_part = '10000',
+                 cf_email_use = '1',
+                 cf_prohibit_id = 'admin,administrator,관리자,관리자,어드민,주인장,webmaster,웹마스터,sysop,시삽,시샵,manager,매니저,메니저,root,루트,su,guest,방문객',
+                 cf_prohibit_email = '',
+                 cf_new_del = '30',
+                 cf_memo_del = '180',
+                 cf_visit_del = '180',
+                 cf_popular_del = '180',
+                 cf_use_member_icon = '2',
+                 cf_member_icon_size = '5000',
+                 cf_member_icon_width = '22',
+                 cf_member_icon_height = '22',
+                 cf_login_minutes = '10',
+                 cf_image_extension = 'gif|jpg|jpeg|png',
+                 cf_flash_extension = 'swf',
+                 cf_movie_extension = 'asx|asf|wmv|wma|mpg|mpeg|mov|avi|mp3',
+                 cf_formmail_is_member = '1',
+                 cf_page_rows = '15',
+                 cf_stipulation = '해당 홈페이지에 맞는 회원가입약관을 입력합니다.',
+                 cf_privacy = '해당 홈페이지에 맞는 개인정보취급방침을 입력합니다.'
+                 ";
 mysql_query($sql) or die(mysql_error() . "<p>" . $sql);
 
-// 운영자 회원가입
+// 관리자 회원가입
 $sql = " insert into `{$table_prefix}member`
             set mb_id = '$admin_id',
-                mb_password = PASSWORD('$admin_pass'),
-                mb_name = '$admin_name',
-                mb_nick = '$admin_name',
-                mb_email = '$admin_email',
-                mb_level = '10',
-                mb_mailling = '1',
-                mb_open = '1',
-                mb_email_certify = '".G4_TIME_YMDHIS."',
-                mb_datetime = '".G4_TIME_YMDHIS."',
-                mb_ip = '{$_SERVER['REMOTE_ADDR']}'
-                ";
+                 mb_password = PASSWORD('$admin_pass'),
+                 mb_name = '$admin_name',
+                 mb_nick = '$admin_name',
+                 mb_email = '$admin_email',
+                 mb_level = '10',
+                 mb_mailling = '1',
+                 mb_open = '1',
+                 mb_email_certify = '".G4_TIME_YMDHIS."',
+                 mb_datetime = '".G4_TIME_YMDHIS."',
+                 mb_ip = '{$_SERVER['REMOTE_ADDR']}'
+                 ";
 @mysql_query($sql);
+?>
 
-echo '<div>DB설정 완료</div>';
+    <li>DB설정 완료</li>
+
+<?
 //-------------------------------------------------------------------------------------------------
 
-
 // 디렉토리 생성
 $dir_arr = array (
     $data_path.'/cache',
@@ -162,8 +162,11 @@ for ($i=0; $i<count($dir_arr); $i++) {
     @mkdir($dir_arr[$i], 0707);
     @chmod($dir_arr[$i], 0707);
 }
+?>
 
-echo '<div>데이터 디렉토리 생성 완료</div>';
+    <li>데이터 디렉토리 생성 완료</li>
+
+<?
 //-------------------------------------------------------------------------------------------------
 
 // DB 설정 파일 생성
@@ -203,8 +206,11 @@ fwrite($f, "?>");
 
 fclose($f);
 @chmod($file, 0606);
-echo "<div>DB설정 파일 생성 완료 ($file)";
+?>
 
+    <li>DB설정 파일 생성 완료 (<?=$file?>)</li>
+
+<?
 // data 디렉토리 및 하위 디렉토리에서는 .htaccess .htpasswd .php .phtml .html .htm .inc .cgi .pl 파일을 실행할수 없게함.
 $f = fopen($data_path.'/.htaccess', 'w');
 $str = <<<EOD
@@ -216,11 +222,23 @@ EOD;
 fwrite($f, $str);
 fclose($f);
 //-------------------------------------------------------------------------------------------------
-
-echo '<div>필요한 DB Table, File, 디렉토리 생성을 모두 완료 하였습니다.</div>'.PHP_EOL;
-echo '<div>메인화면에서 운영자 로그인을 한 후 운영자 화면으로 이동하여 환경설정을 변경해 주십시오.</div>';
-echo '<div><a href="../index.php">메인화면으로 가기</a></div>';
 ?>
+</ol>
+
+<p class="st_strong">축하합니다. 그누보드4S 설치가 완료되었습니다.</p>
+
+<h2>환경설정 변경은 다음의 과정을 따르십시오.</h2>
+
+<ol>
+    <li>메인화면으로 이동</li>
+    <li>관리자 로그인</li>
+    <li>관리자 모드 접속</li>
+    <li>환경설정 메뉴의 기본환경설정 페이지로 이동</li>
+</ol>
+
+</div>
+
+<div id="btn_confirm"><a href="../index.php">메인화면으로 가기</a></div>
 
 </body>
 </html>
\ No newline at end of file

From 721883abb2a36ac87062f15c0e97e66aae948849 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Fri, 8 Mar 2013 10:15:16 +0900
Subject: [PATCH 06/13] =?UTF-8?q?=EC=84=A4=EC=B9=98:=20=EA=B7=B8=EB=88=84?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C4S=20=EB=A5=BC=20=EA=B7=B8=EB=88=84=EB=B3=B4?=
 =?UTF-8?q?=EB=93=9C4s=20=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

---
 install/index.php          | 2 +-
 install/install.inc.php    | 2 +-
 install/install_config.php | 4 ++--
 install/install_db.php     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/install/index.php b/install/index.php
index 405056142..bf0a46041 100644
--- a/install/index.php
+++ b/install/index.php
@@ -1,5 +1,5 @@
 <?
-$title = "그누보드4S 설치 3단계 중 1단계 라이센스 확인";
+$title = "그누보드4s 설치 3단계 중 1단계 라이센스 확인";
 include_once ('../config.php');
 include_once ('./install.inc.php');
 ?>
diff --git a/install/install.inc.php b/install/install.inc.php
index 1395578a1..3de1ecf34 100644
--- a/install/install.inc.php
+++ b/install/install.inc.php
@@ -2,7 +2,7 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 $data_path = '../'.G4_DATA_DIR;
 
-if (!$title) $title = "그누보드4S 설치";
+if (!$title) $title = "그누보드4s 설치";
 ?>
 
 <!doctype html>
diff --git a/install/install_config.php b/install/install_config.php
index 2a533879e..f02ceeae2 100644
--- a/install/install_config.php
+++ b/install/install_config.php
@@ -1,5 +1,5 @@
 <?
-$title = "그누보드4S 설치 3단계 중 2단계 설정";
+$title = "그누보드4s 설치 3단계 중 2단계 설정";
 include_once ('../config.php');
 include_once ('./install.inc.php');
 
@@ -103,7 +103,7 @@ if ($_POST['agree'] != '동의함') {
 </div>
 
 <p class="outside">
-    <strong class="st_strong">주의! 이미 그누보드4S가 존재한다면 DB 자료가 망실되므로 주의하십시오.</strong><br>
+    <strong class="st_strong">주의! 이미 그누보드4s가 존재한다면 DB 자료가 망실되므로 주의하십시오.</strong><br>
     주의사항을 이해하고, 새로 설치하시려면 다음을 눌러 설치를 계속하십시오.
 </p>
 
diff --git a/install/install_db.php b/install/install_db.php
index e19d9b300..777a56800 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -43,7 +43,7 @@ if (!$select_db) {
 }
 ?>
 
-<h2>그누보드4S 설치가 시작되었습니다.</h2>
+<h2>그누보드4s 설치가 시작되었습니다.</h2>
 
 <ol>
 <?
@@ -226,7 +226,7 @@ fclose($f);
 ?>
 </ol>
 
-<p class="st_strong">축하합니다. 그누보드4S 설치가 완료되었습니다.</p>
+<p class="st_strong">축하합니다. 그누보드4s 설치가 완료되었습니다.</p>
 
 <h2>환경설정 변경은 다음의 과정을 따르십시오.</h2>
 

From 013ec0328bbdf04062e7d38a3c2ae44d3f927382 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Fri, 8 Mar 2013 10:16:39 +0900
Subject: [PATCH 07/13] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=EC=8A=A4=ED=82=A8=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EB=86=92=EC=9D=B4=20=EC=A1=B0=EC=A0=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/default.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/default.css b/css/default.css
index f697bd2ae..c56e0c922 100644
--- a/css/default.css
+++ b/css/default.css
@@ -314,7 +314,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
 #mb_login .login_id {position:absolute;top:26px;left:95px}
 #mb_login .login_pw {position:absolute;top:52px;left:95px}
 #mb_login .frm_input {display:block;margin:0 0 5px 80px}
-#mb_login .btn_submit {position:absolute;top:20px;left:335px;height:53px}
+#mb_login .btn_submit {position:absolute;top:20px;left:335px;height:49px}
 #mb_login section {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f7f7f2}
 #mb_login section div {text-align:right}
 

From 8235f324fc95bcf29180b5cfce80ad545a903d3d Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Mar 2013 10:49:28 +0900
Subject: [PATCH 08/13] =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=90=9C=20=ED=95=84?=
 =?UTF-8?q?=EB=93=9C=20=EB=B0=98=EC=98=81=EA=B3=BC=20=EA=B8=80=EC=88=98=20?=
 =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=9D=84=20=EC=97=94=ED=94=BC=EC=94=A8?=
 =?UTF-8?q?=EB=8B=98=EC=9D=98=20=ED=8C=81=EC=9C=BC=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/adm/board_form_update.php b/adm/board_form_update.php
index f5ac45e21..0d2e5cf81 100644
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@@ -173,16 +173,23 @@ if ($w == '') {
     $bo_count_comment = $row['cnt'];
 
     // 글수 조정
+    /*
+        엔피씨님의 팁으로 교체합니다. 130308
+        http://sir.co.kr/bbs/board.php?bo_table=g4_tiptech&wr_id=27207
+    */
     if (isset($_POST['proc_count'])) {
         // 원글을 얻습니다.
-        $sql = " select wr_id from {$g4['write_prefix']}{$bo_table} where wr_is_comment = 0 ";
+        //$sql = " select wr_id from {$g4['write_prefix']}{$bo_table} where wr_is_comment = 0 ";
+        $sql = " select a.wr_id, (count(b.wr_parent) - 1) as cnt from {$g4['write_prefix']}{$bo_table} a, {$g4['write_prefix']}{$bo_table} b where a.wr_id=b.wr_parent and a.wr_is_comment=0 group by a.wr_id ";
         $result = sql_query($sql);
         for ($i=0; $row=sql_fetch_array($result); $i++) {
+            /*
             // 코멘트수를 얻습니다.
             $sql2 = " select count(*) as cnt from {$g4['write_prefix']}$bo_table where wr_parent = '{$row['wr_id']}' and wr_is_comment = 1 ";
             $row2 = sql_fetch($sql2);
+            */
 
-            sql_query(" update {$g4['write_prefix']}{$bo_table} set wr_comment = '{$row2['cnt']}' where wr_id = '{$row['wr_id']}' ");
+            sql_query(" update {$g4['write_prefix']}{$bo_table} set wr_comment = '{$row['cnt']}' where wr_id = '{$row['wr_id']}' ");
         }
     }
 

From 5d0993b5144504b3ecf407c71eface0fa74ef188 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Mar 2013 11:05:15 +0900
Subject: [PATCH 09/13] =?UTF-8?q?bo=5Fuse=5Fcomment=20=ED=95=84=EB=93=9C?=
 =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/gnuboard4s.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql
index 76ea526f0..f6f6d9caf 100644
--- a/install/gnuboard4s.sql
+++ b/install/gnuboard4s.sql
@@ -49,7 +49,6 @@ CREATE TABLE IF NOT EXISTS `g4s_board` (
   `bo_use_secret` tinyint(4) NOT NULL default '0',
   `bo_use_dhtml_editor` tinyint(4) NOT NULL default '0',
   `bo_use_rss_view` tinyint(4) NOT NULL default '0',
-  `bo_use_comment` tinyint(4) NOT NULL default '0',
   `bo_use_good` tinyint(4) NOT NULL default '0',
   `bo_use_nogood` tinyint(4) NOT NULL default '0',
   `bo_use_name` tinyint(4) NOT NULL default '0',

From f3e09ffd7ac5f3082e28f2a3a532be1261995e19 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Mar 2013 11:05:36 +0900
Subject: [PATCH 10/13] =?UTF-8?q?=EC=8A=A4=ED=8C=B8=EB=B0=A9=EC=A7=80=20?=
 =?UTF-8?q?=EB=A5=BC=20=EC=9E=90=EB=8F=99=EB=93=B1=EB=A1=9D=EB=B0=A9?=
 =?UTF-8?q?=EC=A7=80=20=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

---
 adm/board_copy.php            |   7 --
 adm/board_copy_update.php     | 158 +++++++++++++++++-----------------
 bbs/formmail_send.php         |   2 +-
 bbs/gcaptcha/gcaptcha.js      |   2 +-
 bbs/gcaptcha/gcaptcha.lib.php |   8 +-
 bbs/memo_form_update.php      |   2 +-
 bbs/password_lost2.php        |   4 +-
 bbs/poll_update.php           |   7 --
 bbs/register_form_update.php  |   2 +-
 bbs/write_comment_update.php  |   2 +-
 bbs/write_update.php          |   2 +-
 11 files changed, 93 insertions(+), 103 deletions(-)

diff --git a/adm/board_copy.php b/adm/board_copy.php
index 645a6ff57..a41648e88 100644
--- a/adm/board_copy.php
+++ b/adm/board_copy.php
@@ -1,7 +1,6 @@
 <?
 $sub_menu = "300100";
 include_once("./_common.php");
-include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
 
 auth_check($auth[$sub_menu], 'w');
 
@@ -40,10 +39,6 @@ include_once(G4_PATH.'/head.sub.php');
             <label for="copy_case2">구조와 데이터</label>
         </td>
     </tr>
-    <tr>
-        <th scope="col">자동등록방지</th>
-        <td><?=captcha_html();?></td>
-    </tr>
     </tbody>
     </table>
 </div>
@@ -63,8 +58,6 @@ function fboardcopy_check(f)
         return false;
     }
 
-    <? echo chk_captcha_js(); ?>
-
     return true;
 }
 </script>
diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php
index ea39c49e5..b153dba7d 100644
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@@ -1,14 +1,9 @@
 <?
 $sub_menu = '300100';
 include_once('./_common.php');
-include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
 
 auth_check($auth[$sub_menu], 'w');
 
-if (!chk_captcha()) {
-    alert('스팸방지에 입력한 숫자가 틀렸습니다.');
-}
-
 $target_table   = escape_trim($_POST['target_table']);
 $target_subject = escape_trim($_POST['target_subject']);
 
@@ -32,78 +27,87 @@ $file_copy = array();
 // 게시판 정보
 $sql = " insert into {$g4['board_table']}
             set bo_table = '$target_table',
-                 bo_subject = '$target_subject',
-                 gr_id = '{$board['gr_id']}',
-                 bo_admin = '{$board['bo_admin']}',
-                 bo_list_level = '{$board[bo_list_level]}',
-                 bo_read_level = '{$board[bo_read_level]}',
-                 bo_write_level = '{$board[bo_write_level]}',
-                 bo_reply_level = '{$board[bo_reply_level]}',
-                 bo_comment_level = '{$board[bo_comment_level]}',
-                 bo_upload_level = '{$board[bo_upload_level]}',
-                 bo_download_level = '{$board[bo_download_level]}',
-                 bo_html_level = '{$board[bo_html_level]}',
-                 bo_link_level = '{$board[bo_link_level]}',
-                 bo_count_modify = '{$board[bo_count_modify]}',
-                 bo_count_delete = '{$board[bo_count_delete]}',
-                 bo_read_point = '{$board[bo_read_point]}',
-                 bo_write_point = '{$board[bo_write_point]}',
-                 bo_comment_point = '{$board[bo_comment_point]}',
-                 bo_download_point = '{$board[bo_download_point]}',
-                 bo_use_category = '{$board[bo_use_category]}',
-                 bo_category_list = '{$board['bo_category_list']}',
-                 bo_disable_tags = '{$board['bo_disable_tags']}',
-                 bo_use_secret = '{$board[bo_use_secret]}',
-                 bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}',
-                 bo_use_sideview = '{$board[bo_use_sideview]}',
-                 bo_use_good = '{$board[bo_use_good]}',
-                 bo_use_nogood = '{$board[bo_use_nogood]}',
-                 bo_use_signature = '{$board[bo_use_signature]}',
-                 bo_use_ip_view = '{$board[bo_use_ip_view]}',
-                 bo_use_list_view = '{$board['o_use_list_view']}',
-                 bo_use_list_content = '{$board[bo_use_list_content]}',
-                 bo_table_width = '{$board[bo_table_width]}',
-                 bo_subject_len = '{$board[bo_subject_len]}',
-                 bo_page_rows = '{$board[bo_page_rows]}',
-                 bo_new = '{$board[bo_new]}',
-                 bo_hot = '{$board[bo_hot]}',
-                 bo_image_width = '{$board[bo_image_width]}',
-                 bo_skin = '{$board['bo_skin']}',
-                 bo_include_head = '{$board['bo_include_head']}',
-                 bo_include_tail = '{$board['bo_include_tail']}',
-                 bo_content_head = '".addslashes($board['bo_content_head'])."',
-                 bo_content_tail = '".addslashes($board['bo_content_tail'])."',
-                 bo_insert_content = '".addslashes($board['bo_insert_content'])."',
-                 bo_gallery_cols = '{$board[bo_gallery_cols]}',
-                 bo_upload_size = '{$board[bo_upload_size]}',
-                 bo_reply_order = '{$board[bo_reply_order]}',
-                 bo_use_search = '{$board[bo_use_search]}',
-                 bo_show_menu = '{$board[bo_show_menu]}',
-                 bo_order = '{$board[bo_order]}',
-                 bo_notice = '{$board['bo_notice']}',
-                 bo_upload_count = '{$board[bo_upload_count]}',
-                 bo_use_email = '{$board[bo_use_email]}',
-                 bo_sort_field = '{$board['bo_sort_field']}',
-                 bo_1_subj = '{$board['bo_1_subj']}',
-                 bo_2_subj = '{$board['bo_2_subj']}',
-                 bo_3_subj = '{$board['bo_3_subj']}',
-                 bo_4_subj = '{$board['bo_4_subj']}',
-                 bo_5_subj = '{$board['bo_5_subj']}',
-                 bo_6_subj = '{$board['bo_6_subj']}',
-                 bo_7_subj = '{$board['bo_7_subj']}',
-                 bo_8_subj = '{$board['bo_8_subj']}',
-                 bo_9_subj = '{$board['bo_9_subj']}',
-                 bo_10_subj = '{$board['bo_10_subj']}',
-                 bo_1 = '{$board['bo_1']}',
-                 bo_2 = '{$board['bo_2']}',
-                 bo_3 = '{$board['bo_3']}',
-                 bo_4 = '{$board['bo_4']}',
-                 bo_5 = '{$board['bo_5']}',
-                 bo_6 = '{$board['bo_6']}',
-                 bo_7 = '{$board['bo_7']}',
-                 bo_8 = '{$board['bo_8']}',
-                 bo_9 = '{$board['bo_9']}',
-                 bo_10 = '{$board['bo_10']}' ";
+                gr_id = '{$board['gr_id']}',
+                bo_subject = '$target_subject',
+                bo_device = '{$board['bo_device']}',
+                bo_admin = '{$board['bo_admin']}',
+                bo_list_level = '{$board[bo_list_level]}',
+                bo_read_level = '{$board[bo_read_level]}',
+                bo_write_level = '{$board[bo_write_level]}',
+                bo_reply_level = '{$board[bo_reply_level]}',
+                bo_comment_level = '{$board[bo_comment_level]}',
+                bo_upload_level = '{$board[bo_upload_level]}',
+                bo_download_level = '{$board[bo_download_level]}',
+                bo_html_level = '{$board[bo_html_level]}',
+                bo_link_level = '{$board[bo_link_level]}',
+                bo_trackback_level = '{$board[bo_trackback_level]}',
+                bo_count_modify = '{$board[bo_count_modify]}',
+                bo_count_delete = '{$board[bo_count_delete]}',
+                bo_read_point = '{$board[bo_read_point]}',
+                bo_write_point = '{$board[bo_write_point]}',
+                bo_comment_point = '{$board[bo_comment_point]}',
+                bo_download_point = '{$board[bo_download_point]}',
+                bo_use_category = '{$board[bo_use_category]}',
+                bo_category_list = '{$board['bo_category_list']}',
+                bo_disable_tags = '{$board['bo_disable_tags']}',
+                bo_use_sideview = '{$board[bo_use_sideview]}',
+                bo_use_file_content = '{$board[bo_use_file_content]}',
+                bo_use_secret = '{$board[bo_use_secret]}',
+                bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}',
+                bo_use_rss_view = '{$board[bo_use_rss_view]}',
+                bo_use_good = '{$board[bo_use_good]}',
+                bo_use_nogood = '{$board[bo_use_nogood]}',
+                bo_use_signature = '{$board[bo_use_signature]}',
+                bo_use_ip_view = '{$board[bo_use_ip_view]}',
+                bo_use_list_view = '{$board['o_use_list_view']}',
+                bo_use_list_content = '{$board[bo_use_list_content]}',
+                bo_table_width = '{$board[bo_table_width]}',
+                bo_subject_len = '{$board[bo_subject_len]}',
+                bo_page_rows = '{$board[bo_page_rows]}',
+                bo_new = '{$board[bo_new]}',
+                bo_hot = '{$board[bo_hot]}',
+                bo_image_width = '{$board[bo_image_width]}',
+                bo_skin = '{$board['bo_skin']}',
+                bo_include_head = '{$board['bo_include_head']}',
+                bo_include_tail = '{$board['bo_include_tail']}',
+                bo_content_head = '".addslashes($board['bo_content_head'])."',
+                bo_content_tail = '".addslashes($board['bo_content_tail'])."',
+                bo_insert_content = '".addslashes($board['bo_insert_content'])."',
+                bo_gallery_cols = '{$board[bo_gallery_cols]}',
+                bo_gallery_width = '{$board[bo_gallery_width]}',
+                bo_gallery_height = '{$board[bo_gallery_height]}',
+                bo_mobile_gallery_cols = '{$board[bo_mobile_gallery_cols]}',
+                bo_mobile_gallery_width = '{$board[bo_mobile_gallery_width]}',
+                bo_mobile_gallery_height = '{$board[bo_mobile_gallery_height]}',
+                bo_upload_size = '{$board[bo_upload_size]}',
+                bo_reply_order = '{$board[bo_reply_order]}',
+                bo_use_search = '{$board[bo_use_search]}',
+                bo_show_menu = '{$board[bo_show_menu]}',
+                bo_order = '{$board[bo_order]}',
+                bo_notice = '{$board['bo_notice']}',
+                bo_upload_count = '{$board[bo_upload_count]}',
+                bo_use_email = '{$board[bo_use_email]}',
+                bo_sort_field = '{$board['bo_sort_field']}',
+                bo_1_subj = '{$board['bo_1_subj']}',
+                bo_2_subj = '{$board['bo_2_subj']}',
+                bo_3_subj = '{$board['bo_3_subj']}',
+                bo_4_subj = '{$board['bo_4_subj']}',
+                bo_5_subj = '{$board['bo_5_subj']}',
+                bo_6_subj = '{$board['bo_6_subj']}',
+                bo_7_subj = '{$board['bo_7_subj']}',
+                bo_8_subj = '{$board['bo_8_subj']}',
+                bo_9_subj = '{$board['bo_9_subj']}',
+                bo_10_subj = '{$board['bo_10_subj']}',
+                bo_1 = '{$board['bo_1']}',
+                bo_2 = '{$board['bo_2']}',
+                bo_3 = '{$board['bo_3']}',
+                bo_4 = '{$board['bo_4']}',
+                bo_5 = '{$board['bo_5']}',
+                bo_6 = '{$board['bo_6']}',
+                bo_7 = '{$board['bo_7']}',
+                bo_8 = '{$board['bo_8']}',
+                bo_9 = '{$board['bo_9']}',
+                bo_10 = '{$board['bo_10']}' ";
 sql_query($sql);
 
 // 게시판 폴더 생성
diff --git a/bbs/formmail_send.php b/bbs/formmail_send.php
index 7b239cf41..2ce11c8bf 100644
--- a/bbs/formmail_send.php
+++ b/bbs/formmail_send.php
@@ -16,7 +16,7 @@ if (substr_count($to, "@") > 1)
 
 
 if (!chk_captcha()) {
-    alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+    alert('자동등록방지 숫자가 틀렸습니다.');
 }
 
 
diff --git a/bbs/gcaptcha/gcaptcha.js b/bbs/gcaptcha/gcaptcha.js
index b6b8bd722..536dcd7bf 100644
--- a/bbs/gcaptcha/gcaptcha.js
+++ b/bbs/gcaptcha/gcaptcha.js
@@ -17,7 +17,7 @@ function chk_captcha()
         }
     });
     if (!captcha_result) {
-        alert("스팸방지 숫자가 틀렸습니다.");
+        alert("자동등록방지 숫자가 틀렸습니다.");
         captcha_key.select();
         return false;
     }
diff --git a/bbs/gcaptcha/gcaptcha.lib.php b/bbs/gcaptcha/gcaptcha.lib.php
index b95ec845d..9eb3fcc05 100644
--- a/bbs/gcaptcha/gcaptcha.lib.php
+++ b/bbs/gcaptcha/gcaptcha.lib.php
@@ -178,11 +178,11 @@ function captcha_html($class='captcha')
     $html .= PHP_EOL.'<script>var g4_gcaptcha_url = "'.G4_GCAPTCHA_URL.'";</script>'; 
     $html .= PHP_EOL.'<script src="'.G4_GCAPTCHA_URL.'/gcaptcha.js"></script>'; 
     $html .= '<fieldset id="captcha" class="'.$class.'">';
-    $html .= '<legend class="sound_only">스팸방지</legend>';
-    $html .= '<img src="'.$jpg_file_url.'" alt="스팸방지 숫자">';
+    $html .= '<legend class="sound_only">자동등록방지</legend>';
+    $html .= '<img src="'.$jpg_file_url.'" alt="자동등록방지 숫자">';
     $html .= '<a href="'.$wav_file_url.'" id="captcha_wav" target="_blank"><img src="'.G4_GCAPTCHA_URL.'/img/sound.gif" alt="숫자를 음성으로 듣기"></a>';
-    $html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box frm_input" size="6" maxlength="6" required title="스팸방지 숫자 입력">';
-    $html .= '<p class="sound_only">스팸방지 숫자를 순서대로 입력하세요.</p>';
+    $html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box frm_input" size="6" maxlength="6" required title="자동등록방지 숫자 입력">';
+    $html .= '<p class="sound_only">자동등록방지 숫자를 순서대로 입력하세요.</p>';
     $html .= '</fieldset>';
     return $html;
 }
diff --git a/bbs/memo_form_update.php b/bbs/memo_form_update.php
index 92e8cdbfe..4f8c0fe3b 100644
--- a/bbs/memo_form_update.php
+++ b/bbs/memo_form_update.php
@@ -6,7 +6,7 @@ if ($is_guest)
     alert('회원만 이용하실 수 있습니다.');
 
 if (!chk_captcha()) {
-    alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+    alert('자동등록방지 숫자가 틀렸습니다.');
 }
 
 $recv_list = explode(',', trim($_POST['me_recv_mb_id']));
diff --git a/bbs/password_lost2.php b/bbs/password_lost2.php
index eb28b4fdd..c606e17bb 100644
--- a/bbs/password_lost2.php
+++ b/bbs/password_lost2.php
@@ -3,11 +3,11 @@ include_once('./_common.php');
 include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
 
 if ($is_member) {
-    alert("이미 로그인중입니다.");
+    alert('이미 로그인중입니다.');
 }
 
 if (!chk_captcha()) {
-    alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+    alert('자동등록방지 숫자가 틀렸습니다.');
 }
 
 include_once($member_skin_path.'/password_lost2.skin.php');
diff --git a/bbs/poll_update.php b/bbs/poll_update.php
index 0a2c81b68..f05a5fdfb 100644
--- a/bbs/poll_update.php
+++ b/bbs/poll_update.php
@@ -1,12 +1,5 @@
 <?
 include_once('./_common.php');
-/*
-include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
-
-if ($is_guest && !chk_captcha()) {
-    alert('스팸방지에 입력한 숫자가 틀렸습니다.');
-}
-*/
 
 $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '{$_POST['po_id']}' ");
 if (!$po['po_id'])
diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index 9ef55dd9f..47526889e 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -17,7 +17,7 @@ if ($w == 'u' && $is_admin == 'super') {
 }
 
 if (!chk_captcha()) {
-    alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+    alert('자동등록방지 숫자가 틀렸습니다.');
 }
 
 $mb_id          = escape_trim($_POST['mb_id']);
diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php
index 3edbe59ca..754b85371 100644
--- a/bbs/write_comment_update.php
+++ b/bbs/write_comment_update.php
@@ -22,7 +22,7 @@ if ($is_guest) {
     if ($wr_name == '')
         alert('이름은 필히 입력하셔야 합니다.');
     if(!chk_captcha())
-        alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+        alert('자동등록방지 숫자가 틀렸습니다.');
 }
 
 if ($w == "c" || $w == "cu") {
diff --git a/bbs/write_update.php b/bbs/write_update.php
index 8e7d12270..57f4fae6b 100644
--- a/bbs/write_update.php
+++ b/bbs/write_update.php
@@ -149,7 +149,7 @@ if ($w == '' || $w == 'u') {
 }
 
 if ($is_guest && !chk_captcha()) {
-    alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+    alert('자동등록방지 숫자가 틀렸습니다.');
 }
 
 if ($w == '' || $w == 'r') {

From 4c022aeded33a38ae3a3f56ab75aa13c88eb5990 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Mar 2013 11:08:35 +0900
Subject: [PATCH 11/13] =?UTF-8?q?=EB=8C=93=EA=B8=80=EC=9E=85=EB=A0=A5=20?=
 =?UTF-8?q?=EC=9D=84=20=EB=8C=93=EA=B8=80=EB=93=B1=EB=A1=9D=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

---
 mobile/skin/board/basic/view_comment.skin.php   | 2 +-
 mobile/skin/board/gallery/view_comment.skin.php | 2 +-
 skin/board/basic/view_comment.skin.php          | 2 +-
 skin/board/gallery/view_comment.skin.php        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/skin/board/basic/view_comment.skin.php b/mobile/skin/board/basic/view_comment.skin.php
index d0f1874d3..fc6597cd7 100644
--- a/mobile/skin/board/basic/view_comment.skin.php
+++ b/mobile/skin/board/basic/view_comment.skin.php
@@ -128,7 +128,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
         </table>
 
         <div class="btn_confirm">
-            <input type="submit" class="btn_submit" value="댓글입력">
+            <input type="submit" class="btn_submit" value="댓글등록">
         </div>
 
         </form>
diff --git a/mobile/skin/board/gallery/view_comment.skin.php b/mobile/skin/board/gallery/view_comment.skin.php
index 7428fbb4b..a16dea2f3 100644
--- a/mobile/skin/board/gallery/view_comment.skin.php
+++ b/mobile/skin/board/gallery/view_comment.skin.php
@@ -128,7 +128,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
         </table>
 
         <div class="btn_confirm">
-            <input type="submit" class="btn_submit" value="댓글입력">
+            <input type="submit" class="btn_submit" value="댓글등록">
         </div>
 
         </form>
diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php
index b5e5d09bf..5a512d57d 100644
--- a/skin/board/basic/view_comment.skin.php
+++ b/skin/board/basic/view_comment.skin.php
@@ -128,7 +128,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
         </table>
 
         <div class="btn_confirm">
-            <input type="submit" class="btn_submit" value="댓글입력">
+            <input type="submit" class="btn_submit" value="댓글등록">
         </div>
 
         </form>
diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php
index 7428fbb4b..a16dea2f3 100644
--- a/skin/board/gallery/view_comment.skin.php
+++ b/skin/board/gallery/view_comment.skin.php
@@ -128,7 +128,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
         </table>
 
         <div class="btn_confirm">
-            <input type="submit" class="btn_submit" value="댓글입력">
+            <input type="submit" class="btn_submit" value="댓글등록">
         </div>
 
         </form>

From 73f3c4a8ad18b64d8010729c7dc8730d2fe74529 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Fri, 8 Mar 2013 11:24:28 +0900
Subject: [PATCH 12/13] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EA=B2=8C?=
 =?UTF-8?q?=EC=8B=9C=ED=8C=90=EC=8A=A4=ED=82=A8=20=EC=B6=94=EC=B2=9C=20?=
 =?UTF-8?q?=EB=B9=84=EC=B6=94=EC=B2=9C=20ajax=20=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=A4=80=EB=B9=84=20=EB=A7=88=ED=81=AC=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skin/board/basic/view.skin.php   | 10 ++++++++--
 skin/board/gallery/view.skin.php | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php
index 79ac40243..9d0c5a283 100644
--- a/skin/board/basic/view.skin.php
+++ b/skin/board/basic/view.skin.php
@@ -144,8 +144,14 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
         <? if ($scrap_href || $good_href || $nogood_href) { ?>
         <div id="bo_v_act">
             <? if ($scrap_href) { ?><a href="<?=$scrap_href; ?>" target="_blank" class="btn_b01" onclick="win_scrap(this.href); return false;">스크랩</a><? } ?>
-            <? if ($good_href) {?><a href="<?=$good_href?>" target="hiddenframe" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a><? } ?>
-            <? if ($nogood_href) {?><a href="<?=$nogood_href?>" target="hiddenframe" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a><? } ?>
+            <? if ($good_href) {?>
+                <a href="<?=$good_href?>" target="hiddenframe" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a>
+                <span id="bo_v_act_good"></span>
+            <? } ?>
+            <? if ($nogood_href) {?>
+                <a href="<?=$nogood_href?>" target="hiddenframe" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a>
+                <span id="bo_v_act_nogood"></span>
+            <? } ?>
         </div>
         <? } else {
             if($board['bo_use_good'] || $board['bo_use_nogood']) {
diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php
index 79ac40243..9d0c5a283 100644
--- a/skin/board/gallery/view.skin.php
+++ b/skin/board/gallery/view.skin.php
@@ -144,8 +144,14 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
         <? if ($scrap_href || $good_href || $nogood_href) { ?>
         <div id="bo_v_act">
             <? if ($scrap_href) { ?><a href="<?=$scrap_href; ?>" target="_blank" class="btn_b01" onclick="win_scrap(this.href); return false;">스크랩</a><? } ?>
-            <? if ($good_href) {?><a href="<?=$good_href?>" target="hiddenframe" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a><? } ?>
-            <? if ($nogood_href) {?><a href="<?=$nogood_href?>" target="hiddenframe" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a><? } ?>
+            <? if ($good_href) {?>
+                <a href="<?=$good_href?>" target="hiddenframe" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a>
+                <span id="bo_v_act_good"></span>
+            <? } ?>
+            <? if ($nogood_href) {?>
+                <a href="<?=$nogood_href?>" target="hiddenframe" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a>
+                <span id="bo_v_act_nogood"></span>
+            <? } ?>
         </div>
         <? } else {
             if($board['bo_use_good'] || $board['bo_use_nogood']) {

From f090c9c8e495951bee24a937774e992b7a37d0c6 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Fri, 8 Mar 2013 11:39:21 +0900
Subject: [PATCH 13/13] =?UTF-8?q?.gitignore=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore |  2 +-
 test.php   | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index f14f4f40b..9d3c29cd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ data
 config.php
 test*
 sirgle
-caption_sr_test.php
+sr_*
diff --git a/test.php b/test.php
index 5b901a2ab..b8b529015 100644
--- a/test.php
+++ b/test.php
@@ -1,15 +1,22 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 <head>
-<meta charset="UTF-8">
-<style>
-html {margin:0;padding:0;font-size:300%;font-family:"gulim"}
-#x1 {width:100px;padding:1%;background:#ddd}
-</style>
+<meta charset="utf-8">
+<title>AJAX 동적 컨텐츠 테스트</title>
+<script src="js/jquery-1.8.3.min.js"></script>
 </head>
 <body>
 
-<div id="x1">깊은 산 속 옹달샘 누가 와서 먹나요</div>
+<a href="">클릭</a>
+<div></div>
+
+<script>
+$(function(){
+    $('a').click(function(){
+        $('div').text('클릭되었습니다.');
+    });
+});
+</script>
 
 </body>
 </html>
\ No newline at end of file