firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g5 merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-09-13 15:22:15 +09:00
parent 0f78b67eb7 5d332663d6
commit 8c0d61e772
55 changed files with 818 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/gcaptcha/example.php
View File

@ -13,7 +13,7 @@ include_once("./_common.php");
<script>
function change_captcha()
{
document.getElementById('captcha').setAttribute('src', g4_path+'/plugin/captcha/run.php?t='+(new Date).getTime());
document.getElementById('captcha').setAttribute('src', g5_path+'/plugin/captcha/run.php?t='+(new Date).getTime());
}
function form_submit(f)

4
plugin/gcaptcha/gcaptcha.js
View File

@ -6,7 +6,7 @@ function chk_captcha()
var captcha_result = false;
$.ajax({
type: "POST",
url: g4_gcaptcha_url+"/get.php",
url: g5_gcaptcha_url+"/get.php",
data: {
"captcha_key": captcha_key.value
},
@ -26,7 +26,7 @@ function chk_captcha()
$(function() {
$("#captcha").click(function(e) {
this.setAttribute("src", g4_url+"/plugin/gcaptcha/run.php?t="+(new Date).getTime());
this.setAttribute("src", g5_url+"/plugin/gcaptcha/run.php?t="+(new Date).getTime());
var keycode = (e.keyCode ? e.keyCode : e.which);
// 첫 실행에서는 포커스를 주지 않음
if (typeof(keycode) != "undefined") {

2
plugin/gcaptcha/gcaptcha.lib.php
View File

@ -179,7 +179,7 @@ function captcha_html($class='captcha')
$jpg_file_url = G5_DATA_URL.'/cache/'.$obj->captcha_filename.'.jpg';
$mp3_file_url = G5_DATA_URL.'/cache/'.$obj->captcha_filename.'.mp3';
$html .= "\n".'<script>var g4_gcaptcha_url = "'.G5_GCAPTCHA_URL.'";</script>';
$html .= "\n".'<script>var g5_gcaptcha_url = "'.G5_GCAPTCHA_URL.'";</script>';
$html .= "\n".'<script src="'.G5_GCAPTCHA_URL.'/gcaptcha.js"></script>';
$html .= '<fieldset id="captcha" class="'.$class.'">';
$html .= '<legend class="sound_only">자동등록방지</legend>';