From a765754a073e2f95959dc580cfc334b5da2fd1f7 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Wed, 29 Jun 2011 08:15:55 +0000
Subject: [PATCH] issue 46 apply validator to point module

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8544 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/point/conf/module.xml            |  4 +--
 modules/point/lang/en.lang.php           |  1 +
 modules/point/lang/es.lang.php           |  1 +
 modules/point/lang/fr.lang.php           |  1 +
 modules/point/lang/jp.lang.php           |  1 +
 modules/point/lang/ko.lang.php           |  1 +
 modules/point/lang/ru.lang.php           |  1 +
 modules/point/lang/tr.lang.php           |  1 +
 modules/point/lang/vi.lang.php           |  1 +
 modules/point/lang/zh-CN.lang.php        |  1 +
 modules/point/lang/zh-TW.lang.php        |  1 +
 modules/point/point.admin.controller.php | 38 ++++++++++++++++++++++--
 modules/point/ruleset/insertConfig.xml   | 20 +++++++++++++
 modules/point/ruleset/updatePoint.xml    | 10 +++++++
 modules/point/tpl/config.html            |  5 ++--
 modules/point/tpl/js/point_admin.js      |  7 ++---
 modules/point/tpl/member_list.html       | 11 ++++---
 modules/point/tpl/module_config.html     |  5 ++--
 18 files changed, 92 insertions(+), 18 deletions(-)
 create mode 100644 modules/point/ruleset/insertConfig.xml
 create mode 100644 modules/point/ruleset/updatePoint.xml

diff --git a/modules/point/conf/module.xml b/modules/point/conf/module.xml
index 9f892b81c..36c2ac899 100644
--- a/modules/point/conf/module.xml
+++ b/modules/point/conf/module.xml
@@ -7,9 +7,9 @@
         <action name="dispPointAdminModuleConfig" type="view" standalone="true" />
         <action name="dispPointAdminPointList" type="view" standalone="true" />
 
-        <action name="procPointAdminInsertConfig" type="controller" standalone="true" />
+        <action name="procPointAdminInsertConfig" type="controller" standalone="true" ruleset="insertConfig" />
         <action name="procPointAdminInsertModuleConfig" type="controller" standalone="true" />
-        <action name="procPointAdminUpdatePoint" type="controller" standalone="true" />
+        <action name="procPointAdminUpdatePoint" type="controller" standalone="true" ruleset="updatePoint" />
         <action name="procPointAdminInsertPointModuleConfig" type="controller" standalone="true" />
         <action name="procPointAdminApplyPoint" type="controller" standalone="true" />
         <action name="procPointAdminReset" type="controller" standalone="true" />
diff --git a/modules/point/lang/en.lang.php b/modules/point/lang/en.lang.php
index 2f444f5b1..a8cdba801 100644
--- a/modules/point/lang/en.lang.php
+++ b/modules/point/lang/en.lang.php
@@ -66,4 +66,5 @@
 
     $lang->point_recal_message = 'Adjusting Point. (%d / %d)';
     $lang->point_recal_finished = 'Point recalculation is finished.';
+	$lang->point_update_desc = '포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정 됩니다.';
 ?>
diff --git a/modules/point/lang/es.lang.php b/modules/point/lang/es.lang.php
index 58e60391c..0da4de380 100644
--- a/modules/point/lang/es.lang.php
+++ b/modules/point/lang/es.lang.php
@@ -66,4 +66,5 @@
 
     $lang->point_recal_message = 'Ajuste de Punto. (%d / %d)';
     $lang->point_recal_finished = 'Punto cálculo está acabado.';
+	$lang->point_update_desc = '포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정 됩니다.';
 ?>
diff --git a/modules/point/lang/fr.lang.php b/modules/point/lang/fr.lang.php
index 8ce1c2e25..b5c6dc5a4 100644
--- a/modules/point/lang/fr.lang.php
+++ b/modules/point/lang/fr.lang.php
@@ -66,4 +66,5 @@
 
     $lang->point_recal_message = 'En train d\'Adjuster le Point. (%d / %d)';
     $lang->point_recal_finished = 'Recalcul des Points est fini.';
+	$lang->point_update_desc = '포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정 됩니다.';
 ?>
diff --git a/modules/point/lang/jp.lang.php b/modules/point/lang/jp.lang.php
index bd8aaa6e4..7a770a48f 100644
--- a/modules/point/lang/jp.lang.php
+++ b/modules/point/lang/jp.lang.php
@@ -65,4 +65,5 @@
 
     $lang->point_recal_message = 'ただ今ポイントを適用しています。 (%d / %d)';
     $lang->point_recal_finished = 'ポイント再計算が完了しました。';
+	$lang->point_update_desc = '포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정 됩니다.';
 ?>
