diff --git a/bbs/gcaptcha/down.php b/bbs/gcaptcha/down.php deleted file mode 100644 index b7057153e..000000000 --- a/bbs/gcaptcha/down.php +++ /dev/null @@ -1,34 +0,0 @@ - diff --git a/bbs/gcaptcha/gcaptcha.js b/bbs/gcaptcha/gcaptcha.js index 536dcd7bf..a1657af64 100644 --- a/bbs/gcaptcha/gcaptcha.js +++ b/bbs/gcaptcha/gcaptcha.js @@ -35,37 +35,37 @@ $(function() { }) .trigger("click"); - $("#captcha_wav").click(function(){ + $("#captcha_mp3").click(function(){ $("body").css("cursor", "wait"); - var wav_url = this.href+"?t="+new Date().getTime(); + var mp3_url = this.href+"?t="+new Date().getTime(); var html5use = false; var html5audio = document.createElement("audio"); - if (html5audio.canPlayType && html5audio.canPlayType("audio/wav")) { - var wav = new Audio(wav_url); - wav.id = "wav_audio"; + if (html5audio.canPlayType && html5audio.canPlayType("audio/mpeg")) { + var wav = new Audio(mp3_url); + wav.id = "mp3_audio"; wav.autoplay = true; wav.controls = false; wav.autobuffer = false; wav.loop = false; - if ($("#wav_audio").length) $("#wav_audio").remove(); - $("#captcha_wav").after(wav); + if ($("#mp3_audio").length) $("#mp3_audio").remove(); + $("#captcha_mp3").after(wav); html5use = true; } if (!html5use) { - var object = ''; + var object = ''; object += ''; object += ''; object += ''; - object += ''; - object += ''; + object += ''; + object += ''; object += ''; - if ($("#wav_object").length) $("#wav_object").remove(); - $("#captcha_wav").after(object); + if ($("#mp3_object").length) $("#mp3_object").remove(); + $("#captcha_mp3").after(object); } $("body").css("cursor", "default"); diff --git a/bbs/gcaptcha/gcaptcha.lib.php b/bbs/gcaptcha/gcaptcha.lib.php index b8c6772fc..90682be12 100644 --- a/bbs/gcaptcha/gcaptcha.lib.php +++ b/bbs/gcaptcha/gcaptcha.lib.php @@ -125,7 +125,7 @@ class gcaptcha imagejpeg($im, G4_DATA_PATH.'/cache/'.$this->captcha_filename.'.jpg'); imagedestroy($im); - $this->make_wav($this->captcha_filename.'.wav'); + $this->make_mp3($this->captcha_filename); } function get_captcha_filename() @@ -133,21 +133,24 @@ class gcaptcha return 'gcaptcha-'.abs_ip2long().'_'.session_id(); } - function make_wav($captcha_filename) + function make_mp3($captcha_filename) { global $g4; $number = (string)$_SESSION['ss_captcha_key']; - $wavs = array(); + $mp3s = array(); for($i=0;$icaptcha_filename.'.jpg'; - $wav_file_url = G4_DATA_URL.'/cache/'.$obj->captcha_filename.'.wav'; + $mp3_file_url = G4_DATA_URL.'/cache/'.$obj->captcha_filename.'.mp3'; $html .= "\n".''; $html .= "\n".''; $html .= '
'; $html .= '자동등록방지'; $html .= '자동등록방지 숫자'; - $html .= '숫자를 음성으로 듣기'; + if (G4_IS_MOBILE) { + $html .= ''; + } else { + $html .= '숫자를 음성으로 듣기'; + } $html .= ''; $html .= '

자동등록방지 숫자를 순서대로 입력하세요.

'; $html .= '
'; @@ -207,50 +214,4 @@ function chk_captcha_js() { return "if (!chk_captcha()) return false;"; } - -function join_wavs($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; -} -?> +?> \ No newline at end of file diff --git a/bbs/gcaptcha/mp3/0.mp3 b/bbs/gcaptcha/mp3/0.mp3 new file mode 100644 index 000000000..a51bd81e1 Binary files /dev/null and b/bbs/gcaptcha/mp3/0.mp3 differ diff --git a/bbs/gcaptcha/mp3/1.mp3 b/bbs/gcaptcha/mp3/1.mp3 new file mode 100644 index 000000000..8bb5448b6 Binary files /dev/null and b/bbs/gcaptcha/mp3/1.mp3 differ diff --git a/bbs/gcaptcha/mp3/2.mp3 b/bbs/gcaptcha/mp3/2.mp3 new file mode 100644 index 000000000..0fc093579 Binary files /dev/null and b/bbs/gcaptcha/mp3/2.mp3 differ diff --git a/bbs/gcaptcha/mp3/3.mp3 b/bbs/gcaptcha/mp3/3.mp3 new file mode 100644 index 000000000..bcf0d27f0 Binary files /dev/null and b/bbs/gcaptcha/mp3/3.mp3 differ diff --git a/bbs/gcaptcha/mp3/4.mp3 b/bbs/gcaptcha/mp3/4.mp3 new file mode 100644 index 000000000..2b3b2c3e4 Binary files /dev/null and b/bbs/gcaptcha/mp3/4.mp3 differ diff --git a/bbs/gcaptcha/mp3/5.mp3 b/bbs/gcaptcha/mp3/5.mp3 new file mode 100644 index 000000000..2243fbee8 Binary files /dev/null and b/bbs/gcaptcha/mp3/5.mp3 differ diff --git a/bbs/gcaptcha/mp3/6.mp3 b/bbs/gcaptcha/mp3/6.mp3 new file mode 100644 index 000000000..dc640b242 Binary files /dev/null and b/bbs/gcaptcha/mp3/6.mp3 differ diff --git a/bbs/gcaptcha/mp3/7.mp3 b/bbs/gcaptcha/mp3/7.mp3 new file mode 100644 index 000000000..3e423af6c Binary files /dev/null and b/bbs/gcaptcha/mp3/7.mp3 differ diff --git a/bbs/gcaptcha/mp3/8.mp3 b/bbs/gcaptcha/mp3/8.mp3 new file mode 100644 index 000000000..59f4bcc61 Binary files /dev/null and b/bbs/gcaptcha/mp3/8.mp3 differ diff --git a/bbs/gcaptcha/mp3/9.mp3 b/bbs/gcaptcha/mp3/9.mp3 new file mode 100644 index 000000000..a1b5d0b46 Binary files /dev/null and b/bbs/gcaptcha/mp3/9.mp3 differ diff --git a/bbs/gcaptcha/wavs/0.wav b/bbs/gcaptcha/wavs/0.wav deleted file mode 100644 index d710f117e..000000000 Binary files a/bbs/gcaptcha/wavs/0.wav and /dev/null differ diff --git a/bbs/gcaptcha/wavs/1.wav b/bbs/gcaptcha/wavs/1.wav deleted file mode 100644 index a55a089a5..000000000 Binary files a/bbs/gcaptcha/wavs/1.wav and /dev/null differ diff --git a/bbs/gcaptcha/wavs/2.wav b/bbs/gcaptcha/wavs/2.wav deleted file mode 100644 index 7d92ebec6..000000000 Binary files a/bbs/gcaptcha/wavs/2.wav and /dev/null differ diff --git a/bbs/gcaptcha/wavs/3.wav b/bbs/gcaptcha/wavs/3.wav deleted file mode 100644 index 2423a16e8..000000000 Binary files a/bbs/gcaptcha/wavs/3.wav and /dev/null differ diff --git a/bbs/gcaptcha/wavs/4.wav b/bbs/gcaptcha/wavs/4.wav deleted file mode 100644 index 98ef13970..000000000 Binary files a/bbs/gcaptcha/wavs/4.wav and /dev/null differ diff --git a/bbs/gcaptcha/wavs/5.wav b/bbs/gcaptcha/wavs/5.wav deleted file mode 100644 index 0282fbc48..000000000 Binary files a/bbs/gcaptcha/wavs/5.wav and /dev/null differ diff --git a/bbs/gcaptcha/wavs/6.wav b/bbs/gcaptcha/wavs/6.wav deleted file mode 100644 index a2ce2fc89..000000000 Binary files a/bbs/gcaptcha/wavs/6.wav and /dev/null differ diff --git a/bbs/gcaptcha/wavs/7.wav b/bbs/gcaptcha/wavs/7.wav deleted file mode 100644 index 58db679a5..000000000 Binary files a/bbs/gcaptcha/wavs/7.wav and /dev/null differ diff --git a/bbs/gcaptcha/wavs/8.wav b/bbs/gcaptcha/wavs/8.wav deleted file mode 100644 index bd92986eb..000000000 Binary files a/bbs/gcaptcha/wavs/8.wav and /dev/null differ diff --git a/bbs/gcaptcha/wavs/9.wav b/bbs/gcaptcha/wavs/9.wav deleted file mode 100644 index 9044d0711..000000000 Binary files a/bbs/gcaptcha/wavs/9.wav and /dev/null differ diff --git a/css/admin.css b/css/admin.css index c9113492b..09db1fee3 100644 --- a/css/admin.css +++ b/css/admin.css @@ -36,7 +36,7 @@ h2 {font-size:1.2em} /* 캡챠 자동등록(입력)방지 기본 */ #captcha img {border:1px solid #ddd;border-right:0} -#captcha_wav img {border:1px solid #ddd;border-left:0;background:#494949} +#captcha_mp3 img {border:1px solid #ddd;border-left:0;background:#494949} /* 레이아웃 */ #hd {z-index:10;min-width:1000px;background:url('../adm/img/hd_bg.jpg') #383b3f top left repeat-x} diff --git a/css/default.css b/css/default.css index 2b3640a60..f2229f157 100644 --- a/css/default.css +++ b/css/default.css @@ -37,7 +37,7 @@ a:active {color:#000;text-decoration:underline} /* 캡챠 자동등록(입력)방지 기본 */ #captcha img {border:1px solid #cfded8;border-right:0} -#captcha_wav img {border:1px solid #cfded8;border-left:0;background:#494949} +#captcha_mp3 img {border:1px solid #cfded8;border-left:0;background:#494949} /* 상단 레이아웃 */ #hd {height:73px;border-top:3px solid #151515;border-bottom:1px solid #e7f1ed;background:#fff} diff --git a/css/mobile.css b/css/mobile.css index 6b0e489e7..2d4dd77e6 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -33,7 +33,7 @@ pre {overflow-x:scroll;font-size:1.1em} /* 캡챠 자동등록(입력)방지 기본 */ #captcha img {height:1.8em;border:1px solid #cfded8;border-right:0} -#captcha_wav img {padding:0.2em;height:22px !important;border:1px solid #cfded8;border-left:0;background:#494949} +#captcha_mp3 img {padding:0.2em;height:22px !important;border:1px solid #cfded8;border-left:0;background:#494949} /* 상단 레이아웃 */ #hd {background:#fff}