diff --git a/.htaccess b/.htaccess
index 584d2c73c..ff1558366 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,6 @@
RewriteEngine On
RewriteRule ^rss/([[:alnum:]]+)$ ./index.php?mid=$1&act=dispRss [L]
-RewriteRule ^trackback/([[:digit:]]+)$ ./index.php?document_srl=$1&act=procReceiveTrackback [L]
+RewriteRule ^trackback/([[:digit:]]+)$ ./index.php?module=trackback&act=procTrackbackReceive&document_srl=$1 [L]
RewriteRule ^admin ./index.php?module=admin [L]
RewriteRule ^([[:digit:]]+)$ ./index.php?document_srl=$1 [L]
RewriteRule ^([[:alnum:]]+)$ ./index.php?mid=$1 [L]
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index e6629515a..5423b8d56 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -18,6 +18,7 @@
* @brief 모듈객체를 받아서 content 출력
**/
function printContent(&$oModule) {
+ debugPrint($oModule);
// header 출력
$this->_printHeader();
diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index ed7b73a88..fe1c492fc 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -163,17 +163,6 @@
$this->setMessage('success_deleted');
}
- /**
- * @brief 엮인글 추가
- **/
- function procBoardReceiveTrackback() {
- $obj = Context::gets('document_srl','url','title','excerpt');
-
- // trackback module의 controller 객체 생성
- $oTrackbackController = &getController('trackback');
- $oTrackbackController->insertTrackback($obj);
- }
-
/**
* @brief 엮인글 삭제
**/
diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml
index 1fe798690..b50063ce1 100644
--- a/modules/board/conf/module.xml
+++ b/modules/board/conf/module.xml
@@ -42,7 +42,6 @@
-
diff --git a/modules/trackback/conf/module.xml b/modules/trackback/conf/module.xml
index 505df7f79..50ed7c141 100644
--- a/modules/trackback/conf/module.xml
+++ b/modules/trackback/conf/module.xml
@@ -4,5 +4,6 @@
+
diff --git a/modules/trackback/tpl/error.html b/modules/trackback/tpl/error.html
index 9cd7c2cbc..94f744be8 100644
--- a/modules/trackback/tpl/error.html
+++ b/modules/trackback/tpl/error.html
@@ -1,5 +1,5 @@
{''}
- {$error}
-
+ {$trackback_error}
+
diff --git a/modules/trackback/trackback.class.php b/modules/trackback/trackback.class.php
index 3cfe1f445..11c0353ba 100644
--- a/modules/trackback/trackback.class.php
+++ b/modules/trackback/trackback.class.php
@@ -13,6 +13,7 @@
function moduleInstall() {
// action forward에 등록 (관리자 모드에서 사용하기 위함)
$oModuleController = &getController('module');
+ $oModuleController->insertActionForward('trackback', 'controller', 'procTrackbackReceive');
$oModuleController->insertActionForward('trackback', 'view', 'dispTrackbackAdminList');
$oModuleController->insertActionForward('trackback', 'controller', 'procTrackbackAdminDeleteChecked');
diff --git a/modules/trackback/trackback.controller.php b/modules/trackback/trackback.controller.php
index 8225df7e2..124d10324 100644
--- a/modules/trackback/trackback.controller.php
+++ b/modules/trackback/trackback.controller.php
@@ -38,21 +38,22 @@
/**
* @brief 엮인글 입력
**/
- function insertTrackback($obj) {
- // dispMessage()를 위해 미리 View 객체 생성
- $oTrackbackView = &getView('trackback');
+ function procTrackbackReceive() {
+ Context::setResponseMethod("XMLRPC");
+
+ $args = Context::gets('document_srl','url','title','excerpt');
// GET으로 넘어온 document_srl을 참조, 없으면 오류~
$document_srl = $obj->document_srl;
- if(!$document_srl) $oTrackbackView->dispMessage(-1, 'fail');
+ if(!$document_srl) return $this->stop(-1, 'fail');
// document model 객체 생성후 원본글을 가져옴
$oDocumentModel = &getModel('document');
$document = $oDocumentModel->getDocument($document_srl);
// 원본글이 없거나 트랙백 허용을 하지 않으면 오류 표시
- if(!$document_srl) $oTrackbackView->dispMessage(-1,'fail');
- if($document->allow_trackback=='N') $oTrackbackView->dispMessage(-1,'fail');
+ if(!$document_srl) return $this->stop(-1,'fail');
+ if($document->allow_trackback=='N') return $this->stop(-1,'fail');
// 엮인글 정리
$obj = Context::convertEncoding($obj);
@@ -65,7 +66,7 @@
$output = executeQuery('trackback.insertTrackback', $obj);
// 입력에 이상이 없으면 해당 글의 엮인글 수를 올림
- if(!$output->toBool()) $oTrackbackView->dispMessage(-1, 'fail');
+ if(!$output->toBool()) return $this->stop(-1, 'fail');
// trackback model 객체 생성
$oTrackbackModel = &getModel('trackback');
@@ -80,8 +81,9 @@
$output = $oDocumentController->updateTrackbackCount($document_srl, $trackback_count);
// 결과 return
- if(!$output->toBool()) $oTrackbackView->dispMessage(-1,'fail');
- else $oTrackbackView->dispMessage(0,'success');
+ if(!$output->toBool()) return $this->stop(-1,'fail');
+
+ $this->setMessage('success');
}
/**
diff --git a/modules/trackback/trackback.view.php b/modules/trackback/trackback.view.php
index e6fca372b..9d77fa147 100644
--- a/modules/trackback/trackback.view.php
+++ b/modules/trackback/trackback.view.php
@@ -59,18 +59,5 @@
$this->setTemplateFile('trackback_list');
}
- /**
- * @brief 메세지 출력
- * 메세지를 출력하고 그냥 종료 시켜 버림
- **/
- function dispMessage($error, $message) {
- // 결과 출력을 XMLRPC로 강제 지정
- Context::setResponseMethod("XMLRPC");
-
- // 템플릿 지정
- $this->setTemplatePath($this->module_path.'tpl');
- $this->setTemplateFile('error');
- }
-
}
?>