diff --git a/modules/point/lang/ko.lang.php b/modules/point/lang/ko.lang.php
index cdc24a238..50a4c3080 100644
--- a/modules/point/lang/ko.lang.php
+++ b/modules/point/lang/ko.lang.php
@@ -50,4 +50,5 @@
     $lang->msg_disallow_by_point = "포인트가 부족하여 글을 읽으실 수 없습니다. (필요한 포인트 : %d, 현재 포인트 : %d)";
     $lang->point_recal_message = '포인트 적용중입니다. (%d / %d)';
     $lang->point_recal_finished = '포인트 재계산이 완료되었습니다.';
+	$lang->point_update_desc = '포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정 됩니다.';
 ?>
diff --git a/modules/point/lang/ru.lang.php b/modules/point/lang/ru.lang.php
index 4c5ff441f..cc967c8e8 100644
--- a/modules/point/lang/ru.lang.php
+++ b/modules/point/lang/ru.lang.php
@@ -66,4 +66,5 @@
 
     $lang->point_recal_message = '포인트 적용중입니다. (%d / %d)';
     $lang->point_recal_finished = '포인트 재계산이 모두 완료되었습니다';
+	$lang->point_update_desc = '포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정 됩니다.';
 ?>
diff --git a/modules/point/lang/tr.lang.php b/modules/point/lang/tr.lang.php
index 8e38b4fb1..ab67d7215 100644
--- a/modules/point/lang/tr.lang.php
+++ b/modules/point/lang/tr.lang.php
@@ -66,4 +66,5 @@
 
     $lang->point_recal_message = 'Puan Düzeltiliyor. (%d / %d)';
     $lang->point_recal_finished = 'Puan tekrar hesaplaması bitti.';
+	$lang->point_update_desc = '포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정 됩니다.';
 ?>
diff --git a/modules/point/lang/vi.lang.php b/modules/point/lang/vi.lang.php
index 97944b888..60567c821 100644
--- a/modules/point/lang/vi.lang.php
+++ b/modules/point/lang/vi.lang.php
@@ -68,4 +68,5 @@
 
     $lang->point_recal_message = 'Điều chỉnh điểm. (%d / %d)';
     $lang->point_recal_finished = 'Đã kết thúc việc tính toán lại điểm.';
+	$lang->point_update_desc = '포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정 됩니다.';
 ?>
diff --git a/modules/point/lang/zh-CN.lang.php b/modules/point/lang/zh-CN.lang.php
index 12ff9a266..8b784307a 100644
--- a/modules/point/lang/zh-CN.lang.php
+++ b/modules/point/lang/zh-CN.lang.php
@@ -65,4 +65,5 @@
 
     $lang->point_recal_message = '计算并应用中(%d / %d)。';
     $lang->point_recal_finished = '积分重新计算并应用完毕。';
+	$lang->point_update_desc = '포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정 됩니다.';
 ?>
diff --git a/modules/point/lang/zh-TW.lang.php b/modules/point/lang/zh-TW.lang.php
index 93185d25f..d3ab7ddbe 100644
--- a/modules/point/lang/zh-TW.lang.php
+++ b/modules/point/lang/zh-TW.lang.php
@@ -66,4 +66,5 @@
 
     $lang->point_recal_message = '計算並套用中(%d / %d)。';
     $lang->point_recal_finished = '點數重新計算並套用完畢。';
+	$lang->point_update_desc = '포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정 됩니다.';
 ?>
diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php
index ede2b86bb..c342727d7 100644
--- a/modules/point/point.admin.controller.php
+++ b/modules/point/point.admin.controller.php
@@ -69,6 +69,11 @@
             $oModuleController->insertModuleConfig('point', $config);
 
             $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', 'dispPointAdminConfig');
