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

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source
This commit is contained in:
whitedot
2013-06-10 17:21:17 +09:00
parent d498ce8e4f ffbc3f18f6
commit 13999cbf54
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/ckeditor/config.js
View File

@ -106,8 +106,8 @@ CKEDITOR.editorConfig = function( config ) {
'Arial;Comic Sans MS;Courier New;Lucida Sans Unicode;monospace;sans-serif;serif;Tahoma;Times New Roman;Verdana'; 'Arial;Comic Sans MS;Courier New;Lucida Sans Unicode;monospace;sans-serif;serif;Tahoma;Times New Roman;Verdana';
config.fontSize_defaultLabel = "10pt"; config.fontSize_defaultLabel = "10pt";
config.fontSize_sizes = "7pt/9px;8pt/11px;9pt/12px;10pt/13px;11pt/15px;14pt/19px;18pt/24px;24pt/32px;36/48px;"; config.fontSize_sizes = "7pt/9px;8pt/11px;9pt/12px;10pt/13px;11pt/15px;14pt/19px;18pt/24px;24pt/32px;36/48px;";
config.enterMode = CKEDITOR.ENTER_BR; config.enterMode = CKEDITOR.ENTER_DIV;
config.shiftEnterMode = CKEDITOR.ENTER_P; config.shiftEnterMode = CKEDITOR.ENTER_DIV;
config.filebrowserUploadUrl = g4_ckeditor_url+"/upload.php?type=Images"; config.filebrowserUploadUrl = g4_ckeditor_url+"/upload.php?type=Images";
config.keystrokes=[ config.keystrokes=[
// Formatting // Formatting

2
plugin/gcaptcha/gcaptcha.js
View File

@ -26,7 +26,7 @@ function chk_captcha()
$(function() { $(function() {
$("#captcha").click(function(e) { $("#captcha").click(function(e) {
this.setAttribute("src", g4_url+"/plugin/captcha/run.php?t="+(new Date).getTime()); this.setAttribute("src", g4_url+"/plugin/gcaptcha/run.php?t="+(new Date).getTime());
var keycode = (e.keyCode ? e.keyCode : e.which); var keycode = (e.keyCode ? e.keyCode : e.which);
// 첫 실행에서는 포커스를 주지 않음 // 첫 실행에서는 포커스를 주지 않음
if (typeof(keycode) != "undefined") { if (typeof(keycode) != "undefined") {

4
skin/member/basic/register_form.skin.php
View File

@ -342,7 +342,7 @@ function fregisterform_submit(f)
} }
} }
if (typeof(f.mb_recommend) != "undefined") { if (typeof(f.mb_recommend) != "undefined" && f.mb_recommend.value) {
if (f.mb_id.value == f.mb_recommend.value) { if (f.mb_id.value == f.mb_recommend.value) {
alert("본인을 추천할 수 없습니다."); alert("본인을 추천할 수 없습니다.");
f.mb_recommend.focus(); f.mb_recommend.focus();
@ -357,6 +357,7 @@ function fregisterform_submit(f)
} }
} }
/*
if (typeof(f.mb_hp) != "undefined" && f.mb_hp.value) { if (typeof(f.mb_hp) != "undefined" && f.mb_hp.value) {
var error = ""; var error = "";
$.ajax({ $.ajax({
@ -381,6 +382,7 @@ function fregisterform_submit(f)
return false; return false;
} }
} }
*/
<?php echo chk_captcha_js(); ?> <?php echo chk_captcha_js(); ?>