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] =?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') {