From 3e97b309de63da7fe7fcb088719785989e659d02 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Mon, 14 Jan 2013 02:23:54 +0000
Subject: [PATCH] when delete spam word, check length

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12540 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/spamfilter/conf/module.xml                 |  2 +-
 modules/spamfilter/ruleset/deleteDeniedWord.xml    |  8 ++++----
 modules/spamfilter/spamfilter.admin.controller.php | 11 +++++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/spamfilter/conf/module.xml b/modules/spamfilter/conf/module.xml
index dacc50529..68018922f 100644
--- a/modules/spamfilter/conf/module.xml
+++ b/modules/spamfilter/conf/module.xml
@@ -23,7 +23,7 @@
         <action name="dispSpamfilterAdminConfigBlock" type="view" standalone="true" menu_name="spamFilter" />
 
 		<action name="procSpamfilterAdminInsertDeniedIP" type="controller" standalone="true" ruleset="insertDeniedIp" />
-        <action name="procSpamfilterAdminInsertDeniedWord" type="controller" standalone="true" ruleset="insertDeniedWord" />
+        <action name="procSpamfilterAdminInsertDeniedWord" type="controller" standalone="true" />
 
         <action name="procSpamfilterAdminDeleteDeniedIP" type="controller" standalone="true" ruleset="deleteDeniedIp" />
         <action name="procSpamfilterAdminDeleteDeniedWord" type="controller" standalone="true" ruleset="deleteDeniedWord" />
diff --git a/modules/spamfilter/ruleset/deleteDeniedWord.xml b/modules/spamfilter/ruleset/deleteDeniedWord.xml
index 823954439..a08116747 100644
--- a/modules/spamfilter/ruleset/deleteDeniedWord.xml
+++ b/modules/spamfilter/ruleset/deleteDeniedWord.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ruleset version="1.5.0">
-    <customrules>
- 		<rule name="word" type="regex" test="/^(.{2,40}[\r\n]+)*.{2,40}$/"  />
+	<customrules>
+		<rule name="word" type="regex" test="/^(.{2,40}[\r\n]+)*.{2,40}$/"  />
 	</customrules>
-    <fields>
+	<fields>
 		<field name="act" required="true" default="procSpamfilterAdminDeleteDeniedWord" />
 		<field name="word" required="true" rule="word" />
-    </fields>
+	</fields>
 </ruleset>
diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php
index b501cb386..8de231585 100644
--- a/modules/spamfilter/spamfilter.admin.controller.php
+++ b/modules/spamfilter/spamfilter.admin.controller.php
@@ -110,10 +110,17 @@ class spamfilterAdminController extends spamfilter
 	 */
 	function insertWord($word_list)
 	{
-		if(!preg_match("/^(.{2,40}\s*)*$/",$word_list)) return new Object(-1, 'msg_invalid');
-
 		$word_list = str_replace("\r","",$word_list);
 		$word_list = explode("\n",$word_list);
+
+		foreach($word_list as $word)
+		{
+			if(!preg_match("/^(.{2,40}[\r\n]+)*.{2,40}$/", $word))
+			{
+				return new Object(-1, 'msg_invalid');
+			}
+		}
+
 		$fail_word = '';
 		foreach($word_list as $word)
 		{