From 2525fe08381da25327f1a1f7ef56371ca70c0aef Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 20 Feb 2007 11:08:50 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@130
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/board/board.view.php                  |  1 -
 modules/board/skins/default/comment.html      |  6 +++---
 modules/board/skins/default/comment_form.html |  3 +--
 .../skins/default/delete_comment_form.html    |  3 +--
 modules/board/skins/default/delete_form.html  |  3 +--
 .../skins/default/delete_trackback_form.html  |  1 -
 .../skins/default/filter/delete_comment.xml   |  3 +--
 .../skins/default/filter/delete_document.xml  |  3 +--
 .../skins/default/filter/delete_trackback.xml |  3 +--
 .../skins/default/filter/input_password.xml   |  1 -
 .../skins/default/filter/insert_comment.xml   |  2 +-
 modules/board/skins/default/filter/vote.xml   |  2 +-
 .../skins/default/input_password_form.html    |  3 +--
 modules/board/skins/default/js/board.js       | 19 +++++++++----------
 modules/board/skins/default/list.html         |  2 +-
 modules/board/skins/default/trackback.html    |  6 +++---
 .../board/skins/default/view_document.html    |  2 +-
 modules/document/document.model.php           |  4 ++--
 modules/rss/rss.view.php                      |  1 +
 19 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index c08f2d30c..d6bfcf630 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -319,7 +319,6 @@
             $info->date = gmdate("D, d M Y H:i:s");
             $info->link = sprintf("%s?mid=%s", Context::getRequestUri(), Context::get('mid'));
             $info->total_count = $output->total_count;
-            $info->total_page = $output->total_page;
 
             // 출력하고 끝내기
             $oRssView = &getView('rss');
diff --git a/modules/board/skins/default/comment.html b/modules/board/skins/default/comment.html
index 7f69ee08a..0846027c7 100644
--- a/modules/board/skins/default/comment.html
+++ b/modules/board/skins/default/comment.html
@@ -2,15 +2,15 @@
 
 <!-- 댓글 정보 출력 -->
 <div>
-  {$lang->comment} : {count($comment_list)}
+  {$lang->comment} : {count($document->comment_list)}
 </div>
 
 <!-- 댓글 출력 -->
 <div>
   <!-- 댓글 목록 -->
 
-  <!--@if($comment_list)-->
-    <!--@foreach($comment_list as $key => $val)-->
+  <!--@if($document->comment_list)-->
+    <!--@foreach($document->comment_list as $key => $val)-->
       <a name="comment_{$key}"></a>
       <div style="margin-left:{$val->depth*15}px" >
         <table>
diff --git a/modules/board/skins/default/comment_form.html b/modules/board/skins/default/comment_form.html
index aa23ac301..18d835492 100644
--- a/modules/board/skins/default/comment_form.html
+++ b/modules/board/skins/default/comment_form.html
@@ -1,4 +1,4 @@
-<!--%import("filter/filter.insert_comment.xml")-->
+<!--%import("filter/insert_comment.xml")-->
 <!--#include("header.html")-->
 
 <!-- 만약 댓글의 답을 다는 것이라면 원문 보여줌 -->
@@ -34,7 +34,6 @@
 <!-- 글쓰기 폼 -->
 <form action="./" method="get" onsubmit="return procFilter(this, insert_comment)">
 <input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procInsertComment" />
 <input type="hidden" name="document_srl" value="{$document_srl}" />
 <input type="hidden" name="comment_srl" value="{$comment_srl}" />
 <input type="hidden" name="content" value="{htmlspecialchars($comment->content)}" />
diff --git a/modules/board/skins/default/delete_comment_form.html b/modules/board/skins/default/delete_comment_form.html
index 5d5b87411..4e52e1724 100644
--- a/modules/board/skins/default/delete_comment_form.html
+++ b/modules/board/skins/default/delete_comment_form.html
@@ -1,9 +1,8 @@
-<!--%import("filter/filter.delete_comment.xml")-->
+<!--%import("filter/delete_comment.xml")-->
 <!--#include("header.html")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, delete_comment)">
 <input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procDeleteComment" />
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="document_srl" value="{$document_srl}" />
 <input type="hidden" name="comment_srl" value="{$comment_srl}" />
