From da8c5ebe40728d8eab9fdd9eb11a5449ba76f3a0 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Mon, 11 Mar 2013 15:11:58 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B8=8C=EB=9D=BC=EC=9A=B0=EC=A0=80=EC=97=90?=
 =?UTF-8?q?=20wav=EB=A5=BC=20=EC=8B=A4=ED=96=89=ED=95=98=EA=B8=B0=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=9C=20=ED=94=8C=EB=9F=AC=EA=B7=B8=EC=9D=B8?=
 =?UTF-8?q?=EC=9D=B4=20=EC=97=86=EB=8B=A4=EB=A9=B4=20=EC=9D=8C=EC=84=B1=20?=
 =?UTF-8?q?=EC=BA=A1=EC=B1=A0=EB=8A=94=20=EC=A7=80=EC=9B=90=EB=90=98?=
 =?UTF-8?q?=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/gcaptcha/gcaptcha.lib.php |  5 ++-
 bbs/gcaptcha/wav.php          | 74 -----------------------------------
 2 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 bbs/gcaptcha/wav.php

diff --git a/bbs/gcaptcha/gcaptcha.lib.php b/bbs/gcaptcha/gcaptcha.lib.php
index a1b9af3a2..4f9bf841b 100644
--- a/bbs/gcaptcha/gcaptcha.lib.php
+++ b/bbs/gcaptcha/gcaptcha.lib.php
@@ -172,6 +172,7 @@ function captcha_html($class='captcha')
     $obj = new gcaptcha();
     $obj->run();
 
+    $rand = rand();
     $jpg_file_url = G4_DATA_URL.'/cache/'.$obj->captcha_filename.'.jpg';
     $wav_file_url = G4_DATA_URL.'/cache/'.$obj->captcha_filename.'.wav';
 
@@ -179,8 +180,8 @@ function captcha_html($class='captcha')
     $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.'?_='.rand().'" alt="자동등록방지 숫자">';
-    $html .= '<a href="'.$wav_file_url.'" id="captcha_wav" target="_blank"><img src="'.G4_GCAPTCHA_URL.'/img/sound.gif" alt="숫자를 음성으로 듣기"></a>';
+    $html .= '<img src="'.$jpg_file_url.'?_='.$rand.'" alt="자동등록방지 숫자">';
+    $html .= '<a href="'.$wav_file_url.'?_='.$rand.'" 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 .= '</fieldset>';
diff --git a/bbs/gcaptcha/wav.php b/bbs/gcaptcha/wav.php
deleted file mode 100644
index f45405a9e..000000000
--- a/bbs/gcaptcha/wav.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-include_once("./_common.php");
-
-// prepare an array of wavfiles
-$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;
-}
-
-header('Content-type: audio/x-wav');
-header('Content-Disposition: attachment;filename=captcha.wav');
-
-echo joinwavs($wavs);
-
-
-/**
- * Join multiple wav files
- *
- * All wave files need to have the same format and need to be uncompressed.
- * The headers of the last file will be used (with recalculated datasize
- * of course)
- *
- * @link http://ccrma.stanford.edu/CCRMA/Courses/422/projects/WaveFormat/
- * @link http://www.thescripts.com/forum/thread3770.html
- */
-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;
-}
-?>