From 7e93fe52208321bd10d81b2e633482e130cdf6bc Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 17 Jan 2013 18:50:35 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=EC=BA=A1=EC=B1=A0=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/memo_form_update.php | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/bbs/memo_form_update.php b/bbs/memo_form_update.php
index dd98ad6ec..934456d04 100644
--- a/bbs/memo_form_update.php
+++ b/bbs/memo_form_update.php
@@ -1,13 +1,12 @@
 <?
+define('_CAPTCHA_', 1);
 include_once('./_common.php');
 
-if (!$member[mb_id])
+if (!$is_member)
     alert('회원만 이용하실 수 있습니다.');
 
-$key = get_session("captcha_keystring");
-if (!($key && $key == $_POST[wr_key])) {
-    session_unregister("captcha_keystring");
-    alert('정상적인 접근이 아닌것 같습니다.');
+if ($is_guest && !chk_captcha()) {
+    alert('스팸방지에 입력한 숫자가 틀렸습니다.');
 }
 
 $recv_list = explode(',', trim($_POST['me_recv_mb_id']));
@@ -16,52 +15,52 @@ $msg = '';
 $error_list  = array();
 $member_list = array();
 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];
     } else {
-        $member_list['id'][]   = $row[mb_id];
-        $member_list['nick'][] = $row[mb_nick];
+        $member_list['id'][]   = $row['mb_id'];
+        $member_list['nick'][] = $row['mb_nick'];
     }
 }
 
 $error_msg = implode(",", $error_list);
 
 if ($error_msg && !$is_admin)
-    alert('회원아이디 \''.$error_msg.'\' 은(는) 존재(또는 정보공개)하지 않는 회원아이디 이거나 탈퇴, 접근차단된 회원아이디 입니다.'.PHP_EOL.PHP_EOL.'쪽지를 발송하지 않았습니다.');
+    alert('회원아이디 \''.$error_msg.'\' 은(는) 존재(또는 정보공개)하지 않는 회원아이디 이거나 탈퇴, 접근차단된 회원아이디 입니다.\\n\\n쪽지를 발송하지 않았습니다.');
 
 if (!$is_admin) {
     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 ($member[mb_point] - $point < 0) {
-                alert('보유하신 포인트('.number_format($member[mb_point]).'점)가 모자라서 쪽지를 보낼 수 없습니다.');
-            } 
+            if ($member['mb_point'] - $point < 0) {
+                alert('보유하신 포인트('.number_format($member['mb_point']).'점)가 모자라서 쪽지를 보낼 수 없습니다.');
+            }
         }
     }
 }
 
 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]} ");
-    $me_id = $tmp_row[max_me_id] + 1;
+    $tmp_row = sql_fetch(" select max(me_id) as max_me_id from {$g4['memo_table']} ");
+    $me_id = $tmp_row['max_me_id'] + 1;
 
     $recv_mb_id   = $member_list['id'][$i];
     $recv_mb_nick = get_text($member_list['nick'][$i]);
 
     // 쪽지 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 )
-                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 = " 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);
 
     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);
     }
 }
 

From 73c683ecc271baae6753f353744b2532baa9988e Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 17 Jan 2013 19:08:38 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=EB=A9=94=EB=AA=A8=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/memo_view.php                  | 40 ++++++++++++++++--------------
 skin/member/neo/memo_view.skin.php | 29 ++++++++++++++++------
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/bbs/memo_view.php b/bbs/memo_view.php
index 6ea1a6c34..bbd91e8b4 100644
--- a/bbs/memo_view.php
+++ b/bbs/memo_view.php
@@ -1,27 +1,27 @@
 <?
 include_once('./_common.php');
 
-if (!$member[mb_id]) 
+if (!$is_member)
     alert('회원만 이용하실 수 있습니다.');
 
