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

This commit is contained in:
whitedot
2013-01-17 19:53:52 +09:00
4 changed files with 68 additions and 51 deletions

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']) {
$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);
$c_wr_content = $cmt['wr_content'];
if($w == 'cu') {
$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_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';

View File

@ -1,16 +1,16 @@
<?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<div id="memo_view" class="new_win">
<h1>
<?
//$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")
echo "{$nick}님께서 {$memo[me_send_datetime]}에 보내온 쪽지의 내용입니다.";
if ($kind == "send")
echo "{$nick}님께 {$memo[me_send_datetime]}에 보낸 쪽지의 내용입니다.";
echo "{$nick}님께서 {$memo['me_send_datetime']}에 보내온 쪽지의 내용입니다.";
if ($kind == "send")
echo "{$nick}님께 {$memo['me_send_datetime']}에 보낸 쪽지의 내용입니다.";
?>
</h1>
<ul class="new_win_ul">
@ -21,14 +21,27 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<section>
<h2>쪽지내용</h2>
<p>
<?=conv_content($memo[me_memo], 0)?>
<?=conv_content($memo['me_memo'], 0)?>
</p>
</section>
<div class="btn_win">
<? if($prev_link) { ?>
<a href="<?=$prev_link?>">이전쪽지</a>
<? } ?>
<? if($next_link) { ?>
<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="javascript:window.close();">창닫기</a>
</div>
</article>
</div>
<script>
$(function() {
$(".btn_win").append("<a id=\win_close\">창닫기</a>");
$(".btn_win a.win_close").click(function() {
window.close();
});
});
</script>