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-01-17 19:53:52 +09:00
parent 47f546ac73 1604fa2579
commit 6fd06e5ce9
4 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
bbs/memo_form_update.php
View File

@ -1,13 +1,12 @@
<? <?
define('_CAPTCHA_', 1);
include_once('./_common.php'); include_once('./_common.php');
if (!$member[mb_id]) if (!$is_member)
alert('회원만 이용하실 수 있습니다.'); alert('회원만 이용하실 수 있습니다.');
$key = get_session("captcha_keystring"); if ($is_guest && !chk_captcha()) {
if (!($key && $key == $_POST[wr_key])) { alert('스팸방지에 입력한 숫자가 틀렸습니다.');
session_unregister("captcha_keystring");
alert('정상적인 접근이 아닌것 같습니다.');
} }
$recv_list = explode(',', trim($_POST['me_recv_mb_id'])); $recv_list = explode(',', trim($_POST['me_recv_mb_id']));
@ -16,52 +15,52 @@ $msg = '';
$error_list = array(); $error_list = array();
$member_list = array(); $member_list = array();
for ($i=0; $i<count($recv_list); $i++) { for ($i=0; $i<count($recv_list); $i++) {
$row = sql_fetch(" select mb_id, mb_nick, mb_open, mb_leave_date, mb_intercept_date from {$g4[member_table]} where mb_id = '{$recv_list[$i]}' "); $row = sql_fetch(" select mb_id, mb_nick, mb_open, mb_leave_date, mb_intercept_date from {$g4['member_table']} where mb_id = '{$recv_list[$i]}' ");
// 관리자가 아니면서 // 관리자가 아니면서
// 가입된 회원이 아니거나 정보공개를 하지 않았거나 탈퇴한 회원이거나 차단된 회원에게 쪽지를 보내는것은 에러 // 가입된 회원이 아니거나 정보공개를 하지 않았거나 탈퇴한 회원이거나 차단된 회원에게 쪽지를 보내는것은 에러
if ((!$row[mb_id] || !$row[mb_open] || $row[mb_leave_date] || $row[mb_intercept_date]) && !$is_admin) { if ((!$row['mb_id'] || !$row['mb_open'] || $row['mb_leave_date'] || $row['mb_intercept_date']) && !$is_admin) {
$error_list[] = $recv_list[$i]; $error_list[] = $recv_list[$i];
} else { } else {
$member_list['id'][] = $row[mb_id]; $member_list['id'][] = $row['mb_id'];
$member_list['nick'][] = $row[mb_nick]; $member_list['nick'][] = $row['mb_nick'];
} }
} }
$error_msg = implode(",", $error_list); $error_msg = implode(",", $error_list);
if ($error_msg && !$is_admin) if ($error_msg && !$is_admin)
alert('회원아이디 \''.$error_msg.'\' 은(는) 존재(또는 정보공개)하지 않는 회원아이디 이거나 탈퇴, 접근차단된 회원아이디 입니다.'.PHP_EOL.PHP_EOL.'쪽지를 발송하지 않았습니다.'); alert('회원아이디 \''.$error_msg.'\' 은(는) 존재(또는 정보공개)하지 않는 회원아이디 이거나 탈퇴, 접근차단된 회원아이디 입니다.\\n\\n쪽지를 발송하지 않았습니다.');
if (!$is_admin) { if (!$is_admin) {
if (count($member_list['id'])) { if (count($member_list['id'])) {
$point = (int)$config[cf_memo_send_point] * count($member_list['id']); $point = (int)$config['cf_memo_send_point'] * count($member_list['id']);
if ($point) { if ($point) {
if ($member[mb_point] - $point < 0) { if ($member['mb_point'] - $point < 0) {
alert('보유하신 포인트('.number_format($member[mb_point]).'점)가 모자라서 쪽지를 보낼 수 없습니다.'); alert('보유하신 포인트('.number_format($member['mb_point']).'점)가 모자라서 쪽지를 보낼 수 없습니다.');
} }
} }
} }
} }
for ($i=0; $i<count($member_list['id']); $i++) { for ($i=0; $i<count($member_list['id']); $i++) {
$tmp_row = sql_fetch(" select max(me_id) as max_me_id from {$g4[memo_table]} "); $tmp_row = sql_fetch(" select max(me_id) as max_me_id from {$g4['memo_table']} ");
$me_id = $tmp_row[max_me_id] + 1; $me_id = $tmp_row['max_me_id'] + 1;
$recv_mb_id = $member_list['id'][$i]; $recv_mb_id = $member_list['id'][$i];
$recv_mb_nick = get_text($member_list['nick'][$i]); $recv_mb_nick = get_text($member_list['nick'][$i]);
// 쪽지 INSERT // 쪽지 INSERT
$sql = " insert into $g4[memo_table] $sql = " insert into {$g4['memo_table']}
( me_id, me_recv_mb_id, me_send_mb_id, me_send_datetime, me_memo ) ( me_id, me_recv_mb_id, me_send_mb_id, me_send_datetime, me_memo )
values ( '{$me_id}', '{$recv_mb_id}', '{$member[mb_id]}', '{$g4[time_ymdhis]}', '{$_POST[me_memo]}' ) "; values ( '$me_id', '$recv_mb_id', '{$member['mb_id']}', '{$g4['time_ymdhis']}', '{$_POST['me_memo']}' ) ";
sql_query($sql); sql_query($sql);
// 실시간 쪽지 알림 기능 // 실시간 쪽지 알림 기능
$sql = " update {$g4[member_table]} set mb_memo_call = '{$member[mb_id]}' where mb_id = '{$recv_mb_id}' "; $sql = " update {$g4['member_table']} set mb_memo_call = '{$member['mb_id']}' where mb_id = '$recv_mb_id' ";
sql_query($sql); sql_query($sql);
if (!$is_admin) { if (!$is_admin) {
insert_point($member[mb_id], (int)$config[cf_memo_send_point] * (-1), '{$recv_mb_nick}({$recv_mb_id})님께 쪽지 발송', '{@memo}', $recv_mb_id, $me_id); insert_point($member['mb_id'], (int)$config['cf_memo_send_point'] * (-1), $recv_mb_nick.'('.$recv_mb_id.')님께 쪽지 발송', '{@memo}', $recv_mb_id, $me_id);
} }
} }