-if ($kind == 'recv') 
+if ($kind == 'recv')
 {
     $t = '받은';
     $unkind = 'send';
 
-    $sql = " update {$g4[memo_table]}
-                set me_read_datetime = '{$g4[time_ymdhis]}' 
-                where me_id = '{$me_id}' 
-                and me_recv_mb_id = '{$member[mb_id]}' 
+    $sql = " update {$g4['memo_table']}
+                set me_read_datetime = '{$g4['time_ymdhis']}'
+                where me_id = '$me_id'
+                and me_recv_mb_id = '{$member['mb_id']}'
                 and me_read_datetime = '0000-00-00 00:00:00' ";
     sql_query($sql);
-} 
-else if ($kind == 'send') 
+}
+else if ($kind == 'send')
 {
     $t = '보낸';
     $unkind = 'recv';
 }
-else 
+else
 {
     alert($kind.' 값을 넘겨주세요.');
 }
@@ -29,22 +29,23 @@ else
 $g4['title'] = $t.' 쪽지 보기';
 include_once($g4['path'].'/head.sub.php');
 
-$sql = " select * from {$g4[memo_table]}
-            where me_id = '{$me_id}'
-            and me_{$kind}_mb_id = '{$member[mb_id]}' ";
+$sql = " select * from {$g4['memo_table']}
+            where me_id = '$me_id'
+            and me_{$kind}_mb_id = '{$member['mb_id']}' ";
 $memo = sql_fetch($sql);
 
 // 이전 쪽지
-$sql = " select * from {$g4[memo_table]}
+$sql = " select * from {$g4['memo_table']}
             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
             limit 1 ";
 $prev = sql_fetch($sql);
-if ($prev[me_id])
-    $prev_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$prev[me_id];
+if ($prev['me_id'])
+    $prev_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$prev['me_id'];
 else
-    $prev_link = 'javascript:alert(\'쪽지의 처음입니다.\');';
+    //$prev_link = 'javascript:alert(\'쪽지의 처음입니다.\');';
+    $prev_link = '';
 
 
 // 다음 쪽지
@@ -57,13 +58,14 @@ $next = sql_fetch($sql);
 if ($next[me_id])
     $next_link = './memo_view.php?kind='.$kind.'&amp;me_id='.$next[me_id];
 else
-    $next_link = 'javascript:alert(\'쪽지의 마지막입니다.\');';
+    //$next_link = 'javascript:alert(\'쪽지의 마지막입니다.\');';
+    $next_link = '';
 
 $mb = get_member($memo['me_'.$unkind.'_mb_id']);
 
 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($g4['path'].'/tail.sub.php');
diff --git a/skin/member/neo/memo_view.skin.php b/skin/member/neo/memo_view.skin.php
index 298ee6824..abcd5daf0 100644
--- a/skin/member/neo/memo_view.skin.php
+++ b/skin/member/neo/memo_view.skin.php
@@ -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>
+
+<script>
+$(function() {
+    $(".btn_win").append("<a id=\win_close\">창닫기</a>");
+
+    $(".btn_win a.win_close").click(function() {
+        window.close();
+    });
+});
+</script>
\ No newline at end of file

From b234186807160da675f1630c1dd1a1ac79bfa6aa Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 17 Jan 2013 19:42:05 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=EC=BD=94=EB=A9=98=ED=8A=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=97=90=EC=84=9C=EB=A7=8C=20query=20=EC=8B=A4?=
 =?UTF-8?q?=ED=96=89=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skin/board/neo/view_comment.skin.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/skin/board/neo/view_comment.skin.php b/skin/board/neo/view_comment.skin.php
index b9463610e..14336217a 100644
--- a/skin/board/neo/view_comment.skin.php
+++ b/skin/board/neo/view_comment.skin.php
@@ -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';

From 1604fa2579df875f4991b3e9c34f882560b74577 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 17 Jan 2013 19:51:36 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=ED=83=9C?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skin/member/neo/memo_view.skin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skin/member/neo/memo_view.skin.php b/skin/member/neo/memo_view.skin.php
index abcd5daf0..256f79666 100644
--- a/skin/member/neo/memo_view.skin.php
+++ b/skin/member/neo/memo_view.skin.php
@@ -34,7 +34,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
         <? 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>
     </div>
-</article>
+</div>
 
 <script>
 $(function() {