g4s merge 충돌수정

2013-07-09 17:26:41 +09:00
parent c02513cc05 90c02e4391
commit f250956d4e
18 changed files with 285 additions and 26 deletions
--- a/plugin/gcaptcha/info.php
+++ b/plugin/gcaptcha/info.php
@ -1,17 +0,0 @@
-<?php
-include_once("./_common.php");
-
-// prepare an array of wavfiles
-$wavs_dir = $g4['path'].'/plugin/captcha/wavs/';
-$wav = $wavs_dir.'0.wav';
-
-$fields = join('/',array( 'H8ChunkID', 'VChunkSize', 'H8Format',
-                          'H8Subchunk1ID', 'VSubchunk1Size',
-                          'vAudioFormat', 'vNumChannels', 'VSampleRate',
-                          'VByteRate', 'vBlockAlign', 'vBitsPerSample' ));
-
-$fp     = fopen($wav,'rb');
-$header = fread($fp,36);
-$info   = unpack($fields,$header);
-print_r2($info);
-?>