Merge branch 'g4s'

This commit is contained in:
chicpro
2013-05-02 17:03:03 +09:00
8 changed files with 31 additions and 10 deletions

View File

@ -95,6 +95,7 @@ if (file_exists($dbconfig_file)) {
$connect_db = sql_connect(G4_MYSQL_HOST, G4_MYSQL_USER, G4_MYSQL_PASSWORD) or die('MySQL Connect Error!!!');
$select_db = sql_select_db(G4_MYSQL_DB, $connect_db) or die('MySQL DB Error!!!');
@mysql_query(" set names utf8 ");
if (defined(G4_TIMEZONE)) @mysql_query(" set time_zone = '".G4_TIMEZONE."'");
} else {
?>

View File

@ -6,9 +6,10 @@
// 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
define('_GNUBOARD_', true);
define('G4_TIMEZONE', 'Asia/Seoul');
if (PHP_VERSION >= '5.3.0') {
//if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul");
date_default_timezone_set("Asia/Seoul");
date_default_timezone_set(G4_TIMEZONE);
}
//==============================================================================

View File

@ -116,7 +116,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<th scope="row">내용</th>
<td>
<?php if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?php } ?>
<textarea id="wr_content" name="wr_content" required
<textarea id="wr_content" name="wr_content" required title="댓글 내용"
<?php if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?php } ?>><?php echo $c_wr_content; ?></textarea>
<?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
</td>
@ -125,7 +125,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
</table>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="댓글등록">
<input type="submit" value="댓글등록" id="btn_submit" class="btn_submit" accesskey="s">
</div>
</form>
@ -233,6 +233,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php if($is_guest) echo chk_captcha_js(); ?>
document.getElementById("btn_submit").disabled = "disabled";
return true;
}

View File

@ -234,6 +234,8 @@ function fwrite_submit(f)
<?php if ($is_guest) { echo chk_captcha_js(); } ?>
document.getElementById("btn_submit").disabled = "disabled";
return true;
}
</script>

View File

@ -226,7 +226,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<p>
작성하신 내용을 제출하시려면 <strong><?php echo $w==''?'회원가입':'정보수정'; ?></strong> 버튼을, 작성을 취소하고 목록으로 돌아가시려면 <strong>취소</strong> 링크를 누르세요.
</p>
<input type="submit" value="<?php echo $w==''?'회원가입':'정보수정'; ?>" class="btn_submit" accesskey="s">
<input type="submit" value="<?php echo $w==''?'회원가입':'정보수정'; ?>" id="btn_submit" class="btn_submit" accesskey="s">
<a href="<?php echo $g4['path'] ?>/" class="btn_cancel">취소</a>
</div>
</form>
@ -336,12 +336,19 @@ 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) {
alert('본인을 추천할 수 없습니다.');
f.mb_recommend.focus();
return false;
}
var msg = reg_mb_recommend_check();
if (msg) {
alert(msg);
f.mb_recommend.select();
return false;
}
}
<?php if ($config['cf_kcpcert_use']) { ?>
@ -371,6 +378,8 @@ function fregisterform_submit(f)
<?php echo chk_captcha_js(); ?>
document.getElementById("btn_submit").disabled = "disabled";
return true;
}
</script>

View File

@ -117,7 +117,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<th scope="row">내용</th>
<td>
<?php if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?php } ?>
<textarea id="wr_content" name="wr_content" maxlength="10000" required class="required"
<textarea id="wr_content" name="wr_content" maxlength="10000" required class="required" title="댓글 내용"
<?php if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?php } ?>><?php echo $c_wr_content; ?></textarea>
<?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
<script>
@ -136,7 +136,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
</table>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="댓글등록">
<input type="submit" value="댓글등록" id="btn_submit" class="btn_submit" accesskey="s">
</div>
</form>
@ -244,6 +244,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php if($is_guest) echo chk_captcha_js(); ?>
document.getElementById("btn_submit").disabled = "disabled";
return true;
}

View File

@ -147,7 +147,7 @@ echo $option_hidden;
<p>
작성하신 내용을 제출하시려면 <strong>글쓰기</strong> 버튼을, 작성을 취소하고 목록으로 돌아가시려면 <strong>취소</strong> 링크를 누르세요.
</p>
<input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
<input type="submit" value="글쓰기" id="btn_submit" class="btn_submit" accesskey="s">
<a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
</div>
</form>
@ -218,6 +218,8 @@ function fwrite_submit(f)
<?php echo $captcha_js; // 캡챠 사용시 자바스크립트에서 입력된 캡챠를 검사함 ?>
document.getElementById("btn_submit").disabled = "disabled";
return true;
}
</script>

View File

@ -228,7 +228,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<p>
작성하신 내용를 발송하시려면 <strong><?php echo $w==''?'회원가입':'정보수정'; ?></strong> 버튼을, 작성을 취소하고 창을 닫으시려면 <strong>취소</strong> 링크를 누르세요.
</p>
<input type="submit" value="<?php echo $w==''?'회원가입':'정보수정'; ?>" class="btn_submit" accesskey="s">
<input type="submit" value="<?php echo $w==''?'회원가입':'정보수정'; ?>" id="btn_submit" class="btn_submit" accesskey="s">
<a href="<?php echo $g4['path'] ?>/" class="btn_cancel">취소</a>
</div>
</form>
@ -379,6 +379,8 @@ function fregisterform_submit(f)
<?php echo chk_captcha_js(); ?>
document.getElementById("btn_submit").disabled = "disabled";
return true;
}
</script>