From 508d060219e83d677181a5383c3d2bc87bcf1bdd Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Sat, 12 Jan 2013 15:52:32 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BA=A1=EC=B0=A8=EC=9D=B4=EB=AF=B8=EC=A7=80?=
 =?UTF-8?q?=EC=99=80=20=EC=BA=A1=EC=B1=A0=EC=9D=8C=EC=84=B1=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=EC=9D=84=20=EB=AF=B8=EB=A6=AC=20=EB=A7=8C=EB=93=A4?=
 =?UTF-8?q?=EC=96=B4=20=EB=86=93=EA=B3=A0=20img=20src=20=EC=97=90=20?=
 =?UTF-8?q?=EB=85=B8=EC=B6=9C=ED=95=98=EB=8A=94=20=EB=B0=A9=EC=8B=9D?=
 =?UTF-8?q?=EC=9C=BC=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.php                  |  3 +-
 config.php                             |  4 ++
 extend/captcha.extend.php              | 11 +++-
 head.sub.php                           |  3 -
 lib/common.lib.php                     | 30 ++++++++++
 plugin/captcha/captcha.lib.php         | 83 +++++++++++++++++++++++---
 plugin/captcha/wav.php                 |  1 +
 skin/member/neo/register_form.skin.php |  4 +-
 test.php                               | 41 +------------
 9 files changed, 124 insertions(+), 56 deletions(-)

diff --git a/bbs/register_form.php b/bbs/register_form.php
index 5e996d4c3..150396459 100644
--- a/bbs/register_form.php
+++ b/bbs/register_form.php
@@ -1,7 +1,7 @@
 <?
+define('_CAPTCHA_', 1);
 include_once('./_common.php');
 include_once($g4['path'].'/lib/register.lib.php');
-if ($captcha->lib) include_once($captcha->lib);
 
 // 불법접근을 막도록 토큰생성
 $token = md5(uniqid(rand(), true));
