From 90ecd5076791870806a4f47b13069b41093fedaa Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Thu, 10 Jan 2013 11:31:59 +0900
Subject: [PATCH] =?UTF-8?q?captcha=20=EC=BD=94=EB=93=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/board.php                        | 1 +
 bbs/view_comment.php                 | 5 +++++
 bbs/write.php                        | 2 +-
 plugin/captcha/captcha.lib.php       | 5 ++---
 skin/board/neo/view_comment.skin.php | 3 +--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bbs/board.php b/bbs/board.php
index 88469ff61..938e1ec04 100644
--- a/bbs/board.php
+++ b/bbs/board.php
@@ -1,4 +1,5 @@
 <?
+define('_CAPTCHA_', true);
 include_once('./_common.php');
 
 if (!$board['bo_table']) {
diff --git a/bbs/view_comment.php b/bbs/view_comment.php
index 8653dfc66..5248a905c 100644
--- a/bbs/view_comment.php
+++ b/bbs/view_comment.php
@@ -1,6 +1,11 @@
 <?
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
 
+$captcha_html = "";
+if ($is_guest) {
+    $captcha_html = captcha_html('wr_key', '_comment');
+}
+
 @include_once($board_skin_path.'/view_comment.head.skin.php');
 
 // 코멘트를 새창으로 여는 경우 세션값이 없으므로 생성한다.
diff --git a/bbs/write.php b/bbs/write.php
index 49e458867..f61c20e37 100644
--- a/bbs/write.php
+++ b/bbs/write.php
@@ -207,7 +207,7 @@ if ($board['bo_use_dhtml_editor'] && $member['mb_level'] >= $board['bo_html_leve
 
 $captcha_html = "";
 if ($is_guest) {
-    $captcha_html = get_captcha('wr_key');
+    $captcha_html = captcha_html('wr_key');
 }
 
 $is_mail = false;
diff --git a/plugin/captcha/captcha.lib.php b/plugin/captcha/captcha.lib.php
index 4313ad805..465949029 100644
--- a/plugin/captcha/captcha.lib.php
+++ b/plugin/captcha/captcha.lib.php
@@ -137,15 +137,14 @@ $captcha->run();
 */
 
 // 캡챠이미지는 한개만 사용 가능함.
-function get_captcha($input_name, $captcha_no=1)
+function captcha_html($input_name, $captcha_id_suffix='')
 {
     global $g4;
 
     // 세션생성을 한후 다음페이지에서 해당 세션이 있을때만 올바른 캡챠코드인지 비교합니다.
     set_session('ss_captcha_use', true);
-    $captcha_class = str_pad($captcha_no,2,'0',STR_PAD_LEFT);// 캡챠 클래스를 선택할 수 있도록 지운아빠 2012-07-24
 
-    $code  = '<fieldset id="captcha'.$captcha_class.'">';
+    $code  = '<fieldset id="captcha'.$captcha_id_suffix.'">';
     $code .= '<legend>자동등록방지</legend>';
     //$code .= '<img src="" id="captcha" alt="자동등록방지 이미지" title="이미지를 클릭하시면 숫자가 바뀝니다.">';
     $code .= '<iframe id="captcha_iframe" name="captcha_iframe" src="'.$g4['path'].'/plugin/captcha/run.php" width="80" height="25" frameborder="0" scrolling="no"></iframe>';
diff --git a/skin/board/neo/view_comment.skin.php b/skin/board/neo/view_comment.skin.php
index 53d1630e9..d771ca42d 100644
--- a/skin/board/neo/view_comment.skin.php
+++ b/skin/board/neo/view_comment.skin.php
@@ -75,8 +75,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
             <? if ($is_guest) { ?>
             <label for="wr_name">이름</label> <input type="text" id="wr_name" name="wr_name" class="fieldset_input" maxLength="20" size="10" required>
             <label for="wr_password">패스워드</label> <input type="password" id="wr_password" name="wr_password" class="fieldset_input" maxLength="20" size="10" required>
-            <img id="kcaptcha_image" alt="" />
-            <input type="text" name="wr_key" class="fieldset_input" title="왼쪽의 글자를 입력하세요." size="10" required>
+            <? echo $captcha_html; ?>
             <? } ?>
             <input type="checkbox" id="wr_secret" name="wr_secret" value="secret">
             <label for="wr_secret">비밀글</label>