32
bbs/memo_view.php
View File

@ -1,7 +1,7 @@
<? <?
include_once('./_common.php'); include_once('./_common.php');
if (!$member[mb_id]) if (!$is_member)
alert('회원만 이용하실 수 있습니다.'); alert('회원만 이용하실 수 있습니다.');
if ($kind == 'recv') if ($kind == 'recv')
@ -9,10 +9,10 @@ if ($kind == 'recv')
$t = '받은'; $t = '받은';
$unkind = 'send'; $unkind = 'send';
$sql = " update {$g4[memo_table]} $sql = " update {$g4['memo_table']}
set me_read_datetime = '{$g4[time_ymdhis]}' set me_read_datetime = '{$g4['time_ymdhis']}'
where me_id = '{$me_id}' where me_id = '$me_id'
and me_recv_mb_id = '{$member[mb_id]}' and me_recv_mb_id = '{$member['mb_id']}'
and me_read_datetime = '0000-00-00 00:00:00' "; and me_read_datetime = '0000-00-00 00:00:00' ";
sql_query($sql); sql_query($sql);
} }
@ -29,22 +29,23 @@ else
$g4['title'] = $t.' 쪽지 보기'; $g4['title'] = $t.' 쪽지 보기';
include_once($g4['path'].'/head.sub.php'); include_once($g4['path'].'/head.sub.php');
$sql = " select * from {$g4[memo_table]} $sql = " select * from {$g4['memo_table']}
where me_id = '{$me_id}' where me_id = '$me_id'
and me_{$kind}_mb_id = '{$member[mb_id]}' "; and me_{$kind}_mb_id = '{$member['mb_id']}' ";
$memo = sql_fetch($sql); $memo = sql_fetch($sql);
// 이전 쪽지 // 이전 쪽지
$sql = " select * from {$g4[memo_table]} $sql = " select * from {$g4['memo_table']}
where me_id > '{$me_id}' where me_id > '{$me_id}'
and me_{$kind}_mb_id = '{$member[mb_id]}' and me_{$kind}_mb_id = '{$member['mb_id']}'
order by me_id asc order by me_id asc
limit 1 "; limit 1 ";
$prev = sql_fetch($sql); $prev = sql_fetch($sql);
if ($prev[me_id]) if ($prev['me_id'])
$prev_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$prev[me_id]; $prev_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$prev['me_id'];
else else
$prev_link = 'javascript:alert(\'쪽지의 처음입니다.\');'; //$prev_link = 'javascript:alert(\'쪽지의 처음입니다.\');';
$prev_link = '';
// 다음 쪽지 // 다음 쪽지
@ -57,13 +58,14 @@ $next = sql_fetch($sql);
if ($next[me_id]) if ($next[me_id])
$next_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$next[me_id]; $next_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$next[me_id];
else else
$next_link = 'javascript:alert(\'쪽지의 마지막입니다.\');'; //$next_link = 'javascript:alert(\'쪽지의 마지막입니다.\');';
$next_link = '';
$mb = get_member($memo['me_'.$unkind.'_mb_id']); $mb = get_member($memo['me_'.$unkind.'_mb_id']);
echo '<script src="'.$g4['path'].'/js/sideview.js"></script>'; echo '<script src="'.$g4['path'].'/js/sideview.js"></script>';
$member_skin_path = $g4['path'].'/skin/member/'.$config[cf_member_skin]; $member_skin_path = $g4['path'].'/skin/member/'.$config['cf_member_skin'];
include_once($member_skin_path.'/memo_view.skin.php'); include_once($member_skin_path.'/memo_view.skin.php');
include_once($g4['path'].'/tail.sub.php'); include_once($g4['path'].'/tail.sub.php');

