From ab0e63b9542e5b30e30ce59075c042f7420c18a9 Mon Sep 17 00:00:00 2001 From: ovclas Date: Fri, 1 Jul 2011 07:15:37 +0000 Subject: [PATCH] issue 46 apply validator to trackback module git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8559 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/trackback/conf/module.xml | 4 ++-- modules/trackback/ruleset/deleteChecked.xml | 8 ++++++++ modules/trackback/ruleset/sendTrackback.xml | 11 ++++++++++ .../trackback/tpl/send_trackback_form.html | 6 +++--- modules/trackback/tpl/trackback_list.html | 11 +++++----- .../tpl/trackback_module_config.html | 6 +++--- .../trackback/trackback.admin.controller.php | 20 +++++++++++++++++-- modules/trackback/trackback.controller.php | 10 +++++++++- 8 files changed, 60 insertions(+), 16 deletions(-) create mode 100644 modules/trackback/ruleset/deleteChecked.xml create mode 100644 modules/trackback/ruleset/sendTrackback.xml diff --git a/modules/trackback/conf/module.xml b/modules/trackback/conf/module.xml index ed6f063ab..77eb160af 100644 --- a/modules/trackback/conf/module.xml +++ b/modules/trackback/conf/module.xml @@ -8,8 +8,8 @@ - - + + diff --git a/modules/trackback/ruleset/deleteChecked.xml b/modules/trackback/ruleset/deleteChecked.xml new file mode 100644 index 000000000..55a24f35c --- /dev/null +++ b/modules/trackback/ruleset/deleteChecked.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/trackback/ruleset/sendTrackback.xml b/modules/trackback/ruleset/sendTrackback.xml new file mode 100644 index 000000000..537f222d5 --- /dev/null +++ b/modules/trackback/ruleset/sendTrackback.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/modules/trackback/tpl/send_trackback_form.html b/modules/trackback/tpl/send_trackback_form.html index 47367fad5..6aa6ce02f 100644 --- a/modules/trackback/tpl/send_trackback_form.html +++ b/modules/trackback/tpl/send_trackback_form.html @@ -1,10 +1,10 @@ - -

{$lang->cmd_send_trackback}

-
+

{$XE_VALIDATOR_ERROR}

+ +
diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index df372e007..2c5a52afe 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -1,10 +1,10 @@ - -

{$lang->trackback} {$lang->cmd_management}

- +

{$XE_VALIDATOR_ERROR}

+ + @@ -42,7 +42,8 @@ - + + @@ -69,7 +70,7 @@ - + diff --git a/modules/trackback/tpl/trackback_module_config.html b/modules/trackback/tpl/trackback_module_config.html index 409cefe4c..83c07e614 100644 --- a/modules/trackback/tpl/trackback_module_config.html +++ b/modules/trackback/tpl/trackback_module_config.html @@ -1,6 +1,6 @@ - - - + + +

{$lang->trackback}

diff --git a/modules/trackback/trackback.admin.controller.php b/modules/trackback/trackback.admin.controller.php index fff7d9419..b433923d0 100644 --- a/modules/trackback/trackback.admin.controller.php +++ b/modules/trackback/trackback.admin.controller.php @@ -19,8 +19,9 @@ function procTrackbackAdminDeleteChecked() { // An error appears if no document is selected $cart = Context::get('cart'); - if(!$cart) return $this->stop('msg_cart_is_null'); - $trackback_srl_list= explode('|@|', $cart); + if(!is_array($cart)) $trackback_srl_list= explode('|@|', $cart); + else $trackback_srl_list = $cart; + $trackback_count = count($trackback_srl_list); if(!$trackback_count) return $this->stop('msg_cart_is_null'); @@ -34,6 +35,11 @@ } $this->setMessage( sprintf(Context::getLang('msg_checked_trackback_is_deleted'), $trackback_count) ); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList'); + header('location:'.$returnUrl); + return; + } } /** @@ -45,6 +51,11 @@ $oModuleController = &getController('module'); $output = $oModuleController->insertModuleConfig('trackback',$config); + if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList'); + header('location:'.$returnUrl); + return; + } return $output; } @@ -70,6 +81,11 @@ $this->setError(-1); $this->setMessage('success_updated'); + if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); + header('location:'.$returnUrl); + return; + } } /** diff --git a/modules/trackback/trackback.controller.php b/modules/trackback/trackback.controller.php index 0dba8566a..98eec0ec4 100644 --- a/modules/trackback/trackback.controller.php +++ b/modules/trackback/trackback.controller.php @@ -35,7 +35,15 @@ $module_info = $oModuleModel->getModuleInfoByModuleSrl($oDocument->get('module_srl')); Context::setBrowserTitle($module_info->browser_title); // Shipping yeokingeul - return $this->sendTrackback($oDocument, $trackback_url, $charset); + $output = $this->sendTrackback($oDocument, $trackback_url, $charset); + if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + global $lang; + alertScript($lang->success_registed); + reload(true); + closePopupScript(); + exit; + } + return $output; } /**
{$lang->enable_trackback}
{$no}
{htmlspecialchars($val->blog_name)}
 {htmlspecialchars($val->title)} {zdate($val->regdate,"Y-m-d")}