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 1/3] =?UTF-8?q?=EB=B8=8C=EB=9D=BC=EC=9A=B0=EC=A0=80?=
 =?UTF-8?q?=EC=97=90=20wav=EB=A5=BC=20=EC=8B=A4=ED=96=89=ED=95=98=EA=B8=B0?=
 =?UTF-8?q?=20=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;
-}
-?>

From a2d0a1be012e300ae4334cdc8a5746ff88289874 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Mon, 11 Mar 2013 15:13:43 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EB=8D=94=EC=9D=B4=EC=83=81=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/member_email_check.php | 45 ---------------------------------
 bbs/member_id_check.php    | 39 -----------------------------
 bbs/member_nick_check.php  | 51 --------------------------------------
 test.php                   | 13 +---------
 4 files changed, 1 insertion(+), 147 deletions(-)
 delete mode 100644 bbs/member_email_check.php
 delete mode 100644 bbs/member_id_check.php
 delete mode 100644 bbs/member_nick_check.php

diff --git a/bbs/member_email_check.php b/bbs/member_email_check.php
deleted file mode 100644
index e9a796500..000000000
--- a/bbs/member_email_check.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?
-include_once('./_common.php');
-
-$g4['title'] = 'E-mail 중복확인';
-include_once(G4_PATH.'/head.sub.php');
-
-$mb_email = trim($mb_email);
-
-if ($member[mb_id]) // 수정중 중복확인이면
-    $sql = " select mb_email from {$g4[member_table]} where mb_email = '{$mb_email}' and mb_id <> '{$member[mb_id]}' ";
-else
-    $sql = " select mb_email from {$g4[member_table]} where mb_email = '{$mb_email}' ";
-$row = sql_fetch($sql);
-
-if ($row[mb_email]) {
-    echo <<<HEREDOC
-    <script> 
-        alert(''.$mb_email.'은(는) 이미 다른 회원이 사용하는 E-mail이므로 사용하실 수 없습니다.');
-        //opener.fmbform.mb_email_enabled.value = "0"; // 새창으로 열 경우에...
-        parent.document.getElementById('mb_email_enabled').value = -1;
-        window.close();
-    </script>
-HEREDOC;
-} else {
-    if (!preg_match("/([0-9a-zA-Z_-]+)@([0-9a-zA-Z_-]+)\.([0-9a-zA-Z_-]+)/", $mb_email)) {
-        echo <<<HEREDOC
-        <script> 
-            alert(''.$mb_email.'은(는) E-mail 주소 형식이 아니므로 사용하실 수 없습니다.'); 
-            parent.document.getElementById('mb_email_enabled').value = '';
-            window.close();
-        </script>
-HEREDOC;
-    } else {
-        echo <<<HEREDOC
-        <script> 
-            alert(''.$mb_email.'은(는) 중복된 E-mail이 없습니다.'.PHP_EOL.PHP_EOL.'사용하셔도 좋습니다.'); 
-            parent.document.getElementById('mb_email_enabled').value = 1;
-            window.close();
-        </script>
-HEREDOC;
-    }
-}
-
-include_once(G4_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
diff --git a/bbs/member_id_check.php b/bbs/member_id_check.php
deleted file mode 100644
index 96362466e..000000000
--- a/bbs/member_id_check.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?
-include_once('./_common.php');
-
-$g4['title'] = '회원아이디 중복확인';
-include_once(G4_PATH.'/head.sub.php');
-
-$mb_id = trim($mb_id);
-
-$mb = get_member($mb_id);
-if ($mb[mb_id]) {
-?>
-    <script>
-    alert('<?=$mb_id?>은(는) 이미 가입된 회원아이디 이므로 사용하실 수 없습니다.');
-    parent.document.getElementById(\"mb_id_enabled\").value = -1;
-    window.close();
-    </script>';
-<?
-} else {
-    if (preg_match("/[\,]?{$mb_id}/i", $config[cf_prohibit_id])) {
-?>
-        <script>';
-        alert('<?=$mb_id?>은(는) 예약어로 사용하실 수 없는 회원아이디입니다.');
-        parent.document.getElementById(\"mb_id_enabled\").value = -2;
-        window.close();';
-        </script>';
-<?
-    } else {
-?>
-        <script>
-        alert('<?=$mb_id?>은(는) 중복된 회원아이디가 없습니다. 사용하셔도 좋습니다.');
-        parent.document.getElementById(\"mb_id_enabled\").value = 1;';
-        window.close();';
-        </script>';
-<?
-    }
-}
-
-include_once(G4_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
diff --git a/bbs/member_nick_check.php b/bbs/member_nick_check.php
deleted file mode 100644
index db5e86321..000000000
--- a/bbs/member_nick_check.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?
-include_once('./_common.php');
-
-$g4['title'] = '별명 중복확인';
-include_once(G4_PATH.'/head.sub.php');
-
-$mb_nick = trim($mb_nick);
-
-// 별명은 한글, 영문, 숫자만 가능
-if (!check_string($mb_nick, _G4_HANGUL_ + _G4_ALPHABETIC_ + _G4_NUMERIC_)) {
-?>
-    <script>
-    alert('별명은 공백없이 한글, 영문, 숫자만 입력 가능합니다.');
-    parent.document.getElementById('mb_nick_enabled').value = '';
-    window.close();
-    </script>
-<?
-    exit;
-}
-
-$mb = sql_fetch(" select mb_nick from $g4[member_table] where mb_nick = '$mb_nick' ");
-if ($mb[mb_nick]) {
-?>
-    <script>
-    alert('<?=$mb_nick?> 은(는) 이미 다른분께서 사용하고 있는 별명이므로 사용하실 수 없습니다.');
-    parent.document.getElementById('mb_nick_enabled').value = -1;
-    window.close();
-    </script>
-<?
-} else {
-    if (preg_match("/[\,]?{$mb_nick}/i", $config[cf_prohibit_id])) {
-?>
-        <script>
-        alert('<?=$mb_nick?> 은(는) 예약어로 사용하실 수 없는 별명입니다.');
-        parent.document.getElementById('mb_nick_enabled').value = -2;
-        window.close();
-        </script>
-<?
-    } else {
-?>
-        <script>
-        alert('<?=$mb_nick?> 은(는) 별명으로 사용할 수 있습니다.');
-        parent.document.getElementById('mb_nick_enabled').value = 1;
-        window.close();
-        </script>
-<?
-    }
-}
-
-include_once(G4_PATH.'/tail.sub.php');
-?>
\ No newline at end of file
diff --git a/test.php b/test.php
index f4ccb9dae..30b07f815 100644
--- a/test.php
+++ b/test.php
@@ -1,12 +1 @@
-<?
-echo a(2);
-
-function a($b)
-{
-    global $x;
-
-    echo $x+$b;
-}
-
-$x = 1;
-?>
\ No newline at end of file
+<embed height="50" width="100" src="/g4s/data/cache/gcaptcha-1890146535_50ecmttsoa8jl5214rqc7q18s2.wav" autostart="true">
\ No newline at end of file

From 6880e82db855bd6357f3274824755d68a5329689 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 11 Mar 2013 15:15:18 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B7=B0=20#371?=
 =?UTF-8?q?=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=B2=98=EB=A6=AC,=20?=
 =?UTF-8?q?=EB=B0=8F=20#325=20=EC=9D=98=EA=B2=AC=201=20=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=A5=B8=20=EC=83=88=EC=B0=BD=20=EC=95=8C=EB=A6=BC=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/admin.css      | 25 +++++++++++--------------
 css/default.css    |  2 +-
 lib/common.lib.php |  4 ++--
 tail.sub.php       |  2 ++
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index 0a8de5b21..a87fcd919 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -288,22 +288,22 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 .new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:"dotum";font-weight:bold;text-decoration:none}
 .new_win_desc {margin:0 auto;width:93%}
 
-/* 사이드뷰 */
-.sv_wrap {display:inline-block;position:relative;font-weight:normal}
-.sv_wrap .sv {z-index:5;display:none;margin:5px 0 0;border:1px solid #283646;background:#334356}
-.sv_nojs .sv {display:block}
-.sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important}
-.sv_wrap a:focus,
-.sv_wrap a:hover,
-.sv_wrap a:active {text-decoration:none !important}
-.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important;background:#ddd}
-
 /* 관리자 패스워드 확인 */
 #admin_confirm {padding:0 0 10px;background:#222;text-align:center}
 #admin_confirm p {margin:0 0 10px;color:#9ab9c5;background:#383a3f}
 #admin_confirm label {color:#fff}
 #admin_confirm .frm_input {border-color:#000}
 
+/* 사이드뷰 */
+.sv_wrap {display:inline-block;position:relative;font-weight:normal}
+.sv_wrap .sv {z-index:5;display:none;margin:5px 0 0;border:1px solid #283646;background:#334356}
+.sv_js_off .sv {display:block}
+.sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important}
+.sv_wrap a:focus,
+.sv_wrap a:hover,
+.sv_wrap a:active {text-decoration:none !important}
+.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important;background:#ddd}
+
 /* pagination */
 .pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}
 .pg {display:inline-block;border:1px solid #ddd;letter-spacing:-4px}
@@ -317,7 +317,4 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 .pg_prev {border-right:1px solid #ddd}
 .pg_end,
 .pg_next {border-left:1px solid #ddd}
-.pg_current {background:#444;color:#fff;font-weight:bold}
-
-/* 스킨자료실 바로가기 */
-.goto_sirskin {color:#ff5300}
\ No newline at end of file
+.pg_current {background:#444;color:#fff;font-weight:bold}
\ No newline at end of file
diff --git a/css/default.css b/css/default.css
index 6d4ae8f9c..400fd1301 100644
--- a/css/default.css
+++ b/css/default.css
@@ -641,7 +641,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
 /* 사이드뷰 */
 .sv_wrap {display:inline-block;position:relative;font-weight:normal}
 .sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646;background:#111}
-.sv_nojs .sv {display:block}
+.sv_js_off .sv {display:block}
 .sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important}
 .sv_wrap a:focus,
 .sv_wrap a:hover,
diff --git a/lib/common.lib.php b/lib/common.lib.php
index f18bd6476..1475dff6c 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -998,7 +998,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
     $email    = get_text($email);
     $homepage = get_text($homepage);
 
-    $str = "<span class=\"sv_wrap\">\n";
+    $str = "<span class=\"sv_wrap sv_js_off\">\n";
     $str .= $tmp_name."\n";
 
     if(!G4_IS_MOBILE) {
@@ -1024,7 +1024,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
             $str2 .= "<a href=\"".G4_ADMIN_URL."/point_list.php?sfl=mb_id&amp;stx=".$mb_id."\" target=\"_blank\">포인트내역</a>\n";
         }
         $str2 .= "</span>\n";
-        $str .= $str2."\n<noscript class=\"sv_nojs\">".$str2."</noscript>";
+        $str .= $str2;//."\n<noscript class=\"sv_nojs\">".$str2."</noscript>";
     }
 
     $str .= "</span>";
diff --git a/tail.sub.php b/tail.sub.php
index c129f0625..6360af7b9 100644
--- a/tail.sub.php
+++ b/tail.sub.php
@@ -21,6 +21,8 @@ $(function() {
 <![endif]-->
 
 <script>
+$('.sv_wrap').removeClass('sv_js_off'); //js 사용 가능한지를 사이드뷰에 알려주는 역할
+
 $(function(){
     var hide_menu = false;
     var mouse_event = false;