From 078ea34bc4bb018963b33ec99736406043d1d87d Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 30 Mar 2007 10:01:51 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@835
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 .../skins/default/filter/delete_comment.xml   |  2 +-
 .../skins/default/filter/delete_document.xml  |  2 +-
 .../skins/default/filter/delete_trackback.xml |  2 +-
 .../skins/default/filter/input_password.xml   |  2 +-
 modules/board/skins/default/filter/insert.xml |  2 +-
 .../skins/default/filter/insert_comment.xml   |  2 +-
 modules/board/skins/default/filter/vote.xml   |  2 +-
 modules/board/skins/default/trackback.html    | 73 +++++++++----------
 modules/editor/tpl/editor.html                |  2 +-
 modules/editor/tpl/js/editor.js               |  2 +-
 modules/editor/tpl/js/uploader.js             |  2 +-
 modules/file/conf/module.xml                  |  1 +
 modules/file/file.model.php                   |  2 +-
 13 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/modules/board/skins/default/filter/delete_comment.xml b/modules/board/skins/default/filter/delete_comment.xml
index 5acd9d6b6..115ea00d9 100644
--- a/modules/board/skins/default/filter/delete_comment.xml
+++ b/modules/board/skins/default/filter/delete_comment.xml
@@ -1,4 +1,4 @@
-<filter name="delete_comment" module="board" act="procDeleteComment">
+<filter name="delete_comment" module="board" act="procBoardDeleteComment">
   <form>
     <node target="comment_srl" required="true" />
   </form>
diff --git a/modules/board/skins/default/filter/delete_document.xml b/modules/board/skins/default/filter/delete_document.xml
index 3f4ff0831..7627f5a63 100644
--- a/modules/board/skins/default/filter/delete_document.xml
+++ b/modules/board/skins/default/filter/delete_document.xml
@@ -1,4 +1,4 @@
-<filter name="delete_document" module="board" act="procDeleteDocument">
+<filter name="delete_document" module="board" act="procBoardDeleteDocument">
   <form>
     <node target="document_srl" required="true" />
   </form>
diff --git a/modules/board/skins/default/filter/delete_trackback.xml b/modules/board/skins/default/filter/delete_trackback.xml
index 2501f0a7d..2140675f8 100644
--- a/modules/board/skins/default/filter/delete_trackback.xml
+++ b/modules/board/skins/default/filter/delete_trackback.xml
@@ -1,4 +1,4 @@
-<filter name="delete_trackback" module="board" act="procDeleteTrackback">
+<filter name="delete_trackback" module="board" act="procBoardDeleteTrackback">
   <form>
     <node target="trackback_srl" required="true" />
   </form>
diff --git a/modules/board/skins/default/filter/input_password.xml b/modules/board/skins/default/filter/input_password.xml
index ef222b0b8..55cb6d8e0 100644
--- a/modules/board/skins/default/filter/input_password.xml
+++ b/modules/board/skins/default/filter/input_password.xml
@@ -1,4 +1,4 @@
-<filter name="input_password" module="board" act="procVerificationPassword" >
+<filter name="input_password" module="board" act="procBoardVerificationPassword" >
   <form>
     <node target="document_srl" required="true" />
     <node target="password" required="true" />
diff --git a/modules/board/skins/default/filter/insert.xml b/modules/board/skins/default/filter/insert.xml
index b5ab69376..85d1ed4ce 100644
--- a/modules/board/skins/default/filter/insert.xml
+++ b/modules/board/skins/default/filter/insert.xml
@@ -1,4 +1,4 @@
-<filter name="insert" module="board" act="procInsertDocument" confirm_msg_code="confirm_submit">
+<filter name="insert" module="board" act="procBoardInsertDocument" confirm_msg_code="confirm_submit">
   <form>
     <node target="document_srl" required="true" />
     <node target="nick_name" required="true" />
diff --git a/modules/board/skins/default/filter/insert_comment.xml b/modules/board/skins/default/filter/insert_comment.xml
index da7c77ef5..ba2216c8a 100644
--- a/modules/board/skins/default/filter/insert_comment.xml
+++ b/modules/board/skins/default/filter/insert_comment.xml
@@ -1,4 +1,4 @@
-<filter name="insert_comment" module="board" act="procInsertComment" confirm_msg_code="confirm_submit">
+<filter name="insert_comment" module="board" act="procBoardInsertComment" confirm_msg_code="confirm_submit">
   <form>
     <node target="document_srl" required="true" />
     <node target="nick_name" required="true" />
diff --git a/modules/board/skins/default/filter/vote.xml b/modules/board/skins/default/filter/vote.xml
index 9b77bb93d..0870a7551 100644
--- a/modules/board/skins/default/filter/vote.xml
+++ b/modules/board/skins/default/filter/vote.xml
@@ -1,4 +1,4 @@
-<filter name="vote" module="board" act="procVoteDocument" confirm_msg_code="confirm_vote">
+<filter name="vote" module="board" act="procBoardVoteDocument" confirm_msg_code="confirm_vote">
   <form>
     <node target="document_srl" required="true" />
   </form>
diff --git a/modules/board/skins/default/trackback.html b/modules/board/skins/default/trackback.html
index c4c3313a1..97e9d5d1d 100644
--- a/modules/board/skins/default/trackback.html
+++ b/modules/board/skins/default/trackback.html
@@ -4,46 +4,43 @@
 </div>
 
 <!-- 엮인글 목록 -->
+<!--@if($document->trackback_list)-->
 <div>
