From bda171d266c36af5ebe8639685d5c8cbf552a3fc Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 27 Feb 2008 17:55:01 +0000
Subject: [PATCH] =?UTF-8?q?1.=20=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99=EC=8B=9C=20=EA=B0=99=EC=9D=80=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=ED=8C=90=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=A0?=
 =?UTF-8?q?=EB=95=8C=20=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=EC=9D=B4=20?=
 =?UTF-8?q?=EC=82=AC=EB=9D=BC=EC=A7=80=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=202.=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=EB=A5=BC=20=EB=AA=A8?=
 =?UTF-8?q?=EB=91=90=20=EC=A0=9C=EA=B1=B0=ED=95=B4=EB=8F=84=20=ED=95=98?=
 =?UTF-8?q?=EB=82=98=EA=B0=80=20=EB=82=A8=EC=95=84=20=EC=9E=88=EB=8D=98=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=203.=20=EA=B2=8C?=
 =?UTF-8?q?=EC=8B=9C=ED=8C=90=20=EC=8B=A0=EA=B7=9C=20=EC=83=9D=EC=84=B1?=
 =?UTF-8?q?=EC=8B=9C=20xe=5Fboard=20=EC=8A=A4=ED=82=A8=EC=9D=B4=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=EC=9C=BC=EB=A1=9C=20=EC=84=A0=ED=83=9D?=
 =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3864 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/tpl/board_insert.html            | 2 +-
 modules/document/document.admin.controller.php | 4 ++--
 modules/document/document.admin.view.php       | 2 +-
 modules/document/document.controller.php       | 5 ++++-
 modules/document/tpl/checked_list.html         | 3 +--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html
index 345aa77d7..711005765 100644
--- a/modules/board/tpl/board_insert.html
+++ b/modules/board/tpl/board_insert.html
@@ -71,7 +71,7 @@
         <td>
             <select name="skin">
                 <!--@foreach($skin_list as $key=>$val)-->
-                <option value="{$key}" <!--@if($module_info->skin==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+                <option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='xe_board'))-->selected="selected"<!--@end-->>{$val->title}</option>
                 <!--@end-->
             </select>
             <p>{$lang->about_skin}</p>
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index cc572ce90..528737f51 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -149,8 +149,8 @@
                 unset($obj);
                 $obj = $oDocument->getObjectVars();
 
-                // 첨부파일 이동
-                if($oDocument->hasUploadedFiles()) {
+                // 대상 모듈이 다를 경우 첨부파일 이동
+                if($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles()) {
                     $oFileController = &getController('file');
 
                     $files = $oDocument->getUploadedFiles();
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 531374283..1f965bb5f 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -156,7 +156,7 @@
 
 
             // 모듈 카테고리 목록과 모듈 목록의 조합
-            Context::set('module_list', $module_categories);
+            if(count($module_list)>1) Context::set('module_list', $module_categories);
 
             // 팝업 레이아웃 선택
             $this->setLayoutPath('./common/tpl');
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index b28c6d20e..5cae365a1 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -731,7 +731,10 @@
 
             $category_list = $output->data;
 
-            if(!$category_list) return false;
+            if(!$category_list) {
+                @unlink($xml_file);
+                @unlink($php_file);
+            }
             if(!is_array($category_list)) $category_list = array($category_list);
 
             $category_count = count($category_list);
diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html
index e6ff35506..2c40b1cf0 100644
--- a/modules/document/tpl/checked_list.html
+++ b/modules/document/tpl/checked_list.html
@@ -1,7 +1,6 @@
 <!--%import("filter/manage_checked_document.xml")-->
 <!--%import("js/document_admin.js")-->
 <!--%import("css/document.css")-->
-
 <div id="popHeadder">
     <h3>{$lang->cmd_manage_document}</h3>
 </div>
@@ -28,7 +27,7 @@
             <!--@end-->
         </td>
     </tr>
-    <!--@if(count($document_list) && count($module_list)>1)-->
+    <!--@if(count($document_list) && $module_list)-->
     <tr>
         <th scope="row">{$lang->move_target_module}</th>
         <td>