diff --git a/modules/board/skins/default/delete_form.html b/modules/board/skins/default/delete_form.html
index d0dc9bf30..ec86d6eb0 100644
--- a/modules/board/skins/default/delete_form.html
+++ b/modules/board/skins/default/delete_form.html
@@ -1,9 +1,8 @@
-<!--%import("filter/filter.delete_document.xml")-->
+<!--%import("filter/delete_document.xml")-->
 <!--#include("header.html")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, delete_document)">
 <input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procDeleteDocument" />
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="document_srl" value="{$document_srl}" />
   <table>
diff --git a/modules/board/skins/default/delete_trackback_form.html b/modules/board/skins/default/delete_trackback_form.html
index 4ce1d6cf5..58a9fb37f 100644
--- a/modules/board/skins/default/delete_trackback_form.html
+++ b/modules/board/skins/default/delete_trackback_form.html
@@ -3,7 +3,6 @@
 
 <form action="./" method="get" onsubmit="return procFilter(this, delete_trackback)">
 <input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procDeleteTrackback" />
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="document_srl" value="{$document_srl}" />
 <input type="hidden" name="trackback_srl" value="{$trackback_srl}" />
diff --git a/modules/board/skins/default/filter/delete_comment.xml b/modules/board/skins/default/filter/delete_comment.xml
index f1ec20610..5acd9d6b6 100644
--- a/modules/board/skins/default/filter/delete_comment.xml
+++ b/modules/board/skins/default/filter/delete_comment.xml
@@ -4,12 +4,11 @@
   </form>
   <parameter>
     <param name="mid" target="mid" />
-    <param name="act" target="act" />
     <param name="page" target="page" />
     <param name="document_srl" target="document_srl" />
     <param name="comment_srl" target="comment_srl" />
   </parameter>
-  <response>
+  <response callback_func="completeDeleteComment">
     <tag name="error" />
     <tag name="message" />
     <tag name="mid" />
diff --git a/modules/board/skins/default/filter/delete_document.xml b/modules/board/skins/default/filter/delete_document.xml
index 1d1a14f9e..3f4ff0831 100644
--- a/modules/board/skins/default/filter/delete_document.xml
+++ b/modules/board/skins/default/filter/delete_document.xml
@@ -4,11 +4,10 @@
   </form>
   <parameter>
     <param name="mid" target="mid" />
-    <param name="act" target="act" />
     <param name="page" target="page" />
     <param name="document_srl" target="document_srl" />
   </parameter>
-  <response>
+  <response callback_func="completeDeleteDocument">
     <tag name="error" />
     <tag name="message" />
     <tag name="mid" />
diff --git a/modules/board/skins/default/filter/delete_trackback.xml b/modules/board/skins/default/filter/delete_trackback.xml
index 370b60da3..2501f0a7d 100644
--- a/modules/board/skins/default/filter/delete_trackback.xml
+++ b/modules/board/skins/default/filter/delete_trackback.xml
@@ -4,12 +4,11 @@
   </form>
   <parameter>
     <param name="mid" target="mid" />
-    <param name="act" target="act" />
     <param name="page" target="page" />
     <param name="document_srl" target="document_srl" />
     <param name="trackback_srl" target="trackback_srl" />
   </parameter>
-  <response>
+  <response callback_func="completeDeleteTrackback">
     <tag name="error" />
     <tag name="message" />
     <tag name="mid" />
diff --git a/modules/board/skins/default/filter/input_password.xml b/modules/board/skins/default/filter/input_password.xml
index ebc2c1121..ef222b0b8 100644
--- a/modules/board/skins/default/filter/input_password.xml
+++ b/modules/board/skins/default/filter/input_password.xml
@@ -5,7 +5,6 @@
   </form>
   <parameter>
     <param name="mid" target="mid" />
