From 6436d9da919866453981055e0508af6e2a25e90a Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Thu, 30 Jun 2011 02:11:49 +0000
Subject: [PATCH] issue 46 apply validator to rss module

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8551 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/rss/conf/module.xml                   |  4 +-
 modules/rss/rss.admin.controller.php          | 18 +++--
 modules/rss/rss.admin.view.php                | 72 +++++++++----------
 modules/rss/ruleset/insertRssConfig.xml       | 13 ++++
 modules/rss/ruleset/insertRssModuleConfig.xml | 13 ++++
 modules/rss/tpl/rss_admin_index.html          | 10 ++-
 modules/rss/tpl/rss_module_config.html        |  6 +-
 7 files changed, 85 insertions(+), 51 deletions(-)
 create mode 100644 modules/rss/ruleset/insertRssConfig.xml
 create mode 100644 modules/rss/ruleset/insertRssModuleConfig.xml

diff --git a/modules/rss/conf/module.xml b/modules/rss/conf/module.xml
index 5db36db82..aed490ac5 100644
--- a/modules/rss/conf/module.xml
+++ b/modules/rss/conf/module.xml
@@ -7,7 +7,7 @@
         <action name="rss" type="view" standalone="true" />
         <action name="atom" type="view" standalone="true" />
         <action name="procRssAdminToggleActivate" type="controller" standalone="true" />
-        <action name="procRssAdminInsertConfig" type="controller" standalone="true" />
-        <action name="procRssAdminInsertModuleConfig" type="controller" standalone="true" />
+        <action name="procRssAdminInsertConfig" type="controller" standalone="true" ruleset="insertRssConfig" />
+        <action name="procRssAdminInsertModuleConfig" type="controller" standalone="true" ruleset="insertRssModuleConfig" />
     </actions>
 </module>
diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php
index c9c60dc8e..972d9721e 100644
--- a/modules/rss/rss.admin.controller.php
+++ b/modules/rss/rss.admin.controller.php
@@ -70,10 +70,15 @@
             $alt_message = Context::getLang($alt_message);
             Context::set('msg', $alt_message);
 
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('default_layout.html');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile("top_refresh.html");
+            //$this->setLayoutPath('./common/tpl');
+            //$this->setLayoutFile('default_layout.html');
+            //$this->setTemplatePath($this->module_path.'tpl');
+            //$this->setTemplateFile("top_refresh.html");
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispRssAdminIndex');
+				header('location:'.$returnUrl);
+				return;
+			}
         }
 
 
@@ -107,6 +112,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/rss/rss.admin.view.php b/modules/rss/rss.admin.view.php
index 044da23a5..a9939492c 100644
--- a/modules/rss/rss.admin.view.php
+++ b/modules/rss/rss.admin.view.php
@@ -5,45 +5,45 @@
      * @brief The admin view class of the rss module
      **/
 