9
skin/board/neo/view_comment.skin.php
View File

@ -48,9 +48,12 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
<? if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) { <? if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
$query_string = str_replace("&", "&amp;", $_SERVER['QUERY_STRING']); $query_string = str_replace("&", "&amp;", $_SERVER['QUERY_STRING']);
$sql = " select wr_id, wr_content from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
$cmt = sql_fetch($sql); if($w == 'cu') {
$c_wr_content = $cmt['wr_content']; $sql = " select wr_id, wr_content from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
$cmt = sql_fetch($sql);
$c_wr_content = $cmt['wr_content'];
}
$c_reply_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w'; $c_reply_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
$c_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w'; $c_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';

27
skin/member/neo/memo_view.skin.php
View File

@ -6,11 +6,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<h1> <h1>
<? <?
//$nick = cut_str($mb[mb_nick], $config[cf_cut_name]); //$nick = cut_str($mb[mb_nick], $config[cf_cut_name]);
$nick = get_sideview($mb[mb_id], $mb[mb_nick], $mb[mb_email], $mb[mb_homepage]); $nick = get_sideview($mb['mb_id'], $mb['mb_nick'], $mb['mb_email'], $mb['mb_homepage']);
if ($kind == "recv") if ($kind == "recv")
echo "{$nick}님께서 {$memo[me_send_datetime]}에 보내온 쪽지의 내용입니다."; echo "{$nick}님께서 {$memo['me_send_datetime']}에 보내온 쪽지의 내용입니다.";
if ($kind == "send") if ($kind == "send")
echo "{$nick}님께 {$memo[me_send_datetime]}에 보낸 쪽지의 내용입니다."; echo "{$nick}님께 {$memo['me_send_datetime']}에 보낸 쪽지의 내용입니다.";
?> ?>
</h1> </h1>
<ul class="new_win_ul"> <ul class="new_win_ul">
@ -21,14 +21,27 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<section> <section>
<h2>쪽지내용</h2> <h2>쪽지내용</h2>
<p> <p>
<?=conv_content($memo[me_memo], 0)?> <?=conv_content($memo['me_memo'], 0)?>
</p> </p>
</section> </section>
<div class="btn_win"> <div class="btn_win">
<? if($prev_link) { ?>
<a href="<?=$prev_link?>">이전쪽지</a> <a href="<?=$prev_link?>">이전쪽지</a>
<? } ?>
<? if($next_link) { ?>
<a href="<?=$next_link?>">다음쪽지</a> <a href="<?=$next_link?>">다음쪽지</a>
<? if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?=$mb[mb_id]?>&amp;me_id=<?=$memo[me_id]?>">답장</a><? } ?> <? } ?>
<? if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?=$mb['mb_id']?>&amp;me_id=<?=$memo['me_id']?>">답장</a><? } ?>
<a href="./memo.php?kind=<?=$kind?>">목록보기</a> <a href="./memo.php?kind=<?=$kind?>">목록보기</a>
<a href="javascript:window.close();">창닫기</a>
</div> </div>
</article> </div>
<script>
$(function() {
$(".btn_win").append("<a id=\win_close\">창닫기</a>");
$(".btn_win a.win_close").click(function() {
window.close();
});
});
</script>