-    <param name="act" target="act" />
     <param name="document_srl" target="document_srl" />
     <param name="comment_srl" target="comment_srl" />
     <param name="password" target="password" />
diff --git a/modules/board/skins/default/filter/insert_comment.xml b/modules/board/skins/default/filter/insert_comment.xml
index a57c471e3..4792227e8 100644
--- a/modules/board/skins/default/filter/insert_comment.xml
+++ b/modules/board/skins/default/filter/insert_comment.xml
@@ -19,7 +19,7 @@
     <param name="homepage" target="homepage" />
     <param name="content" target="content" />
   </parameter>
-  <response>
+  <response callback_func="completeInsertComment">
     <tag name="error" />
     <tag name="message" />
     <tag name="mid" />
diff --git a/modules/board/skins/default/filter/vote.xml b/modules/board/skins/default/filter/vote.xml
index 45c56a86e..0260d17dc 100644
--- a/modules/board/skins/default/filter/vote.xml
+++ b/modules/board/skins/default/filter/vote.xml
@@ -7,7 +7,7 @@
     <param name="act" target="act" />
     <param name="document_srl" target="document_srl" />
   </parameter>
-  <response>
+  <response callback_func="completeVote">
     <tag name="error" />
     <tag name="message" />
   </response>
diff --git a/modules/board/skins/default/input_password_form.html b/modules/board/skins/default/input_password_form.html
index 89d88e64d..1cf9b0b5c 100644
--- a/modules/board/skins/default/input_password_form.html
+++ b/modules/board/skins/default/input_password_form.html
@@ -1,9 +1,8 @@
-<!--%import("filter/filter.input_password.xml")-->
+<!--%import("filter/input_password.xml")-->
 <!--#include("header.html")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, input_password)">
 <input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procVerificationPassword" />
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="document_srl" value="{$document_srl}" />
 <input type="hidden" name="comment_srl" value="{$comment_srl}" />
diff --git a/modules/board/skins/default/js/board.js b/modules/board/skins/default/js/board.js
index d9a784976..8b0b18c95 100644
--- a/modules/board/skins/default/js/board.js
+++ b/modules/board/skins/default/js/board.js
@@ -18,7 +18,7 @@ function completeDocumentInserted(ret_obj) {
 }
 
 /* 글 삭제 */
