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-10-15 16:40:10 +09:00
parent 6c827a111e 680990d6d2
commit 8959bda0af
135 changed files with 2836 additions and 2227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/formmail.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
if (!$config['cf_email_use'])
alert_close('환경설정에서 \"메일발송 사용\"에 체크하셔야 메일을 발송할 수 있습니다.\\n\\n관리자에게 문의하시기 바랍니다.');

2
bbs/formmail_send.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
include_once(G5_LIB_PATH.'/mailer.lib.php');
if (!$config['cf_email_use'])

2
bbs/memo_form.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
if ($is_guest)
alert_close('회원만 이용하실 수 있습니다.');

2
bbs/memo_form_update.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
if ($is_guest)
alert('회원만 이용하실 수 있습니다.');

89
bbs/move.php
View File

@ -42,7 +42,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
?>
<div id="copymove" class="new_win">
<h1 id="new_win_title"><?php echo $g5['title'] ?></h1>
<h1 id="win_title"><?php echo $g5['title'] ?></h1>
<form name="fboardmoveall" method="post" action="./move_update.php" onsubmit="return fboardmoveall_submit(this);">
<input type="hidden" name="sw" value="<?php echo $sw ?>">
@ -54,47 +54,50 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
<input type="hidden" name="page" value="<?php echo $page ?>">
<input type="hidden" name="act" value="<?php echo $act ?>">
<input type="hidden" name="url" value="<?php echo $_SERVER['HTTP_REFERER'] ?>">
<table class="basic_tbl">
<caption><?php echo $act ?>할 게시판을 한개 이상 선택하여 주십시오.</caption>
<thead>
<tr>
<th scope="col">
<label for="chkall" class="sound_only">게시판 전체</label>
<input type="checkbox" id="chkall" onclick="if (this.checked) all_checked(true); else all_checked(false);">
</th>
<th scope="col">게시판</th>
</tr>
</thead>
<tbody>
<?php for ($i=0; $i<count($list); $i++) {
$atc_mark = '';
$atc_bg = '';
if ($list[$i]['bo_table'] == $bo_table) { // 게시물이 현재 속해 있는 게시판이라면
$atc_mark = '<span class="copymove_current">현재<span class="sound_only">게시판</span></span>';
$atc_bg = 'copymove_currentbg';
}
?>
<tr class="<?php echo $atc_bg; ?>">
<td class="td_chk">
<label for="chk<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['bo_table'] ?></label>
<input type="checkbox" value="<?php echo $list[$i]['bo_table'] ?>" id="chk<?php echo $i ?>" name="chk_bo_table[]">
</td>
<td>
<label for="chk<?php echo $i ?>">
<?php
echo $list[$i]['gr_subject'] . ' &gt; ';
$save_gr_subject = $list[$i]['gr_subject'];
?>
<?php echo $list[$i]['bo_subject'] ?> (<?php echo $list[$i]['bo_table'] ?>)
<?php echo $atc_mark; ?>
</label>
</td>
</tr>
<?php } ?>
</tbody>
</table>
<div class="btn_win btn_confirm">
<div class="tbl_head01 tbl_wrp">
<table>
<caption><?php echo $act ?>할 게시판을 한개 이상 선택하여 주십시오.</caption>
<thead>
<tr>
<th scope="col">
<label for="chkall" class="sound_only">게시판 전체</label>
<input type="checkbox" id="chkall" onclick="if (this.checked) all_checked(true); else all_checked(false);">
</th>
<th scope="col">게시판</th>
</tr>
</thead>
<tbody>
<?php for ($i=0; $i<count($list); $i++) {
$atc_mark = '';
$atc_bg = '';
if ($list[$i]['bo_table'] == $bo_table) { // 게시물이 현재 속해 있는 게시판이라면
$atc_mark = '<span class="copymove_current">현재<span class="sound_only">게시판</span></span>';
$atc_bg = 'copymove_currentbg';
}
?>
<tr class="<?php echo $atc_bg; ?>">
<td class="td_chk">
<label for="chk<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['bo_table'] ?></label>
<input type="checkbox" value="<?php echo $list[$i]['bo_table'] ?>" id="chk<?php echo $i ?>" name="chk_bo_table[]">
</td>
<td>
<label for="chk<?php echo $i ?>">
<?php
echo $list[$i]['gr_subject'] . ' &gt; ';
$save_gr_subject = $list[$i]['gr_subject'];
?>
<?php echo $list[$i]['bo_subject'] ?> (<?php echo $list[$i]['bo_table'] ?>)
<?php echo $atc_mark; ?>
</label>
</td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
<div class="win_btn">
<input type="submit" value="<?php echo $act ?>" id="btn_submit" class="btn_submit">
</div>
</form>
@ -103,9 +106,9 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
<script>
$(function() {
$(".btn_win").append("<button type=\"button\" class=\"btn_cancel\">창닫기</button>");
$(".win_btn").append("<button type=\"button\" class=\"btn_cancel\">창닫기</button>");
$(".btn_win button").click(function() {
$(".win_btn button").click(function() {
window.close();
});
});

2
bbs/password_lost.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
if ($is_member) {
alert("이미 로그인중입니다.");

2
bbs/password_lost2.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
include_once(G5_LIB_PATH.'/mailer.lib.php');
if ($is_member) {

143
bbs/point.php
View File

@ -23,84 +23,85 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
?>
<div id="point" class="new_win">
<h1 id="new_win_title"><?php echo $g5['title'] ?></h1>
<h1 id="win_title"><?php echo $g5['title'] ?></h1>
<table class="basic_tbl">
<caption>포인트 사용내역 목록</caption>
<thead>
<tr>
<th scope="col">일시</th>
<th scope="col">내용</th>
<th scope="col">만료일</th>
<th scope="col">지급포인트</th>
<th scope="col">사용포인트</th>
</tr>
</thead>
<tbody>
<?php
$sum_point1 = $sum_point2 = $sum_point3 = 0;
<div class="tbl_head01 tbl_wrp">
<table>
<caption>포인트 사용내역 목록</caption>
<thead>
<tr>
<th scope="col">일시</th>
<th scope="col">내용</th>
<th scope="col">만료일</th>
<th scope="col">지급포인트</th>
<th scope="col">사용포인트</th>
</tr>
</thead>
<tbody>
<?php
$sum_point1 = $sum_point2 = $sum_point3 = 0;
$sql = " select *
{$sql_common}
{$sql_order}
limit {$from_record}, {$rows} ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {
$point1 = $point2 = 0;
if ($row['po_point'] > 0) {
$point1 = '+' .number_format($row['po_point']);
$sum_point1 += $row['po_point'];
} else {
$point2 = number_format($row['po_point']);
$sum_point2 += $row['po_point'];
$sql = " select *
{$sql_common}
{$sql_order}
limit {$from_record}, {$rows} ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {
$point1 = $point2 = 0;
if ($row['po_point'] > 0) {
$point1 = '+' .number_format($row['po_point']);
$sum_point1 += $row['po_point'];
} else {
$point2 = number_format($row['po_point']);
$sum_point2 += $row['po_point'];
}
$po_content = $row['po_content'];
$expr = '';
if($row['po_expired'] == 1)
$expr = ' txt_expired';
?>
<tr>
<td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
<td><?php echo $po_content; ?></td>
<td class="td_date<?php echo $expr; ?>">
<?php if ($row['po_expired'] == 1) { ?>
만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
<?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
</td>
<td class="td_numbig"><?php echo $point1; ?></td>
<td class="td_numbig"><?php echo $point2; ?></td>
</tr>
<?php
}
$po_content = $row['po_content'];
$expr = '';
if($row['po_expired'] == 1)
$expr = ' txt_expired';
?>
<tr>
<td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
<td><?php echo $po_content; ?></td>
<td class="td_date<?php echo $expr; ?>">
<?php if ($row['po_expired'] == 1) { ?>
만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
<?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
</td>
<td class="td_numbig"><?php echo $point1; ?></td>
<td class="td_numbig"><?php echo $point2; ?></td>
</tr>
<?php
}
if ($i == 0)
echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
else {
if ($sum_point1 > 0)
$sum_point1 = "+" . number_format($sum_point1);
$sum_point2 = number_format($sum_point2);
}
?>
</tbody>
<tfoot>
<tr>
<th scope="row" colspan="3">소계</th>
<td><?php echo $sum_point1; ?></td>
<td><?php echo $sum_point2; ?></td>
</tr>
<tr>
<th scope="row" colspan="3">보유포인트</th>
<td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
</tr>
</tfoot>
</table>
if ($i == 0)
echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
else {
if ($sum_point1 > 0)
$sum_point1 = "+" . number_format($sum_point1);
$sum_point2 = number_format($sum_point2);
}
?>
</tbody>
<tfoot>
<tr>
<th scope="row" colspan="3">소계</th>
<td><?php echo $sum_point1; ?></td>
<td><?php echo $sum_point2; ?></td>
</tr>
<tr>
<th scope="row" colspan="3">보유포인트</th>
<td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
</tr>
</tfoot>
</table>
</div>
<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
<div class="btn_win"><a href="javascript:;" onclick="window.close();">창닫기</a></div>
<div class="win_btn"><button type="button" onclick="javascript:window.close();">창닫기</button></div>
</div>
<?php

2
bbs/poll_result.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
$po = sql_fetch(" select * from {$g5['poll_table']} where po_id = '{$po_id}' ");
if (!$po['po_id'])

35
bbs/register_email.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
$sql = " select mb_email, mb_datetime, mb_email_certify from {$g5['member_table']} where mb_id = '{$mb_id}' ";
$mb = sql_fetch($sql);
@ -16,19 +16,26 @@ include_once('./_head.php');
<form method="post" name="fregister_email" onsubmit="return fregister_email_submit(this);">
<input type="hidden" name="mb_id" value="<?php echo $mb_id; ?>">
<table class="frm_tbl">
<caption>사이트 이용정보 입력</caption>
<tr>
<th scope="row"><label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong></label></th>
<td><input type="text" name="mb_email" id="reg_mb_email" required class="frm_input email required" size="50" maxlength="100" value="<?php echo $mb['mb_email']; ?>"></td>
</tr>
<tr>
<th scope="row">자동등록방지</th>
<td><?php echo captcha_html(); ?></td>
</tr>
</table>
<input type="submit" id="btn_submit" class="btn_submit" value="인증메일변경">
<a href="<?php echo G5_URL ?>" class="btn_cancel">취소</a>
<div class="tbl_frm01 tbl_frm">
<table>
<caption>사이트 이용정보 입력</caption>
<tr>
<th scope="row"><label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong></label></th>
<td><input type="text" name="mb_email" id="reg_mb_email" required class="frm_input email required" size="50" maxlength="100" value="<?php echo $mb['mb_email']; ?>"></td>
</tr>
<tr>
<th scope="row">자동등록방지</th>
<td><?php echo captcha_html(); ?></td>
</tr>
</table>
<div>
<div class="btn_confirm">
<input type="submit" id="btn_submit" class="btn_submit" value="인증메일변경">
<a href="<?php echo G5_URL ?>" class="btn_cancel">취소</a>
</div>
</form>
<script>

2
bbs/register_email_update.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
include_once(G5_LIB_PATH.'/mailer.lib.php');
$mb_id = escape_trim($_POST['mb_id']);

4
bbs/register_form.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
include_once(G5_LIB_PATH.'/register.lib.php');
// 불법접근을 막도록 토큰생성
@ -118,8 +118,6 @@ $req_nick = !isset($member['mb_nick_date']) || (isset($member['mb_nick_date']) &
$required = ($w=='') ? 'required' : '';
$readonly = ($w=='u') ? 'readonly' : '';
$captcha_html = captcha_html();
include_once($member_skin_path.'/register_form.skin.php');
include_once('./_tail.php');
?>

2
bbs/register_form_update.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
include_once(G5_LIB_PATH.'/register.lib.php');
include_once(G5_LIB_PATH.'/mailer.lib.php');

2
bbs/view_comment.php
View File

@ -1,6 +1,6 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
$captcha_html = "";
if ($is_guest && $board['bo_comment_level'] < 2) {

2
bbs/write.php
View File

@ -1,7 +1,7 @@
<?php
include_once('./_common.php');
include_once(G5_EDITOR_LIB);
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
set_session('ss_bo_table', $_REQUEST['bo_table']);
set_session('ss_wr_id', $_REQUEST['wr_id']);

2
bbs/write_comment_update.php
View File

@ -1,7 +1,7 @@
<?php
define('G5_CAPTCHA', true);
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
// 090710
if (substr_count($wr_content, "&#") > 50) {

2
bbs/write_update.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
$g5['title'] = '게시글 저장';