@@ -102,7 +102,6 @@ if ($w == "") {
 // 회원아이콘 경로
 $mb_icon = $g4['path'].'/data/member/'.substr($member['mb_id'],0,2).'/'.$member['mb_id'].'.gif';
 $member_skin_path = $g4['path'].'/skin/member/'.$config['cf_member_skin'];
-$g4['js_file'][] = "{$g4['path']}/plugin/captcha/captcha.js";
 
 include_once('./_head.php');
 
diff --git a/config.php b/config.php
index cad60347a..780bdbdea 100644
--- a/config.php
+++ b/config.php
@@ -13,6 +13,10 @@ $g4['bbs_path']       = $g4['path'] . '/' . $g4['bbs'];
 $g4['bbs_img']        = 'img';
 $g4['bbs_img_path']   = $g4['path'] . '/' . $g4['bbs'] . '/' . $g4['bbs_img'];
 
+$g4['data_dir']       = 'data';
+$g4['cache_dir']      = 'cache';
+$g4['captcha_dir']    = 'captcha';
+
 $g4['admin']          = 'adm';
 $g4['admin_path']     = $g4['path'] . '/' . $g4['admin'];
 
diff --git a/extend/captcha.extend.php b/extend/captcha.extend.php
index c70a26aef..c09359805 100644
--- a/extend/captcha.extend.php
+++ b/extend/captcha.extend.php
@@ -2,12 +2,17 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 if (defined('_CAPTCHA_')) {
-    $captcha = (object)array(
-        'lib' => $g4['path']."/plugin/captcha/captcha.lib.php",
-        'js'  => $g4['path']."/plugin/captcha/captcha.js"
+    $captcha = (object)Array(
+        'lib'   => $g4['path']."/plugin/captcha/captcha.lib.php",
+        'js'    => $g4['path']."/plugin/captcha/captcha.js",
+        'fonts' => $g4['path']."/plugin/captcha/fonts"
     );
 
     include_once($captcha->lib);
+    $g4['js_file'][] = $captcha->js;
+
+    $captcha_obj = new captcha();
+    $captcha_obj->run();
 } else {
     unset($_SESSION['ss_captcha_use']);
 }
diff --git a/head.sub.php b/head.sub.php
index fc3584c1e..997f9c794 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -79,9 +79,6 @@ if (defined('_EDITOR_')) {
     $g4['js_file'][] = $editor->js;
     $g4['js_file'][] = $editor->config_js;
 }
-if (defined('_CAPTCHA_')) {
-    $g4['js_file'][] = $captcha->js;
-}
 ?>
 <!--[if lte IE 8]>
 <script src="<?=$g4['path']?>/js/html5.js"></script>
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 5b49d828b..c24fb7423 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1575,4 +1575,34 @@ function is_checked($field)
 {
     return !empty($_POST[$field]);
 }
+
+
+function mk_subdir($subdir)
+{
+    global $g4;
+    $data_path = $g4['path'].'/'.$g4['data_dir'];
+    $data_subpath = $data_path.'/'.$subdir;
+    if (!is_dir($data_subpath)) {
+        @mkdir($data_subpath, 0707);
+        @chmod($data_subpath, 0707);
+    }
+    return $data_subpath;
+}
+
+
+// 캡챠 파일의 상대 경로를 반환
+function captcha_file_path($extension='.png')
+{
+    global $g4;
+    mk_subdir($g4['cache_dir']);
+    $captcha_path = mk_subdir($g4['cache_dir'].'/'.$g4['captcha_dir']);
+    return $captcha_path.'/'.abs_ip2long().'_'.$_COOKIE['PHPSESSID'].$extension;
+}
+
+
+function abs_ip2long($ip='')
+{
+    $ip = $ip ? $ip : $_SERVER['REMOTE_ADDR'];
+    return abs(ip2long($ip));
+}
 ?>
\ No newline at end of file
diff --git a/plugin/captcha/captcha.lib.php b/plugin/captcha/captcha.lib.php
index 1b581251a..aa33fb500 100644
--- a/plugin/captcha/captcha.lib.php
+++ b/plugin/captcha/captcha.lib.php
@@ -76,7 +76,9 @@ class captcha
         return mt_rand($from, $to);
     }
 
-    function run() {
+    function run() 
+    {
+        global $captcha;
 
         // The text to draw
         $captcha_key = $this->get_captcha_key();
@@ -85,7 +87,7 @@ class captcha
         set_session('ss_captcha_cnt', 0);
 
         // Set the content-type
-        header('Content-Type: image/gif');
+        //header('Content-Type: image/png');
         // Create the image
         $im = imagecreatetruecolor($this->width, $this->height);
 
@@ -97,7 +99,7 @@ class captcha
 
         // Replace path by your own font path
         $fonts = Array();
-        foreach (glob('fonts/*.ttf') as $filename) {
+        foreach (glob($captcha->fonts.'/*.ttf') as $filename) {
             $fonts[] = $filename;
         }
         $font = $fonts[mt_rand(0, count($fonts)-1)];
@@ -117,9 +119,10 @@ class captcha
             imagettftext($im, $size, $angle, $x-2, $y-2, $grey, $font, $captcha_key);
         }
 
-        // Using imagepng() results in clearer text compared with imagejpeg()
-        imagegif($im);
+        imagepng($im, captcha_file_path('.png'), 0, NULL);
         imagedestroy($im);
+
+        make_wav();
     }
 }
 
@@ -147,9 +150,9 @@ function captcha_html($input_name, $captcha_id_suffix='')
     $html  = '<fieldset id="captcha'.$captcha_id_suffix.'" class="captcha">';
     $html .= '<legend class="sound_only">자동등록방지</legend>';
     //$html .= '<img src="" id="captcha" alt="자동등록방지 이미지" title="이미지를 클릭하시면 숫자가 바뀝니다.">';
-    $html .= '<iframe id="captcha_iframe" name="captcha_iframe" src="'.$g4['path'].'/plugin/captcha/run.php" scrolling="no" marginwidth="0" marginheight="0" title="자동등록방지숫자"></iframe>';
-    $html .= '<a href="'.$g4['path'].'/plugin/captcha/run.php" target="captcha_iframe">새로고침</a>';
-    $html .= '<a href="'.$g4['path'].'/plugin/captcha/wav.php" id="captcha_wav">음성듣기</a>';
+    $html .= '<iframe id="captcha_iframe" name="captcha_iframe" src="'.captcha_file_path('.png').'" scrolling="no" marginwidth="0" marginheight="0" title="자동등록방지숫자"></iframe>';
+    //$html .= '<a href="'.$g4['path'].'/plugin/captcha/run.php" target="captcha_iframe">새로고침</a>';
+    $html .= '<a href="'.captcha_file_path('.wav').'" id="captcha_wav">음성듣기</a>';
     $html .= '<label for="captcha_key">자동등록방지 입력</label>';
     $html .= '<input type="text" id="captcha_key" name="'.$input_name.'" class="captcha_box fieldset_input" size="5" maxlength="5" required title="자동등록방지 입력">';
     $html .= '<p class="sound_only">이미지의 숫자를 순서대로 입력하세요. 새로고침을 클릭하시면 새로운 숫자가 나타납니다.</p>';
@@ -175,4 +178,68 @@ function captcha_js($element)
 {
     return "if (!check_captcha({$element})) { return false; }";
 }
+
+
+function make_wav()
+{
+    global $g4;
+    $wavs_dir = $g4['path'].'/plugin/captcha/wavs/';
+    $number = (string)$_SESSION['ss_captcha_key'];
+    $wavs = array();
+    for($i=0;$i<strlen($number);$i++){
+        $file = $wavs_dir.$number[$i].'.wav';
+        $wavs[] = $file;
+    }
+
+    $wav_filepath = captcha_file_path('.wav');
+    $fp = fopen($wav_filepath, 'w+');
+    fwrite($fp, joinwavs($wavs));
+    fclose($fp);
+}
+
+function joinwavs($wavs)
+{
+    $fields = join('/',array( 'H8ChunkID', 'VChunkSize', 'H8Format',
+                              'H8Subchunk1ID', 'VSubchunk1Size',
+                              'vAudioFormat', 'vNumChannels', 'VSampleRate',
+                              'VByteRate', 'vBlockAlign', 'vBitsPerSample' ));
+    $data = '';
+    $info = array();
+    foreach($wavs as $wav){
+        $fp     = fopen($wav,'rb');
+        $header = fread($fp,36);
+        $info   = unpack($fields,$header);
+
+        // read optional extra stuff
+        if($info['Subchunk1Size'] > 16){
+            $header .= fread($fp,($info['Subchunk1Size']-16));
+        }
+
+        // read SubChunk2ID
+        $header .= fread($fp,4);
+
+        // read Subchunk2Size
+        $size  = unpack('vsize',fread($fp, 4));
+        $size  = $size['size'];
+
+        // read data
+        $data .= fread($fp,$size);
+    }
+
+    return ''
+        .pack('a4', 'RIFF')
+        .pack('V', strlen($data) + 36)
+        .pack('a4', 'WAVE')
+        .pack('a4', 'fmt ')
+        .pack('V', $info['Subchunk1Size'])  // 16
+        .pack('v', $info['AudioFormat'])    // 1
+        .pack('v', $info['NumChannels'])    // 1
+        .pack('V', $info['SampleRate'])     // 8000
+        .pack('V', $info['ByteRate'])       // 8000
+        .pack('v', $info['BlockAlign'])     // 1
+        .pack('v', $info['BitsPerSample'])  // 8
+        .pack('a4', 'data')
+        .pack('V', strlen($data))
+        .$data;
+}
 ?>
diff --git a/plugin/captcha/wav.php b/plugin/captcha/wav.php
index 78336ff17..f45405a9e 100644
--- a/plugin/captcha/wav.php
+++ b/plugin/captcha/wav.php
@@ -15,6 +15,7 @@ header('Content-Disposition: attachment;filename=captcha.wav');
 
 echo joinwavs($wavs);
 
+
 /**
  * Join multiple wav files
  *
diff --git a/skin/member/neo/register_form.skin.php b/skin/member/neo/register_form.skin.php
index 6c2f5e569..1429b4fbd 100644
--- a/skin/member/neo/register_form.skin.php
+++ b/skin/member/neo/register_form.skin.php
@@ -162,7 +162,7 @@ var member_skin_path = "<?=$member_skin_path?>";
 </tr>
 <? } ?>
 
-<? if (isset($member['mb_open_date']) && $member['mb_open_date'] <= date("Y-m-d", $g4['server_time'] - ($config['cf_open_modify'] * 86400)) || !$member['mb_open_date']) { // 정보공개 수정일이 지났다면 수정가능 ?>
+<? if (isset($member['mb_open_date']) && $member['mb_open_date'] <= date("Y-m-d", $g4['server_time'] - ($config['cf_open_modify'] * 86400)) || empty($member['mb_open_date'])) { // 정보공개 수정일이 지났다면 수정가능 ?>
 <tr>
     <th scope="row"><label for="reg_mb_open">정보공개</label></th>
     <td>
@@ -195,7 +195,7 @@ var member_skin_path = "<?=$member_skin_path?>";
 <? } ?>
 </table>
 
-<?=$captcha_html?>
+<?=captcha_html('wr_key');?>
 
 <div class="btn_confirm">
     <input type="submit" class="btn_submit" value="회원가입" accesskey="s">
diff --git a/test.php b/test.php
index 7e400e7d1..456361658 100644
--- a/test.php
+++ b/test.php
@@ -1,39 +1,4 @@
 <?
-$str = "xx";
-$len = 2;
-//echo ord($str{$len});
-?>
-
-<!doctype html>
-<html lang="ko">
-<head>
-<title>테스트</title>
-<meta charset="utf-8">
-<style>
-input {
-border-radius:7px;  /*모서리 깍이는 정도*/
-border:1px solid #dedede;  /*선두께, 스타일(점선), 컬러*/
-background-color:#f7f7f7;  /*배경 컬러*/
-padding:5px;
-box-shadow:0 0 10px silver;
-}
-input:focus {
-border-radius:7px;  /*모서리 깍이는 정도*/
-border:1px solid #ff3061;  /*선두께, 스타일(점선), 컬러*/
-background-color:#f7f7f7;  /*배경 컬러*/
-padding:5px;
-box-shadow:0 0 10px #ff3061;
-outline:0;
-}
-</style>
-</head>
-<body>
-
-
-<label for="text">테스트 필수</label>
-<input type="text" id="text" title="테스트">
-
-<input type="checkbox">
-
-</body>
-</html>
\ No newline at end of file
+include_once('./_common.php');
+echo abs_ip2long();
+?>
\ No newline at end of file