+    <!--@foreach($document->trackback_list as $key => $val)-->
+    <a name="trackback_{$val->trackback_srl}"></a>
 
-    <!--@if($document->trackback_list)-->
+    <div style="margin-left:{$val->depth*15}px" >
+        <table>
+        <col width="120" />
+        <col width="*" />
+        <tr>
+            <th>{$lang->title}</th>
+            <td>{$val->title}</td>
+        </tr>
+        <tr>
+            <th>{$lang->date}</th>
+            <td>{zdate($val->regdate, "Y-m-d H:i:s")}</td>
+        </tr>
+        <tr>
+            <th>{$lang->blog_name}</th>
+            <td><a href="{$val->url}">{$val->blog_name}</a></td>
+        </tr>
+        <tr>
+            <th>{$lang->excerpt}</th>
+            <td height="100" valign="top">{nl2br($val->excerpt)}</td>
+        </tr>
+        <tr>
+            <th>ipaddress</th>
+            <td>{$val->ipaddress}</td>
+        </tr>
+        <tr>
+            <td colspan="2">
+                <a href="{getUrl('act','dispBoardDeleteTrackback','trackback_srl',$val->trackback_srl)}">[{$lang->cmd_delete}]</a>
+            </td>
+        </tr>
+        </table>
+    </div>
 
-        <!--@foreach($document->trackback_list as $key => $val)-->
-        <a name="trackback_{$val->trackback_srl}"></a>
-
-        <div style="margin-left:{$val->depth*15}px" >
-            <table>
-            <col width="120" />
-            <col width="*" />
-            <tr>
-                <th>{$lang->title}</th>
-                <td>{$val->title}</td>
-            </tr>
-            <tr>
-                <th>{$lang->date}</th>
-                <td>{zdate($val->regdate, "Y-m-d H:i:s")}</td>
-            </tr>
-            <tr>
-                <th>{$lang->blog_name}</th>
-                <td><a href="{$val->url}">{$val->blog_name}</a></td>
-            </tr>
-            <tr>
-                <th>{$lang->excerpt}</th>
-                <td height="100" valign="top">{nl2br($val->excerpt)}</td>
-            </tr>
-            <tr>
-                <th>ipaddress</th>
-                <td>{$val->ipaddress}</td>
-            </tr>
-            <tr>
-                <td colspan="2">
-                    <a href="{getUrl('act','dispBoardDeleteTrackback','trackback_srl',$val->trackback_srl)}">[{$lang->cmd_delete}]</a>
-                </td>
-            </tr>
-            </table>
-        </div>
-
-        <!--@end-->
     <!--@end-->
-
 </div>
+<!--@end-->
diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html
index e193897c1..c9a498000 100644
--- a/modules/editor/tpl/editor.html
+++ b/modules/editor/tpl/editor.html
@@ -96,7 +96,7 @@
     <!-- 첨부파일 영역 -->
     <!--%import("./js/uploader.js")-->
     <script type="text/javascript">
-    editor_upload_init("{$upload_target_srl}");
+        editor_upload_init("{$upload_target_srl}");
     </script>
 
     <div class="editor_uploader_box">
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index 627e3c517..caa8ccf8c 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -165,7 +165,7 @@ function editorGetContent(upload_target_srl) {
     if(!iframe_obj) return;
     var html = '';
     html = xInnerHtml(iframe_obj.contentWindow.document.body);
-    html = html.replace(/^<br>$/i,'');
+    if(html) html = html.replace(/^<br>$/i,'');
     if(!html) return "";
 
     return html;
diff --git a/modules/editor/tpl/js/uploader.js b/modules/editor/tpl/js/uploader.js
index 01d9e5e63..28326a334 100755
--- a/modules/editor/tpl/js/uploader.js
+++ b/modules/editor/tpl/js/uploader.js
@@ -30,7 +30,7 @@ function editor_upload_form_set(upload_target_srl) {
     // 업로드용 iframe을 생성
     if(!xGetElementById('tmp_upload_iframe')) {
         if(xIE4Up) {
-            window.document.body.insertAdjacentHTML("afterEnd", "<iframe name='tmp_upload_iframe' style='display:none;width:1px;height:1px;position:absolute;top:-10px;left:-10px'></iframe>");
+            window.document.body.insertAdjacentHTML("afterEnd", "<iframe id='tmp_upload_iframe' name='tmp_upload_iframe' style='display:none;width:1px;height:1px;position:absolute;top:-10px;left:-10px'></iframe>");
         } else {
             var obj_iframe = xCreateElement('IFRAME');
             obj_iframe.name = obj_iframe.id = 'tmp_upload_iframe';
diff --git a/modules/file/conf/module.xml b/modules/file/conf/module.xml
index 9e47e782c..a3a195beb 100644
--- a/modules/file/conf/module.xml
+++ b/modules/file/conf/module.xml
@@ -5,6 +5,7 @@
         <action name="dispFileAdminList" type="view" admin_index="true" standalone="true" />
 
         <action name="procFileDownload" type="model" standalone="true" />
+        <action name="procFileDelete" type="controller" standalone="true" />
         <action name="procFileAdminDeleteChecked" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/file/file.model.php b/modules/file/file.model.php
index 99d99da16..f37048cb6 100644
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@@ -129,7 +129,7 @@
          * @brief 파일 출력
          * 이미지나 멀티미디어등이 아닌 download를 받을 때 사용하는 method
          **/
-        function procDownload() {
+        function procFileDownload() {
             $file_srl = Context::get('file_srl');
             $sid = Context::get('sid');