From 2fd159389294aa664dbdfdf13c204a5864b74136 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 16 Jan 2013 10:43:04 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20view=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EB=B3=B5=EC=82=AC,=20=EC=9D=B4=EB=8F=99=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/view.php                 | 6 +++---
 skin/board/neo/view.skin.php | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bbs/view.php b/bbs/view.php
index d4da599c7..95f6f8928 100644
--- a/bbs/view.php
+++ b/bbs/view.php
@@ -73,7 +73,7 @@ $update_href = $delete_href = '';
 if (($member['mb_id'] && ($member['mb_id'] == $write['mb_id'])) || $is_admin) {
     $update_href = './write.php?w=u&amp;bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr;
     $delete_href = 'javascript:del(\'./delete.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.urldecode($qstr).'\');';
-    if ($is_admin) 
+    if ($is_admin)
     {
         set_session("ss_delete_token", $token = uniqid(time()));
         $delete_href = 'javascript:del(\'./delete.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;token='.$token.'&amp;page='.$page.urldecode($qstr).'\');';
@@ -87,8 +87,8 @@ else if (!$write['mb_id']) { // 회원이 쓴 글이 아니라면
 // 최고, 그룹관리자라면 글 복사, 이동 가능
 $copy_href = $move_href = '';
 if ($write['wr_reply'] == '' && ($is_admin == 'super' || $is_admin == 'group')) {
-    $copy_href = 'javascript:win_open(\'./move.php?sw=copy&amp;bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr.'\', \'boardcopy\', \'left=50, top=50, width=500, height=550, scrollbars=1\');';
-    $move_href = 'javascript:win_open(\'./move.php?sw=move&amp;bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr.'\', \'boardmove\', \'left=50, top=50, width=500, height=550, scrollbars=1\');';
+    $copy_href = './move.php?sw=copy&amp;bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr;
+    $move_href = './move.php?sw=move&amp;bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr;
 }
 
 $scrap_href = '';
diff --git a/skin/board/neo/view.skin.php b/skin/board/neo/view.skin.php
index c9e02965f..c658f496e 100644
--- a/skin/board/neo/view.skin.php
+++ b/skin/board/neo/view.skin.php
@@ -85,8 +85,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
         <ul class="bo_v_com">
             <? if ($update_href) { ?><li><a href="<?=$update_href?>" class="btn02">수정</a></li><? } ?>
             <? if ($delete_href) { ?><li><a href="<?=$delete_href?>" class="btn02">삭제</a></li><? } ?>
-            <? if ($copy_href) { ?><li><a href="<?=$copy_href?>" class="btn03">복사</a></li><? } ?>
-            <? if ($move_href) { ?><li><a href="<?=$move_href?>" class="btn03">이동</a></li><? } ?>
+            <? if ($copy_href) { ?><li><a href="<?=$copy_href?>" onclick="board_move(this.href); return false;" class="btn03">복사</a></li><? } ?>
+            <? if ($move_href) { ?><li><a href="<?=$move_href?>" onclick="board_move(this.href); return false;" class="btn03">이동</a></li><? } ?>
             <? if ($search_href) { ?><li><a href="<?=$search_href?>" class="btn02">검색</a></li><? } ?>
             <li><a href="<?=$list_href?>" class="btn02">목록</a></li>
             <? if ($reply_href) { ?><li><a href="<?=$reply_href?>" class="btn02">답변</a></li><? } ?>
@@ -152,6 +152,11 @@ function file_download(link, file) {
     <? if ($board['bo_download_point'] < 0) { ?>if (confirm("'"+decodeURIComponent(file)+"' 파일을 다운로드 하시면 포인트가 차감(<?=number_format($board['bo_download_point'])?>점)됩니다.\n\n포인트는 게시물당 한번만 차감되며 다음에 다시 다운로드 하셔도 중복하여 차감하지 않습니다.\n\n그래도 다운로드 하시겠습니까?"))<?}?>
     document.location.href=link;
 }
+
+function board_move(href)
+{
+    window.open(href, "boardmove", "left=50, top=50, width=500, height=550, scrollbars=1");
+}
 </script>
 
 <script src="<?=$g4['path']?>/js/board.js"></script>