From 4d26d3b9801dda388307965b516aef2d6920f046 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Thu, 30 Jun 2011 06:33:24 +0000
Subject: [PATCH] issue 46 apply validator to syndication module

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8554 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/syndication/conf/module.xml                  | 2 +-
 modules/syndication/ruleset/insertService.xml        | 8 ++++++++
 modules/syndication/syndication.admin.controller.php | 5 +++++
 modules/syndication/tpl/config.html                  | 5 +++--
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 modules/syndication/ruleset/insertService.xml

diff --git a/modules/syndication/conf/module.xml b/modules/syndication/conf/module.xml
index cafab0a95..338f3eaf9 100644
--- a/modules/syndication/conf/module.xml
+++ b/modules/syndication/conf/module.xml
@@ -5,7 +5,7 @@
     <actions>
         <action name="getSyndicationList" type="model" standalone="true" />
         <action name="dispSyndicationAdminConfig" type="view" standalone="true" admin_index="true" />
-        <action name="procSyndicationAdminInsertService" type="controller" standalone="true" />
+        <action name="procSyndicationAdminInsertService" type="controller" standalone="true" ruleset="insertService" />
         <action name="procSyndicationAdminCheckSitePingResult" type="controller" standalone="true" />
         <action name="procSyndicationAdminCheckApiStatus" type="controller" standalone="true" />
     </actions>
diff --git a/modules/syndication/ruleset/insertService.xml b/modules/syndication/ruleset/insertService.xml
new file mode 100644
index 000000000..092f8b7ab
--- /dev/null
+++ b/modules/syndication/ruleset/insertService.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="site_url" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/syndication/syndication.admin.controller.php b/modules/syndication/syndication.admin.controller.php
index ef967ad50..aa50082e2 100644
--- a/modules/syndication/syndication.admin.controller.php
+++ b/modules/syndication/syndication.admin.controller.php
@@ -37,6 +37,11 @@
 			}
 
             $this->setMessage('success_applied');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSyndicationAdminConfig');
+				header('location:'.$returnUrl);
+				return;
+			}
         }
 
 		function procSyndicationAdminCheckSitePingResult(){
diff --git a/modules/syndication/tpl/config.html b/modules/syndication/tpl/config.html
index 96c15e98d..7c8848d88 100644
--- a/modules/syndication/tpl/config.html
+++ b/modules/syndication/tpl/config.html
@@ -1,11 +1,12 @@
 <!--%import("css/syndication.css")-->
 <!--%import("js/syndication.js")-->
-<!--%import("filter/insert_service.xml")-->
 
 <h3 class="xeAdmin">{$lang->syndication} <span class="gray">{$lang->cmd_management}</span></h3>
 <p class="summary">{$lang->about_syndication}</p>
 
-<form action="./" method="get" onsubmit="return procFilter(this, insert_service);">
+<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
+<form ruleset="insertService" action="./" method="post">
+<input type="hidden" name="act" value="procSyndicationAdminInsertService" />
     <input type="hidden" name="year" value="{$year}" />
     <table cellspacing="0" class="rowTable">
     <tr>