-    class rssAdminView extends rss {
-        /**
-         * @brief Initialization
-         **/
-        function init() {
-            //Set template path
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
+	class rssAdminView extends rss {
+		/**
+		 * @brief Initialization
+		 **/
+		function init() {
+			//Set template path
+			$this->setTemplatePath($this->module_path.'tpl');
+		}
 
 
-        /**
-         * @brief In case an administrator page has been initialized
-         **/
-        function dispRssAdminIndex() {
-            $oModuleModel = &getModel('module');
-            $rss_config = $oModuleModel->getModulePartConfigs('rss');
-            $total_config = $oModuleModel->getModuleConfig('rss');
-            $oRssModel = &getModel('rss');
+		/**
+		 * @brief In case an administrator page has been initialized
+		 **/
+		function dispRssAdminIndex() {
+			$oModuleModel = &getModel('module');
+			$rss_config = $oModuleModel->getModulePartConfigs('rss');
+			$total_config = $oModuleModel->getModuleConfig('rss');
+			$oRssModel = &getModel('rss');
 
-            if($rss_config) {
-                foreach($rss_config as $module_srl => $config) {
-                    if($config) {
-                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+			if($rss_config) {
+				foreach($rss_config as $module_srl => $config) {
+					if($config) {
+						$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 						$columnList = array('sites.domain');
-                        $site = $oModuleModel->getSiteInfo($module_info->site_srl, $columnList);
-                        if(!strpos($site->domain, '.')) $vid = $site->domain;
-                        else $site = null;
-                        if($site) $feed_config[$module_srl]['url'] = $oRssModel->getModuleFeedUrl($vid, $module_info->mid, 'rss');
-                        $feed_config[$module_srl]['mid'] = $module_info->mid;
-                        $feed_config[$module_srl]['open_feed'] = $config->open_rss;
-                        $feed_config[$module_srl]['open_total_feed'] = $config->open_total_feed;
-                    }
-                }
-            }
+						$site = $oModuleModel->getSiteInfo($module_info->site_srl, $columnList);
+						if(!strpos($site->domain, '.')) $vid = $site->domain;
+						else $site = null;
+						if($site) $feed_config[$module_srl]['url'] = $oRssModel->getModuleFeedUrl($vid, $module_info->mid, 'rss');
+						$feed_config[$module_srl]['mid'] = $module_info->mid;
+						$feed_config[$module_srl]['open_feed'] = $config->open_rss;
+						$feed_config[$module_srl]['open_total_feed'] = $config->open_total_feed;
+					}
+				}
+			}
 
-            Context::set('feed_config', $feed_config);
-            Context::set('total_config', $total_config);
-           	$this->setTemplatePath($this->module_path.'tpl');
-		        $this->setTemplateFile('rss_admin_index');
-        }
-    }
+			Context::set('feed_config', $feed_config);
+			Context::set('total_config', $total_config);
+			$this->setTemplatePath($this->module_path.'tpl');
+			$this->setTemplateFile('rss_admin_index');
+		}
+	}
 ?>
diff --git a/modules/rss/ruleset/insertRssConfig.xml b/modules/rss/ruleset/insertRssConfig.xml
new file mode 100644
index 000000000..f6b1fd52a
--- /dev/null
+++ b/modules/rss/ruleset/insertRssConfig.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="boolean" type="enum" test="Y,N" />
+    </customrules>
+    <fields>
+		<field name="module" required="true" default="rss" />
+		<field name="act" required="true" default="procRssAdminInsertConfig" />
+		<field name="use_total_feed" required="true" default="Y" rule="boolean" />
+		<field name="feed_title" required="true" />
+		<field name="feed_document_count" required="true" rule="number" default="15" />
+    </fields>
+</ruleset>
diff --git a/modules/rss/ruleset/insertRssModuleConfig.xml b/modules/rss/ruleset/insertRssModuleConfig.xml
new file mode 100644
index 000000000..45f2488a2
--- /dev/null
+++ b/modules/rss/ruleset/insertRssModuleConfig.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="open_type" type="enum" test="Y,N,H" />
+		<rule name="total_type" type="enum" test="N,T_N" />
+    </customrules>
+    <fields>
+		<field name="act" required="true" default="procRssAdminInsertModuleConfig" />
+		<field name="target_module_srl" required="true" />
+		<field name="open_rss" required="true" rule="open_type" default="Y" />
+		<field name="open_total_feed" required="true" rule="total_type" default="N" />
+    </fields>
+</ruleset>
diff --git a/modules/rss/tpl/rss_admin_index.html b/modules/rss/tpl/rss_admin_index.html
index faca1ef9f..668b20806 100644
--- a/modules/rss/tpl/rss_admin_index.html
+++ b/modules/rss/tpl/rss_admin_index.html
@@ -1,10 +1,10 @@
 <!--%import("js/rss.js")-->
 <h3 class="xeAdmin">{$lang->total_feed} <span class="gray">{$lang->cmd_management}</span></h3>
 
-<!--%import("filter/insert_rss_config.xml")-->
-<form id="fo_layout" action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
-    <input type="hidden" name="module" value="rss" />
-    <input type="hidden" name="act" value="procRssAdminInsertConfig" />
+<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
+<form ruleset="insertRssConfig" id="fo_layout" action="./" method="post" enctype="multipart/form-data">
+<input type="hidden" name="module" value="rss" />
+<input type="hidden" name="act" value="procRssAdminInsertConfig" />
     <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->total_feed}</div></th>
@@ -79,5 +79,3 @@
     <!--@end-->
     </tbody>
 </table>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
\ No newline at end of file
diff --git a/modules/rss/tpl/rss_module_config.html b/modules/rss/tpl/rss_module_config.html
index e5bca1891..6c90bc827 100644
--- a/modules/rss/tpl/rss_module_config.html
+++ b/modules/rss/tpl/rss_module_config.html
@@ -1,6 +1,6 @@
-<!--%import("filter/insert_rss_module_config.xml")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, insert_rss_module_config)">
+<form ruleset="insertRssModuleConfig" action="./" method="post">
+<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
+<input type="hidden" name="success_return_url" value="{getUrl('', 'module', $module, 'act', $act, 'module_srl', $module_srl)}" />
 <input type="hidden" name="target_module_srl" value="{$rss_config->module_srl?$rss_config->module_srl:$module_srls}" />
 
     <h4 class="xeAdmin">{$lang->open_rss}</h4>