-function procDeleteDocument(ret_obj, response_tags) {
+function completeDeleteDocument(ret_obj) {
   var error = ret_obj['error'];
   var message = ret_obj['message'];
   var mid = ret_obj['mid'];
@@ -30,17 +30,17 @@ function procDeleteDocument(ret_obj, response_tags) {
 }
 
 /* 검색 실행 */
-function procSearch(fo_obj, args) {
+function completeSearch(fo_obj, args) {
   fo_obj.submit();
 }
 
 /* 추천, 추천은 별도의 폼입력이 필요 없어 직접 필터 사용 */
 function doVote() {
   var fo_obj = document.getElementById('fo_document_info');
-  procFormFilter(fo_obj, vote, procVote)
+  procFilter(fo_obj, vote);
 }
 
-function procVote(ret_obj, response_tags) {
+function completeVote(ret_obj) {
   var error = ret_obj['error'];
   var message = ret_obj['message'];
   alert(message);
@@ -49,7 +49,7 @@ function procVote(ret_obj, response_tags) {
 }
 
 // 현재 페이지 reload
-function procReload(ret_obj, response_tags) {
+function completeReload(ret_obj) {
   var error = ret_obj['error'];
   var message = ret_obj['message'];
 
@@ -57,7 +57,7 @@ function procReload(ret_obj, response_tags) {
 }
 
 /* 댓글 글쓰기 작성후 */
-function procInsertComment(ret_obj, response_tags) {
+function completeInsertComment(ret_obj) {
   var error = ret_obj['error'];
   var message = ret_obj['message'];
   var mid = ret_obj['mid'];
@@ -72,7 +72,7 @@ function procInsertComment(ret_obj, response_tags) {
 }
 
 /* 댓글 삭제 */
-function procDeleteComment(ret_obj, response_tags) {
+function completeDeleteComment(ret_obj) {
   var error = ret_obj['error'];
   var message = ret_obj['message'];
   var mid = ret_obj['mid'];
@@ -86,7 +86,7 @@ function procDeleteComment(ret_obj, response_tags) {
 }
 
 /* 트랙백 삭제 */
-function procDeleteTrackback(ret_obj, response_tags) {
+function completeDeleteTrackback(ret_obj) {
   var error = ret_obj['error'];
   var message = ret_obj['message'];
   var mid = ret_obj['mid'];
@@ -95,12 +95,11 @@ function procDeleteTrackback(ret_obj, response_tags) {
   var url = "./?mid="+mid+'&document_srl='+document_srl;
   if(page) url += "&page="+page;
   alert(message);
-
   location.href = url;
 }
 
 /* 카테고리 이동 */
-function procChangeCategory(sel_obj, url) {
+function completeChangeCategory(sel_obj, url) {
   var category_srl = sel_obj.options[sel_obj.selectedIndex].value;
   if(!category_srl) location.href=url;
   else location.href=url+'&category='+category_srl;
diff --git a/modules/board/skins/default/list.html b/modules/board/skins/default/list.html
index 1790988bb..dc04c114f 100644
--- a/modules/board/skins/default/list.html
+++ b/modules/board/skins/default/list.html
@@ -1,4 +1,4 @@
-<!--%import("filter/filter.search.xml")-->
+<!--%import("filter/search.xml")-->
 <!--#include("header.html")-->
 
 {$module_info->header_text}
diff --git a/modules/board/skins/default/trackback.html b/modules/board/skins/default/trackback.html
index ec34e7d9a..58ab17e29 100644
--- a/modules/board/skins/default/trackback.html
+++ b/modules/board/skins/default/trackback.html
@@ -2,15 +2,15 @@
 
 <!-- 엮인글 정보 출력 -->
 <div>
-  {$lang->trackback} : {count($trackback_list)}
+  {$lang->trackback} : {count($document->trackback_list)}
 </div>
 
 <!-- 엮인글 출력 -->
 <div>
   <!-- 엮인글 목록 -->
 
-  <!--@if($trackback_list)-->
-    <!--@foreach($trackback_list as $key => $val)-->
+  <!--@if($document->trackback_list)-->
+    <!--@foreach($document->trackback_list as $key => $val)-->
       <a name="trackback_{$key}"></a>
       <div style="margin-left:{$val->depth*15}px" >
         <table>
diff --git a/modules/board/skins/default/view_document.html b/modules/board/skins/default/view_document.html
index a0dd5fc2e..b4518d819 100644
--- a/modules/board/skins/default/view_document.html
+++ b/modules/board/skins/default/view_document.html
@@ -1,4 +1,4 @@
-<!--%import("filter/filter.vote.xml")-->
+<!--%import("filter/vote.xml")-->
 <!--#include("header.html")-->
 
 <!-- 현 글의 기본 정보를 담고 있는 form. 필수 -->
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index e97919bba..3fd0fff93 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -64,8 +64,8 @@
 
             // 트랙백 가져오기
             if($document->trackback_count && $document->allow_trackback == 'Y') {
-                $oTrackback = &getModule('trackback');
-                $document->trackback_list = $oTrackback->getTrackbackList($document_srl);
+                $oTrackbackModel = &getModel('trackback');
+                $document->trackback_list = $oTrackbackModel->getTrackbackList($document_srl);
             }
 
             // 첨부파일 가져오기
diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php
index 6fdfe586b..cdc56c985 100644
--- a/modules/rss/rss.view.php
+++ b/modules/rss/rss.view.php
@@ -47,6 +47,7 @@
 <description><![CDATA[<?=$info->description?>]]></description>
 <language><?=$info->language?></language>
 <pubDate><?=$info->date?></pubDate>
+<totalCount><?=$info->total_count?></totalCount>
 <?
             if(count($content)) {
                 foreach($content as $item) {