+				header('location:'.$returnUrl);
+				return;
+			}
         }
 
         /**
@@ -93,6 +98,11 @@
             }
 
             $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', 'dispPointAdminModuleConfig');
+				header('location:'.$returnUrl);
+				return;
+			}
         }
 
         /**
@@ -128,12 +138,36 @@
          * @brief Change members points
          **/
         function procPointAdminUpdatePoint() {
-            $action = Context::get('action');
             $member_srl = Context::get('member_srl');
             $point = Context::get('point');
 
+			preg_match('/^(\+|-)?([1-9][0-9]*)$/', $point, $m);
+
+			$action = '';
+			switch($m[1])
+			{
+				case '+':
+					$action = 'add';
+					break;
+
+				case '-':
+					$action = 'minus';
+					break;
+
+				default:
+					$action = 'update';
+					break;
+			}
+			$point = $m[2];
+
             $oPointController = &getController('point');
-            return $oPointController->setPoint($member_srl, (int)$point, $action);
+            $output = $oPointController->setPoint($member_srl, (int)$point, $action);
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminPointList');
+				header('location:'.$returnUrl);
+				return;
+			}
+			return $output;
         }
 
         /**
diff --git a/modules/point/ruleset/insertConfig.xml b/modules/point/ruleset/insertConfig.xml
new file mode 100644
index 000000000..7f5583679
--- /dev/null
+++ b/modules/point/ruleset/insertConfig.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="less_than_1000" type="expr" test="$$ &lt; 1000" />
+    </customrules>
+    <fields>
+		<field name="max_level" required="true" rule="number,less_than_1000" />
+		<field name="point_name" required="true" />
+		<field name="signup_point" required="true" default="0" />
+		<field name="login_point" required="true" default="0" />
+		<field name="insert_document" required="true" default="0" />
+		<field name="insert_comment" required="true" default="0" />
+		<field name="upload_file" required="true" default="0" />
+		<field name="download_file" required="true" default="0" />
+		<field name="read_document" required="true" default="0" />
+		<field name="voted" required="true" default="0" />
+		<field name="blamed" required="true" default="0" />
+		<field name="level_icon" required="true" default="default" />
+    </fields>
+</ruleset>
diff --git a/modules/point/ruleset/updatePoint.xml b/modules/point/ruleset/updatePoint.xml
new file mode 100644
index 000000000..a7d95de8a
--- /dev/null
+++ b/modules/point/ruleset/updatePoint.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="number_with_plus_minus" type="regex" test="/^(\+|-)?[1-9][0-9]*$/"  />
+    </customrules>
+    <fields>
+		<field name="member_srl" required="true" rule="number" />
+		<field name="point" required="true" rule="number_with_plus_minus" />
+    </fields>
+</ruleset>
diff --git a/modules/point/tpl/config.html b/modules/point/tpl/config.html
index 3fd5753e5..7f51adc2b 100644
--- a/modules/point/tpl/config.html
+++ b/modules/point/tpl/config.html
@@ -1,7 +1,8 @@
-<!--%import("filter/insert_config.xml")-->
 <!--#include("./header.html")-->
 
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config);">
+<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
+<form ruleset="insertConfig" action="./" method="post">
+<input type="hidden" name="act" value="procPointAdminInsertConfig" />
 
 <div class="adminLeftContent">
 
diff --git a/modules/point/tpl/js/point_admin.js b/modules/point/tpl/js/point_admin.js
index 619de706b..c4b0ceff4 100644
--- a/modules/point/tpl/js/point_admin.js
+++ b/modules/point/tpl/js/point_admin.js
@@ -52,15 +52,14 @@ function doPointRecal() {
 	);
 }
 
-function updatePoint(member_srl, action)
+function updatePoint(member_srl)
 {
 	var $point = jQuery('#point_'+member_srl);
 	get_by_id('update_member_srl').value = member_srl;
-	get_by_id('update_action').value = action;
-	get_by_id('update_point').value = $point.attr('value');
+	get_by_id('update_point').value = $point.val();
 
     var hF = get_by_id('updateForm');
-    procFilter(hF, update_point);
+	hF.submit();
 }
 
 
diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html
index f6aceda9b..65961eb03 100644
--- a/modules/point/tpl/member_list.html
+++ b/modules/point/tpl/member_list.html
@@ -1,7 +1,8 @@
-<!--%import("filter/update_point.xml")-->
 <!--%import("js/point_admin.js")-->
 <!--#include("header.html")-->
 
+<p>{$lang->point_update_desc}</p>
+<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
 <table cellspacing="0" class="crossTable">
 <caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
@@ -26,9 +27,7 @@
                 <input type="hidden" name="member_srl" value="{$val->member_srl}" />
                 <input type="text" name="orgpoint" value="{$val->point}" class="inputTypeText w80" readonly />
                 <input type="text" id="point_{$val->member_srl}" name="point" class="inputTypeText w80" />
-                <span class="button"><input type="button" value="+" onclick="updatePoint({$val->member_srl}, 'add')"/></span>
-                <span class="button"><input type="button" value="-" onclick="updatePoint({$val->member_srl}, 'minus')"/></span>
-                <span class="button"><input type="button" value="{$lang->cmd_update}" onclick="updatePoint({$val->member_srl}, 'update')" /></span>
+                <span class="button"><input type="button" value="{$lang->cmd_update}" onclick="updatePoint({$val->member_srl})" /></span>
             </form>
         </td>
         <td class="number center">{$val->level}</td>
@@ -37,8 +36,8 @@
 </tbody>
 </table>
 
-<form id="updateForm" action="./" method="POST">
-    <input type="hidden" id="update_action" name="action" value="" />
+<form ruleset="updatePoint" id="updateForm" action="./" method="POST">
+	<input type="hidden" name="act" value="procPointAdminUpdatePoint" />
     <input type="hidden" id="update_member_srl" name="member_srl" value="" />
     <input type="hidden" id="update_point" name="point" class="inputTypeText w80" />
 </form>
diff --git a/modules/point/tpl/module_config.html b/modules/point/tpl/module_config.html
index ec66b85d3..657a38e90 100644
--- a/modules/point/tpl/module_config.html
+++ b/modules/point/tpl/module_config.html
@@ -1,7 +1,8 @@
-<!--%import("filter/insert_module_config.xml")-->
 <!--#include("./header.html")-->
 
-<form action="./" method="get" onsubmit="return procFilter(this, insert_module_config);" id="fo_point">
+<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
+<form action="./" method="post" id="fo_point">
+<input type="hidden" name="act" value="procPointAdminInsertModuleConfig" />
 
     <table cellspacing="0" class="crossTable">
     <thead>