Merge branch 'bonus_rate' into bonus_manager

admin/control/account.php

@@ -23,7 +23,7 @@ class accountControl extends SystemControl{
 	public function qqOp(){
 		$model_setting = Model('setting');
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			if (trim($_POST['qq_isuse']) == '1'){
 				$obj_validate->validateparam = array(
 					array("input"=>$_POST["qq_appid"], "require"=>"true","message"=>Language::get('qq_appid_error')),
@@ -64,7 +64,7 @@ class accountControl extends SystemControl{
 	public function sinaOp(){
 		$model_setting = Model('setting');
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			if (trim($_POST['sina_isuse']) == '1'){
 				$obj_validate->validateparam = array(
 					array("input"=>$_POST["sina_wb_akey"], "require"=>"true","message"=>Language::get('sina_wb_akey_error')),

admin/control/activity.php

@@ -66,7 +66,7 @@ class activityControl extends SystemControl{
 			exit;
 		}
 		//提交表单
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$validate_arr[] = array("input"=>$_POST["activity_title"],"require"=>"true","message"=>Language::get('activity_new_title_null'));
 		$validate_arr[] = array("input"=>$_POST["activity_start_date"],"require"=>"true","message"=>Language::get('activity_new_startdate_null'));
 		$validate_arr[] = array("input"=>$_POST["activity_end_date"],"require"=>"true",'validator'=>'Compare','operator'=>'>','to'=>"{$_POST['activity_start_date']}","message"=>Language::get('activity_new_enddate_null'));
@@ -218,7 +218,7 @@ class activityControl extends SystemControl{
 			exit;
 		}
 		//提交表单
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$validate_arr[] = array("input"=>$_POST["activity_title"],"require"=>"true","message"=>Language::get('activity_new_title_null'));
 		$validate_arr[] = array("input"=>$_POST["activity_start_date"],"require"=>"true","message"=>Language::get('activity_new_startdate_null'));
 		$validate_arr[] = array("input"=>$_POST["activity_end_date"],"require"=>"true",'validator'=>'Compare','operator'=>'>','to'=>"{$_POST['activity_start_date']}","message"=>Language::get('activity_new_enddate_null'));

admin/control/adv.php

@@ -35,7 +35,7 @@ class advControl extends SystemControl
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_arr = array();
 			$validate_arr[] = array("input"=>$_POST["adv_name"], "require"=>"true", "message"=>$lang['adv_can_not_null']);
 			$validate_arr[] = array("input"=>$_POST["aptype_hidden"], "require"=>"true", "message"=>$lang['must_select_ap']);
@@ -208,7 +208,7 @@ class advControl extends SystemControl
 			$adv  = Model('adv');
 		    $upload		= new UploadFile();
 
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			if($_POST['ap_class'] == '1'){
 				$obj_validate->validateparam = array(
 			    array("input"=>$_POST["ap_name"], "require"=>"true", "message"=>$lang['ap_can_not_null']),
@@ -272,7 +272,7 @@ class advControl extends SystemControl
 			$adv  = Model('adv');
 		    $upload		= new UploadFile();
 
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			if($_POST['ap_class'] == '1'){
 				$obj_validate->validateparam = array(
 			    array("input"=>$_POST["ap_name"], "require"=>"true", "message"=>$lang['ap_can_not_null']),
@@ -394,7 +394,7 @@ class advControl extends SystemControl
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 			    array("input"=>$_POST["adv_name"], "require"=>"true", "message"=>$lang['ap_can_not_null']),
 				array("input"=>$_POST["adv_start_date"], "require"=>"true","message"=>$lang['must_select_start_time']),

admin/control/article.php

@@ -123,7 +123,7 @@ class articleControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["article_title"], "require"=>"true", "message"=>$lang['article_add_title_null']),
 				array("input"=>$_POST["ac_id"], "require"=>"true", "message"=>$lang['article_add_class_null']),
@@ -220,7 +220,7 @@ class articleControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["article_title"], "require"=>"true", "message"=>$lang['article_add_title_null']),
 				array("input"=>$_POST["ac_id"], "require"=>"true", "message"=>$lang['article_add_class_null']),

admin/control/article_class.php

@@ -83,7 +83,7 @@ class article_classControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["ac_name"], "require"=>"true", "message"=>$lang['article_class_add_name_null']),
 				array("input"=>$_POST["ac_sort"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['article_class_add_sort_int']),
@@ -143,7 +143,7 @@ class article_classControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["ac_name"], "require"=>"true", "message"=>$lang['article_class_add_name_null']),
 				array("input"=>$_POST["ac_sort"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['article_class_add_sort_int']),

admin/control/brand.php

@@ -62,7 +62,7 @@ class brandControl extends SystemControl{
 		$lang	= Language::getLangContent();
 		$model_brand = Model('brand');
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["brand_name"], "require"=>"true", "message"=>$lang['brand_add_name_null']),
 				array("input"=>$_POST["brand_initial"], "require"=>"true", "message"=>'请填写首字母'),
@@ -117,7 +117,7 @@ class brandControl extends SystemControl{
 		$model_brand = Model('brand');
 
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["brand_name"], "require"=>"true", "message"=>$lang['brand_add_name_null']),
 				array("input"=>$_POST["brand_initial"], "require"=>"true", "message"=>'请填写首字母'),

admin/control/circle_class.php

@@ -49,7 +49,7 @@ class circle_classControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["class_name"], "require"=>"true", "message"=>L('circle_class_name_not_null')),
 					array("input"=>$_POST["class_sort"], "require"=>"true", 'validator'=>'Number', "message"=>L('circle_class_sort_is_number')),
@@ -97,10 +97,10 @@ class circle_classControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["class_name"], "require"=>"true", "message"=>L('circle_class_name_not_null')),
-					array("input"=>$_POST["class_sort"], "require"=>"true", 'validator'=>'Number', "message"=>L(’circle_class_sort_is_number)),
+					array("input"=>$_POST["class_sort"], "require"=>"true", 'validator'=>'Number', "message"=>L('circle_class_sort_is_number')),
 			);
 			$error = $obj_validate->validate();
 			if($error != ''){

admin/control/circle_manage.php

@@ -117,7 +117,7 @@ class circle_manageControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["c_name"], "require"=>"true", "message"=>L('circle_name_not_null')),
 			);
@@ -179,7 +179,7 @@ class circle_manageControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["c_name"], "require"=>"true", "message"=>L('circle_name_not_null')),
 			);

admin/control/cms_article_class.php

@@ -44,7 +44,7 @@ class cms_article_classControl extends SystemControl{
      * cms文章分类保存
      **/
     public function cms_article_class_saveOp() {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $validate_array = array(
             array('input'=>$_POST['class_name'],'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('class_name_error')),
             array('input'=>$_POST['class_sort'],'require'=>'true','validator'=>'Range','min'=>0,'max'=>255,'message'=>Language::get('class_sort_error')),
@@ -104,7 +104,7 @@ class cms_article_classControl extends SystemControl{
         }
 
         $new_name = trim($_GET['value']);
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array('input'=>$new_name,'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('class_name_error')),
         );

admin/control/cms_index.php

@@ -125,7 +125,7 @@ class cms_indexControl extends SystemControl{
      */
     public function update_page_module_titleOp() {
         $new_title = $_POST['value'];
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array('input'=>$new_title,'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"20",'message'=>Language::get('class_name_error')),
         );

admin/control/cms_navigation.php

@@ -44,7 +44,7 @@ class cms_navigationControl extends SystemControl{
      * cms文章分类保存
      **/
     public function cms_navigation_saveOp() {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $validate_array = array(
             array('input'=>$_POST['navigation_title'],'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"20",'message'=>Language::get('navigation_title_error')),
             array('input'=>$_POST['navigation_link'],'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"255",'message'=>Language::get('navigation_link_error')),
@@ -95,7 +95,7 @@ class cms_navigationControl extends SystemControl{
      */
     public function update_navigation_titleOp() {
         $new_value = trim($_GET['value']);
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array('input'=>$new_value,'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('navigation_title_error')),
         );
@@ -113,7 +113,7 @@ class cms_navigationControl extends SystemControl{
      */
     public function update_navigation_linkOp() {
         $new_value = trim($_GET['value']);
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array('input'=>$new_value,'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"255",'message'=>Language::get('navigation_link_error')),
         );

admin/control/cms_picture_class.php

@@ -44,7 +44,7 @@ class cms_picture_classControl extends SystemControl{
      * cms画报分类保存
      **/
     public function cms_picture_class_saveOp() {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $validate_array = array(
             array('input'=>$_POST['class_name'],'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('class_name_error')),
             array('input'=>$_POST['class_sort'],'require'=>'true','validator'=>'Range','min'=>0,'max'=>255,'message'=>Language::get('class_sort_error')),
@@ -104,7 +104,7 @@ class cms_picture_classControl extends SystemControl{
         }
 
         $new_name = trim($_GET['value']);
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array('input'=>$new_name,'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('class_name_error')),
         );

admin/control/cms_tag.php

@@ -44,7 +44,7 @@ class cms_tagControl extends SystemControl{
      * cms文章分类保存
      **/
     public function cms_tag_saveOp() {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $validate_array = array(
             array('input'=>$_POST['tag_name'],'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"20",'message'=>Language::get('tag_name_error')),
             array('input'=>$_POST['tag_sort'],'require'=>'true','validator'=>'Range','min'=>0,'max'=>255,'message'=>Language::get('tag_sort_error')),
@@ -89,7 +89,7 @@ class cms_tagControl extends SystemControl{
      */
     public function update_tag_nameOp() {
         $new_value = trim($_GET['value']);
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array('input'=>$new_value,'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('tag_name_error')),
         );

admin/control/complain.php

@@ -162,7 +162,7 @@ class complainControl extends SystemControl {
         $complain_id = intval($_POST['complain_id']);
         $final_handle_message = trim($_POST['final_handle_message']);
         //验证输入的数据
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$final_handle_message, "require"=>"true","validator"=>"Length","min"=>"1","max"=>"255","message"=>Language::get('final_handle_message_error')),
         );
@@ -260,7 +260,7 @@ class complainControl extends SystemControl {
         $input['complain_subject_content'] = trim($_POST['complain_subject_content']);
         $input['complain_subject_desc'] = trim($_POST['complain_subject_desc']);
         //验证提交的内容
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$input['complain_subject_content'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>Language::get('complain_subject_content_error')),
             array("input"=>$input['complain_subject_desc'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"100","message"=>Language::get('complain_subject_desc_error')),

admin/control/consulting.php

@@ -126,7 +126,7 @@ class consultingControl extends SystemControl{
     public function type_addOp() {
         if (chksubmit()) {
             // 验证
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                 array("input"=>$_POST["ct_name"], "require"=>"true", "message"=>'请填写咨询类型名称'),
                 array("input"=>$_POST["ct_sort"], "require"=>"true", 'validator'=>'Number', "message"=>'请正确填写咨询类型排序'),
@@ -158,7 +158,7 @@ class consultingControl extends SystemControl{
         $model_ct = Model('consult_type');
         if (chksubmit()) {
             // 验证
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                     array("input"=>$_POST["ct_name"], "require"=>"true", "message"=>'请填写咨询类型名称'),
                     array("input"=>$_POST["ct_sort"], "require"=>"true", 'validator'=>'Number', "message"=>'请正确填写咨询类型排序'),

admin/control/document.php

@@ -43,7 +43,7 @@ class documentControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["doc_title"], "require"=>"true", "message"=>$lang['document_index_title_null']),
 				array("input"=>$_POST["doc_content"], "require"=>"true", "message"=>$lang['document_index_content_null'])

admin/control/flea_class.php

@@ -149,7 +149,7 @@ class flea_classControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["gc_name"], "require"=>"true", "message"=>$lang['goods_class_add_name_null']),
 				array("input"=>$_POST["gc_sort"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['goods_class_add_sort_int']),
@@ -210,7 +210,7 @@ class flea_classControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["gc_name"], "require"=>"true", "message"=>$lang['goods_class_add_name_null']),
 				array("input"=>$_POST["gc_sort"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['goods_class_add_sort_int']),

admin/control/goods_class.php

@@ -96,7 +96,7 @@ class goods_classControl extends SystemControl
 		$model_class = Model('goods_class');
 		if (chksubmit())
 		{
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["gc_name"], "require"=>"true", "message"=>$lang['goods_class_add_name_null']),
 				array("input"=>$_POST["gc_sort"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['goods_class_add_sort_int']),
@@ -191,7 +191,7 @@ class goods_classControl extends SystemControl
 
 		if (chksubmit())
 		{
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["gc_name"], "require"=>"true", "message"=>$lang['goods_class_add_name_null']),
 			    array("input"=>$_POST["commis_rate"], "require"=>"true", 'validator'=>'range','max'=>100,'min'=>0, "message"=>$lang['goods_class_add_commis_rate_error']),

admin/control/inform.php

@@ -148,7 +148,7 @@ class informControl extends SystemControl{
         $input['inform_type_desc']	= trim($_POST['inform_type_desc']);
 
         //验证提交的内容
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$input['inform_type_name'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>Language::get('inform_type_null')),
             array("input"=>$input['inform_type_desc'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"100","message"=>Language::get('inform_type_desc_null')),
@@ -229,7 +229,7 @@ class informControl extends SystemControl{
         $input['inform_subject_content'] = trim($_POST['inform_subject_content']);
 
         //验证提交的内容
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$input['inform_subject_type_name'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>Language::get('inform_subject_null')),
             array("input"=>$input['inform_subject_content'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>Language::get('inform_content_null')),
@@ -300,7 +300,7 @@ class informControl extends SystemControl{
         }
 
         //验证输入的数据
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
 
             array("input"=>$inform_handle_message, "require"=>"true","validator"=>"Length","min"=>"1","max"=>"100","message"=>Language::get('inform_handle_message_null')),

admin/control/link.php

@@ -105,7 +105,7 @@ class linkControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["link_title"], "require"=>"true", "message"=>$lang['link_add_title_null']),
 				//array("input"=>$_POST["link_url"], "require"=>"true", 'validator'=>'Url', "message"=>$lang['link_add_url_wrong']),
@@ -170,7 +170,7 @@ class linkControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["link_title"], "require"=>"true", "message"=>$lang['link_add_title_null']),
 				//array("input"=>$_POST["link_url"], "require"=>"true", 'validator'=>'Url', "message"=>$lang['link_add_url_wrong']),

admin/control/live_area.php

@@ -54,7 +54,7 @@ class live_areaControl extends SystemControl{
 	public function area_addOp(){
 		if(isset($_POST) && !empty($_POST)){
 			//数据验证
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_array = array(
 				array('input'=>$_POST['live_area_name'],'require'=>'true','message'=>'区域名称不能为空'),
 				array('input'=>$_POST['first_letter'],'require'=>'true','message'=>'首字母不能为空'),
@@ -108,7 +108,7 @@ class live_areaControl extends SystemControl{
 	public function area_editOp(){
 		if(isset($_POST) && !empty($_POST)){
 			//数据验证
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_array = array(
 				array('input'=>$_POST['live_area_name'],'require'=>'true','message'=>'区域名称不能为空'),
 				array('input'=>$_POST['first_letter'],'require'=>'true','message'=>'首字母不能为空'),

admin/control/live_class.php

@@ -34,7 +34,7 @@ class live_classControl extends SystemControl{
 	public function add_classOp(){
 		if(chksubmit()){//添加线下抢购分类
 			//数据验证
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_array = array(
 				array('input'=>$_POST['live_class_name'],'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('live_groupbuy_class_name_is_not_null')),
 				array('input'=>$_POST['live_class_name'],'require'=>'true','validator'=>'Range','min'=>0,'max'=>255,'message'=>Language::get('live_groupbuy_class_sort_is_not_null')),
@@ -79,7 +79,7 @@ class live_classControl extends SystemControl{
 	public function edit_classOp(){
 		if(chksubmit()){
 			//数据验证
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_array = array(
 					array('input'=>$_POST['live_class_name'],'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('live_groupbuy_class_name_is_not_null')),
 					array('input'=>$_POST['live_class_sort'],'require'=>'true','validator'=>'Range','min'=>0,'max'=>255,'message'=>Language::get('live_groupbuy_class_sort_is_not_null')),

admin/control/login.php

@@ -24,7 +24,7 @@ class LoginControl extends SystemControl {
 		    if (process::islock('admin')) {
 		        showMessage('您的操作过于频繁，请稍后再试');
 		    }
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 			array("input"=>$_POST["user_name"],		"require"=>"true", "message"=>L('login_index_username_null')),
 			array("input"=>$_POST["password"],		"require"=>"true", "message"=>L('login_index_password_null')),

admin/control/mall_consult.php

@@ -159,7 +159,7 @@ class mall_consultControl extends SystemControl{
     public function type_addOp() {
         if (chksubmit()) {
             // 验证
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                 array("input"=>$_POST["mct_name"], "require"=>"true", "message"=>'请填写咨询类型名称'),
                 array("input"=>$_POST["mct_sort"], "require"=>"true", 'validator'=>'Number', "message"=>'请正确填写咨询类型排序'),
@@ -191,7 +191,7 @@ class mall_consultControl extends SystemControl{
         $model_mct = Model('mall_consult_type');
         if (chksubmit()) {
             // 验证
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                     array("input"=>$_POST["mct_name"], "require"=>"true", "message"=>'请填写咨询类型名称'),
                     array("input"=>$_POST["mct_sort"], "require"=>"true", 'validator'=>'Number', "message"=>'请正确填写咨询类型排序'),

admin/control/mb_ad.php

@@ -59,7 +59,7 @@ class mb_adControl extends SystemControl
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["link_title"], "require"=>"true", "message"=>L('link_add_title_null')),
 				array("input"=>$_POST["link_keyword"], "require"=>"true","message"=>L('link_add_url_wrong')),
@@ -123,7 +123,7 @@ class mb_adControl extends SystemControl
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["link_title"], "require"=>"true", "message"=>L('link_add_title_null')),
 				array("input"=>$_POST["link_url"], "require"=>"true", "message"=>L('link_add_url_wrong')),

admin/control/mb_home.php

@@ -40,7 +40,7 @@ class mb_homeControl extends SystemControl{
 
 		if ($_POST['form_submit'] == 'ok'){
 			//验证
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["h_title"], "require"=>"true", "message"=>L('home_add_null')),
 				array("input"=>$_POST["h_desc"], "require"=>"true", "message"=>L('home_add_null')),

admin/control/member.php

@@ -126,7 +126,7 @@ class memberControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 			array("input"=>$_POST["member_email"], "require"=>"true", 'validator'=>'Email', "message"=>$lang['member_edit_valid_email']),
 			);
@@ -199,7 +199,7 @@ class memberControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 			    array("input"=>$_POST["member_name"], "require"=>"true", "message"=>$lang['member_add_name_null']),
 			    array("input"=>$_POST["member_passwd"], "require"=>"true", "message"=>'密码不能为空'),

admin/control/message.php

@@ -98,7 +98,7 @@ class messageControl extends SystemControl{
 	public function email_tpl_editOp(){
 		$model_templates = Model('mail_templates');
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["code"], "require"=>"true", "message"=>L('mailtemplates_edit_no_null')),
 				array("input"=>$_POST["title"], "require"=>"true", "message"=>L('mailtemplates_edit_title_null')),

admin/control/microshop.php

@@ -188,7 +188,7 @@ class microshopControl extends SystemControl{
      **/
     private function class_save($type) {
 
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $validate_array = array(
             array('input'=>$_POST['class_name'],'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('class_name_error')),
             array('input'=>$_POST['class_sort'],'require'=>'true','validator'=>'Range','min'=>0,'max'=>255,'message'=>Language::get('class_sort_error')),
@@ -290,7 +290,7 @@ class microshopControl extends SystemControl{
         }
 
         $new_name = trim($_GET['value']);
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array('input'=>$new_name,'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('class_name_error')),
         );
@@ -852,7 +852,7 @@ class microshopControl extends SystemControl{
     }
 
     public function adv_saveOp() {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $validate_array = array(
             array('input'=>$_POST['adv_sort'],'require'=>'true','validator'=>'Range','min'=>0,'max'=>255,'message'=>Language::get('class_sort_error')),
         );

admin/control/navigation.php

@@ -91,7 +91,7 @@ class navigationControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["nav_title"], "require"=>"true", "message"=>$lang['navigation_add_partner_null']),
 				array("input"=>$_POST["nav_sort"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['navigation_add_sort_int']),
@@ -222,7 +222,7 @@ class navigationControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["nav_title"], "require"=>"true", "message"=>$lang['navigation_add_partner_null']),
 				array("input"=>$_POST["nav_sort"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['navigation_add_sort_int']),

admin/control/notice.php

@@ -18,7 +18,7 @@ class noticeControl extends SystemControl{
 			$content = trim($_POST['content1']);//信息内容
 			$send_type = intval($_POST['send_type']);
 			//验证
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			switch ($send_type){
 				//指定会员
 				case 1:

admin/control/operation.php

@@ -22,7 +22,7 @@ class operationControl extends SystemControl{
 	public function settingOp(){
 		$model_setting = Model('setting');
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 
 			);

admin/control/person_bonus.php

@@ -30,7 +30,7 @@ class person_bonusControl extends SystemControl
     {
         if (chksubmit())
         {
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                 array("input"=>$_POST["bonus_rate"],   "require"=>"true",'validator'=>'Compare','operator'=>' >= ','to'=> 1,"message" => '红包抵扣率必须大于0'),
                 array("input"=>$_POST["bonus_amount"], "require"=>"true",'validator'=>'Compare','operator'=>' >= ','to'=> 0.01,"message" => '金额最少一分钱')
@@ -91,8 +91,8 @@ class person_bonusControl extends SystemControl
         foreach ($items as $item)
         {
             $mobile = trim($item);
-            $validate = new Validate();
-            $validate->setValidate(Validate::verify_mobile($mobile));
+            $validate = new Validator();
+            $validate->setValidate(Validator::verify_mobile($mobile));
             $err = $validate->validate();
             if(empty($err))
             {

admin/control/pointorder.php

@@ -88,7 +88,7 @@ class pointorderControl extends SystemControl{
 		    showDialog(L('admin_pointorderd_record_error'),'index.php?act=pointorder&op=pointorder_list','error');
 		}
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_arr[] = array("input"=>$_POST["shippingcode"],"require"=>"true","message"=>L('admin_pointorder_ship_code_nullerror'));
 			$obj_validate->validateparam = $validate_arr;
 			$error = $obj_validate->validate();

admin/control/pointprod.php

@@ -53,7 +53,7 @@ class pointprodControl extends SystemControl{
 		$upload_model = Model('upload');
 		if (chksubmit()){
 			//验证表单
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_arr[] = array("input"=>$_POST["goodsname"],"require"=>"true","message"=>L('admin_pointprod_add_goodsname_error'));
 			$validate_arr[] = array("input"=>$_POST["goodsprice"],"require"=>"true","validator"=>"DoublePositive","message"=>L('admin_pointprod_add_goodsprice_number_error'));
 			$validate_arr[] = array('input'=>$_POST['goodspoints'],'require'=>'true','validator'=>'IntegerPositive','message'=>L('admin_pointprod_add_goodspoint_number_error'));
@@ -198,7 +198,7 @@ class pointprodControl extends SystemControl{
 		}
 		if (chksubmit()){
 			//验证表单
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_arr[] = array("input"=>$_POST["goodsname"],"require"=>"true","message"=>L('admin_pointprod_add_goodsname_error'));
 			$validate_arr[] = array("input"=>$_POST["goodsprice"],"require"=>"true","validator"=>"DoublePositive","message"=>L('admin_pointprod_add_goodsprice_number_error'));
 			$validate_arr[] = array('input'=>$_POST['goodspoints'],'require'=>'true','validator'=>'IntegerPositive','message'=>L('admin_pointprod_add_goodspoint_number_error'));

admin/control/points.php

@@ -23,7 +23,7 @@ class pointsControl extends SystemControl
 	public function addpointsOp(){
 		if (chksubmit()){
 
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["member_id"], "require"=>"true", "message"=>Language::get('admin_points_member_error_again')),
 				array("input"=>$_POST["pointsnum"], "require"=>"true",'validator'=>'Compare','operator'=>' >= ','to'=>1,"message"=>Language::get('admin_points_points_min_error'))

admin/control/predeposit.php

@@ -625,7 +625,7 @@ class predepositControl extends SystemControl{
 	 */
 	public function add_money(){
 		
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["member_id"], "require"=>"true", "message"=>Language::get('admin_points_member_error_again')),
 				array("input"=>$_POST["pointsnum"], "require"=>"true",'validator'=>'Compare','operator'=>' >= ','to'=>1,"message"=>Language::get('admin_points_points_min_error'))

admin/control/promotion_booth.php

@@ -127,7 +127,7 @@ class promotion_boothControl extends SystemControl{
 
         if (chksubmit()){
             // 验证
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                 array("input"=>$_POST["promotion_booth_price"], "require"=>"true", 'validator'=>'Number', "message"=>'请填写展位价格'),
                 array("input"=>$_POST["promotion_booth_goods_sum"], "require"=>"true", 'validator'=>'Number', "message"=>'不能为空，且不小于1的整数'),

admin/control/promotion_bundling.php

@@ -123,7 +123,7 @@ class promotion_bundlingControl extends SystemControl{
 
 		if (chksubmit()){
 			// 验证
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["promotion_bundling_price"], "require"=>"true", 'validator'=>'Number', "message"=>Language::get('bundling_price_error')),
 				array("input"=>$_POST["promotion_bundling_sum"], "require"=>"true", 'validator'=>'Number', "message"=>Language::get('bundling_sum_error')),

admin/control/sns_member.php

@@ -45,7 +45,7 @@ class sns_memberControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["membertag_name"], "require"=>"true", "message"=>Language::get('sns_member_tag_name_not_null')),
 					array("input"=>$_POST["membertag_sort"], "require"=>"true", 'validator'=>'Number', "message"=>Language::get('sns_member_tag_sort_is_number')),
@@ -110,7 +110,7 @@ class sns_memberControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["membertag_name"], "require"=>"true", "message"=>Language::get('sns_member_tag_name_not_null')),
 					array("input"=>$_POST["membertag_sort"], "require"=>"true", 'validator'=>'Number', "message"=>Language::get('sns_member_tag_sort_is_number')),

admin/control/spec.php

@@ -39,7 +39,7 @@ class specControl extends SystemControl {
 		$lang	= Language::getLangContent();
 		$model_spec = Model('spec');
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["s_name"], "require"=>"true", "message"=>$lang['spec_add_name_no_null'])
 			);
@@ -97,7 +97,7 @@ class specControl extends SystemControl {
 		 * 编辑保存
 		 */
 		if (chksubmit()) {
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["s_name"], "require"=>"true", "message"=>$lang['spec_add_name_no_null'])
 			);

admin/control/store_class.php

@@ -47,7 +47,7 @@ class store_classControl extends SystemControl{
 		$model_class = Model('store_class');
 		if (chksubmit()){
 			//验证
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 			array("input"=>$_POST["sc_name"], "require"=>"true", "message"=>$lang['store_class_name_no_null']),
 			);
@@ -91,7 +91,7 @@ class store_classControl extends SystemControl{
 
 		if (chksubmit()){
 			//验证
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 			array("input"=>$_POST["sc_name"], "require"=>"true", "message"=>$lang['store_class_name_no_null']),
 			);

admin/control/store_grade.php

@@ -72,7 +72,7 @@ class store_gradeControl extends SystemControl{
 		$model_grade = Model('store_grade');
 		if (chksubmit()){
 
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["sg_name"], "require"=>"true", "message"=>$lang['store_grade_name_no_null']),
 				array("input"=>$_POST["sg_goods_limit"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['allow_pubilsh_product_num_only_lnteger']),
@@ -128,7 +128,7 @@ class store_gradeControl extends SystemControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["sg_name"], "require"=>"true", "message"=>$lang['store_grade_name_no_null']),
 				array("input"=>$_POST["sg_goods_limit"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['allow_pubilsh_product_num_only_lnteger']),

admin/control/type.php

@@ -39,7 +39,7 @@ class typeControl extends SystemControl {
 		$model_type = Model('type');
 
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["t_mane"], "require"=>"true", "message"=>$lang['type_add_name_no_null']),
 				array("input"=>$_POST["t_sort"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['type_add_sort_no_null']),
@@ -178,7 +178,7 @@ class typeControl extends SystemControl {
 
 		//编辑保存
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["t_mane"], "require"=>"true", "message"=>$lang['type_add_name_no_null']),
 				array("input"=>$_POST["t_sort"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['type_add_sort_no_null']),
@@ -390,7 +390,7 @@ class typeControl extends SystemControl {
 		$model	= Model();
 
 		if($_POST['form_submit']){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["attr_name"], "require"=>"true", "message"=>$lang['type_edit_type_attr_name_no_null']),
 					array("input"=>$_POST["attr_sort"], "require"=>"true", 'validator'=>'Number', "message"=>$lang['type_edit_type_attr_sort_no_null']),

admin/control/upload.php

@@ -26,7 +26,7 @@ class uploadControl extends SystemControl{
 	 */
 	public function paramOp(){
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["image_max_filesize"], "require"=>"true", "validator"=>"Number", "message"=>L('upload_image_filesize_is_number')),
 				array("input"=>trim($_POST["image_allow_ext"]), "require"=>"true", "message"=>L('image_allow_ext_not_null'))

admin/control/voucher.php

@@ -38,7 +38,7 @@ class voucherControl extends SystemControl{
     public function settingOp(){
     	$setting_model = Model('setting');
     	if (chksubmit()){
-    		$obj_validate = new Validate();
+    		$obj_validate = new Validator();
 			$validate_arr[] = array('input'=>$_POST['promotion_voucher_price'],'require'=>'true','validator'=>'IntegerPositive','message'=>Language::get('admin_voucher_setting_price_error'));
 			$validate_arr[] = array('input'=>$_POST['promotion_voucher_storetimes_limit'],'require'=>'true','validator'=>'IntegerPositive','message'=>Language::get('admin_voucher_setting_storetimes_error'));
 			$validate_arr[] = array('input'=>$_POST['promotion_voucher_buyertimes_limit'],'require'=>'true','validator'=>'IntegerPositive','message'=>Language::get('admin_voucher_setting_buyertimes_error'));
@@ -100,7 +100,7 @@ class voucherControl extends SystemControl{
 	 */
 	public function priceaddOp(){
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_arr[] = array('input'=>$_POST['voucher_price'],'require'=>'true','validator'=>'IntegerPositive','message'=>Language::get('admin_voucher_price_error'));
 			$validate_arr[] = array('input'=>$_POST['voucher_price_describe'],'require'=>'true','message'=>Language::get('admin_voucher_price_describe_error'));
 			$validate_arr[] = array('input'=>$_POST['voucher_points'],'require'=>'true','validator'=>'IntegerPositive','message'=>Language::get('admin_voucher_price_points_error'));
@@ -151,7 +151,7 @@ class voucherControl extends SystemControl{
     	}
     	$model = Model();
     	if (chksubmit()){
-    		$obj_validate = new Validate();
+    		$obj_validate = new Validator();
 			$validate_arr[] = array('input'=>$_POST['voucher_price'],'require'=>'true','validator'=>'IntegerPositive','message'=>Language::get('admin_voucher_price_error'));
 			$validate_arr[] = array('input'=>$_POST['voucher_price_describe'],'require'=>'true','message'=>Language::get('admin_voucher_price_describe_error'));
 			$validate_arr[] = array('input'=>$_POST['voucher_points'],'require'=>'true','validator'=>'IntegerPositive','message'=>Language::get('admin_voucher_price_points_error'));

admin/control/vr_groupbuy.php

@@ -40,7 +40,7 @@ class vr_groupbuyControl extends SystemControl
     {
         if (chksubmit()) { //添加虚拟抢购分类
             // 数据验证
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $validate_array = array(
                 array('input'=>$_POST['class_name'],'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('groupbuy_class_name_is_not_null')),
                 array('input'=>$_POST['class_name'],'require'=>'true','validator'=>'Range','min'=>0,'max'=>255,'message'=>Language::get('groupbuy_class_sort_is_not_null')),
@@ -99,7 +99,7 @@ class vr_groupbuyControl extends SystemControl
     {
         if (chksubmit()) {
             // 数据验证
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $validate_array = array(
                 array('input'=>$_POST['class_name'],'require'=>'true',"validator"=>"Length","min"=>"1","max"=>"10",'message'=>Language::get('groupbuy_class_name_is_not_null')),
                 array('input'=>$_POST['class_sort'],'require'=>'true','validator'=>'Range','min'=>0,'max'=>255,'message'=>Language::get('groupbuy_class_sort_is_not_null')),
@@ -251,7 +251,7 @@ class vr_groupbuyControl extends SystemControl
     {
         if (isset($_POST) && !empty($_POST)) {
             // 数据验证
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $validate_array = array(
                 array('input'=>$_POST['area_name'],'require'=>'true','message'=>'区域名称不能为空'),
                 array('input'=>$_POST['first_letter'],'require'=>'true','message'=>'首字母不能为空'),
@@ -309,7 +309,7 @@ class vr_groupbuyControl extends SystemControl
     {
         if (isset($_POST) && !empty($_POST)) {
             //数据验证
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $validate_array = array(
                 array('input'=>$_POST['area_name'],'require'=>'true','message'=>'区域名称不能为空'),
                 array('input'=>$_POST['first_letter'],'require'=>'true','message'=>'首字母不能为空'),

circle/control/group.php

@@ -102,7 +102,7 @@ class groupControl extends BaseCircleThemeControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["apply_content"], "require"=>"true", "message"=>L('circle_apply_content_null')),
 				array("input"=>$_POST["intro"], "require"=>"true", "message"=>L('circle_introduction_not_null')),
@@ -224,7 +224,7 @@ class groupControl extends BaseCircleThemeControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["intro"], "require"=>"true", "message"=>L('circle_introduction_not_null')),
 			);

circle/control/index.php

@@ -147,7 +147,7 @@ class indexControl extends BaseCircleControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["c_name"], "require"=>"true", "message"=>L('circle_name_not_null'))
 			);

circle/control/manage.php

@@ -334,7 +334,7 @@ class manageControl extends BaseCircleManageControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["name"], "require"=>"true", "message"=>L('circle_tclass_name_not_null')),
 					array("input"=>$_POST["sort"], "require"=>"true", 'validator'=>'Number', "message"=>L('circle_sort_error')),
@@ -369,7 +369,7 @@ class manageControl extends BaseCircleManageControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["name"], "require"=>"true", "message"=>L('circle_tclass_name_not_null')),
 					array("input"=>$_POST["sort"], "require"=>"true", 'validator'=>'Number', "message"=>L('circle_sort_error')),
@@ -452,7 +452,7 @@ class manageControl extends BaseCircleManageControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["cid"], "require"=>"true", 'validator'=>'Number', "message"=>L('fcircle_please_choose')),
 					array("input"=>$_POST["sort"], "require"=>"true", 'validator'=>'Number', "message"=>L('circle_sort_error')),
@@ -527,7 +527,7 @@ class manageControl extends BaseCircleManageControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["sort"], "require"=>"true", 'validator'=>'Number', "message"=>L('circle_sort_error')),
 			);

circle/control/member_snsindex.php

@@ -21,7 +21,7 @@ class member_snsindexControl extends BaseCircleControl {
 	 * 喜欢商品(访客登录后操作)
 	 */
 	public function editlikeOp(){
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$validate_arr[] = array("input"=>$_GET["id"], "require"=>"true","message"=>Language::get('sns_likegoods_choose'));
 		$obj_validate -> validateparam = $validate_arr;
 		$error = $obj_validate->validate();

circle/control/theme.php

@@ -133,7 +133,7 @@ class themeControl extends BaseCircleThemeControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_arr[] = array("input"=>$_POST["name"], "require"=>"true","message"=>Language::get('nc_name_not_null'));
 			$validate_arr[] = array("input"=>$_POST["name"], "validator"=>'Length',"min"=>4,"max"=>30,"message"=>Language::get('nc_name_min_max_length'));
 			$validate_arr[] = array("input"=>$_POST["themecontent"], "require"=>"true","message"=>Language::get('nc_content_not_null'));
@@ -708,7 +708,7 @@ class themeControl extends BaseCircleThemeControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_arr[] = array("input"=>$_POST["name"], "require"=>"true","message"=>Language::get('nc_name_not_null'));
 			$validate_arr[] = array("input"=>$_POST["name"], "validator"=>'Length',"min"=>4,"max"=>30,"message"=>Language::get('nc_name_min_max_length'));
 			$validate_arr[] = array("input"=>$_POST["themecontent"], "require"=>"true","message"=>Language::get('nc_content_not_null'));
@@ -953,7 +953,7 @@ class themeControl extends BaseCircleThemeControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>$_POST["replycontent"], "require"=>"true", "message"=>L('circle_reply_not_null')),
 			);
@@ -1062,7 +1062,7 @@ class themeControl extends BaseCircleThemeControl{
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["replycontent"], "require"=>"true", "message"=>L('circle_reply_not_null')),
 			);

circle/control/theme_share.php

@@ -41,7 +41,7 @@ class theme_shareControl extends BaseCircleControl{
 		}
 
 		if(chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_arr[] = array("input"=>$_POST["content"], "validator"=>'Length',"min"=>0,"max"=>140,"message"=>Language::get('sharebind_content_not_null'));
 			$obj_validate -> validateparam = $validate_arr;
 			$error = $obj_validate->validate();

core/framework/function/build.php

@@ -24,7 +24,7 @@ function build(){
 		BASE_PATH.'/framework/libraries/log.php',
 		BASE_PATH.'/framework/libraries/page.php',
 		BASE_PATH.'/framework/libraries/security.php',
-		BASE_PATH.'/framework/libraries/validate.php',
+		BASE_PATH.'/framework/libraries/validator.php',
 		BASE_PATH.'/framework/libraries/upload.php',
 		BASE_PATH.'/framework/function/core.php',
 		BASE_PATH.'/framework/tpl/nc.php',

core/framework/libraries/validate.php

@@ -5,7 +5,7 @@
  * @package    
  */
 defined('InShopNC') or exit('Access Invalid!');
-Class Validate{
+Class Validator{
 	/**
 	 * 存放验证信息
 	 *

data/model/member.model.php

@@ -9,7 +9,7 @@
 
 defined('InShopNC') or exit('Access Invalid!');
 
-require_once(BASE_CORE_PATH . '/framework/libraries/validate.php');
+require_once(BASE_CORE_PATH . '/framework/libraries/validator.php');
 
 class memberModel extends Model
 {
@@ -181,7 +181,7 @@ class memberModel extends Model
     public function register($register_info)
     {
         // 注册验证
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input" => $register_info["username"], "require" => "true", "message" => '用户名不能为空'),
             array("input" => $register_info["password"], "require" => "true", "message" => '密码不能为空'),

data/model/waybill.model.php

@@ -327,7 +327,7 @@ class waybillModel extends Model{
      * @return $error
      */
     public function validWaybill($input) {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$input['waybill_name'], "require"=>"true", "message"=>'模板名称不能为空'),
             array("input"=>$input['waybill_width'], "require"=>"true", "message"=>'宽度不能为空'),

fooder.php

@@ -30,7 +30,7 @@ require_once(BASE_CORE_PATH . '/framework/libraries/model.php');
 require_once(BASE_CORE_PATH . '/framework/libraries/log.php');
 require_once(BASE_CORE_PATH . '/framework/db/mysqli.php');
 require_once(BASE_CORE_PATH . '/framework/function/goods.php');
-require_once(BASE_CORE_PATH . '/framework/libraries/validate.php');
+require_once(BASE_CORE_PATH . '/framework/libraries/validator.php');
 require_once(BASE_CORE_PATH . '/framework/libraries/resizeimage.php');
 
 require_once(BASE_ROOT_PATH . '/helper/performance_helper.php');

helper/fcgi_server.php

@@ -70,7 +70,6 @@ class fcgi_server
 
     public function run_looper()
     {
-        //载入敏感词词库
         DFAFilter::instance();
         require_once(BASE_ROOT_PATH.'/mobile/index.php');
 

helper/session_helper.php

@@ -31,8 +31,8 @@ class session_helper
         }
         $mobile = str_replace('-','',$mobile);
         $mobile = substr($mobile,-self::mobile_len);
-        $validate = new Validate();
-        $validate->setValidate(Validate::verify_mobile($mobile));
+        $validate = new Validator();
+        $validate->setValidate(Validator::verify_mobile($mobile));
         $err = $validate->validate();
         if(empty($err)) {
             return $mobile;

mobile/control/app_pay.php

@@ -28,9 +28,9 @@ class app_payControl extends mbMemberControl
     public function calc_predOp()
     {
         $pay_sn = $_GET['paysn'];
-        $validate = new Validate();
-        $validate->setValidate(Validate::verify_serialnum($pay_sn));
-        $validate->setValidate(Validate::verify_number($pay_sn));
+        $validate = new Validator();
+        $validate->setValidate(Validator::verify_serialnum($pay_sn));
+        $validate->setValidate(Validator::verify_number($pay_sn));
         $error = $validate->validate();
         if ($error != '') {
             return self::outerr(errcode::ErrParamter, $error);

mobile/control/bonusex.php

@@ -303,8 +303,8 @@ class bonusexControl extends mobileControl
         else
         {
             $mobile = $_GET['mobile'];
-            $validator = new Validate();
-            $validator->setValidate(Validate::verify_mobile($mobile));
+            $validator = new Validator();
+            $validator->setValidate(Validator::verify_mobile($mobile));
             $err = $validator->validate();
             if ($err != '') {
                 return self::outerr(errcode::ErrParamter, $err);

mobile/control/index.php

@@ -160,9 +160,9 @@ class indexControl extends specialControl
         if (empty($type) || !in_array($type, $types)) {
             return array('code' => errcode::ErrSpecial, 'msg' => '错误的参数.');
         }
-        $validator = new Validate();
+        $validator = new Validator();
         if ($type === 'special') {
-            $validator->setValidate(Validate::verify_number($data, 'special data error.'));
+            $validator->setValidate(Validator::verify_number($data, 'special data error.'));
         } elseif ($type === 'keyword') {
 
         } elseif ($type === 'goods') {

mobile/control/login.php

@@ -58,15 +58,15 @@ class loginControl extends mobileHomeControl
             $_SESSION['login_type'] = $type;
         }
 
-        $validate = new Validate();
+        $validate = new Validator();
         if ($type == self::mobile_login) {
             $openid = trim($_POST['mobile']);
             $password = trim($_POST['passwd']);
-            $validate->setValidate(Validate::verify_mobile($openid));
-            $validate->setValidate(Validate::verify_password($password));
+            $validate->setValidate(Validator::verify_mobile($openid));
+            $validate->setValidate(Validator::verify_password($password));
         } else {
             $openid = trim($_POST['openid']);
-            $validate->setValidate(Validate::verify_openid($openid));
+            $validate->setValidate(Validator::verify_openid($openid));
         }
 
         $error = $validate->validate();
@@ -139,8 +139,8 @@ class loginControl extends mobileHomeControl
         $mobile = trim($_POST['mobile']);
         $type = trim($_POST['type']);
 
-        $validator = new Validate();
-        $validator->setValidate(Validate::verify_mobile($mobile));
+        $validator = new Validator();
+        $validator->setValidate(Validator::verify_mobile($mobile));
         $err = $validator->validate();
         if ($err != '') {
             return self::outerr(errcode::ErrParamter, $err);
@@ -161,8 +161,8 @@ class loginControl extends mobileHomeControl
         $mobile = trim($_POST['mobile']);
         $type = trim($_POST['type']);
 
-        $validator = new Validate();
-        $validator->setValidate(Validate::verify_mobile($mobile));
+        $validator = new Validator();
+        $validator->setValidate(Validator::verify_mobile($mobile));
         $err = $validator->validate();
         if ($err != '') {
             return self::outerr(errcode::ErrParamter, $err);
@@ -195,10 +195,10 @@ class loginControl extends mobileHomeControl
         $password = trim($_POST['passwd']);
         $code = trim($_POST['code']);
 
-        $validator = new Validate();
-        $validator->setValidate(Validate::verify_mobile($mobile));
-        $validator->setValidate(Validate::verify_password($password));
-        $validator->setValidate(Validate::verify_smscode($code));
+        $validator = new Validator();
+        $validator->setValidate(Validator::verify_mobile($mobile));
+        $validator->setValidate(Validator::verify_password($password));
+        $validator->setValidate(Validator::verify_smscode($code));
         $err = $validator->validate();
         if ($err != '') {
             return self::outerr(errcode::ErrParamter, $err);
@@ -249,10 +249,10 @@ class loginControl extends mobileHomeControl
         $password = trim($_POST['passwd']);
         $code = trim($_POST['code']);
 
-        $validator = new Validate();
-        $validator->setValidate(Validate::verify_mobile($mobile));
-        $validator->setValidate(Validate::verify_password($password));
-        $validator->setValidate(Validate::verify_smscode($code));
+        $validator = new Validator();
+        $validator->setValidate(Validator::verify_mobile($mobile));
+        $validator->setValidate(Validator::verify_password($password));
+        $validator->setValidate(Validator::verify_smscode($code));
         $err = $validator->validate();
         if ($err != '') {
             return self::outerr(errcode::ErrParamter, $err);
@@ -290,10 +290,10 @@ class loginControl extends mobileHomeControl
         $code = trim($_GET['code']);
 
         // 输入内容判断
-        $validator = new Validate();
-        $validator->setValidate(Validate::verify_mobile($mobile));
-        $validator->setValidate(Validate::verify_openid($wx_openid));
-        $validator->setValidate(Validate::verify_smscode($code));
+        $validator = new Validator();
+        $validator->setValidate(Validator::verify_mobile($mobile));
+        $validator->setValidate(Validator::verify_openid($wx_openid));
+        $validator->setValidate(Validator::verify_smscode($code));
         $err = $validator->validate();
         if ($err != '') {
             return self::outerr(errcode::ErrInputParam,$err);
@@ -311,8 +311,8 @@ class loginControl extends mobileHomeControl
         if (empty($ret))
         {
             $passwd = $_POST['passwd'];
-            $validator = new Validate();
-            $validator->setValidate(Validate::verify_password($passwd));
+            $validator = new Validator();
+            $validator->setValidate(Validator::verify_password($passwd));
             $err = $validator->validate();
             if ($err != '') {
                 return self::outerr(errcode::ErrInputParam,$err);

mobile/control/member_address.php

@@ -141,12 +141,12 @@ class member_addressControl extends mbMemberControl
     //todo 需要和济沅确认
     private function _address_valid(&$err, &$errcode)
     {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input" => $_POST["true_name"], "require" => "true", "message" => '姓名不能为空'),
             array("input" => $_POST["area_info"], "require" => "true", "message" => '地区不能为空'),
             array("input" => $_POST["address"], "require" => "true", "message" => '地址不能为空'),
-            Validate::verify_mobile($_POST['mob_phone'])
+            Validator::verify_mobile($_POST['mob_phone'])
         );
         $err = $obj_validate->validate();
         if ($err != '') {

shop/control/buy.php

@@ -314,7 +314,7 @@ class buyControl extends BaseBuyControl {
         $model_addr = Model('address');
      	if (chksubmit()){
      		//验证表单信息
-     		$obj_validate = new Validate();
+     		$obj_validate = new Validator();
      		$obj_validate->validateparam = array(
      			array("input"=>$_POST["true_name"],"require"=>"true","message"=>Language::get('cart_step1_input_receiver')),
      			array("input"=>$_POST["area_id"],"require"=>"true","validator"=>"Number","message"=>Language::get('cart_step1_choose_area')),

shop/control/login.php

@@ -43,7 +43,7 @@ class loginControl extends BaseHomeControl
             if (process::islock('login')) {
                 showDialog($lang['nc_common_op_repeat'], SHOP_SITE_URL, '', 'error', $script);
             }
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                 array("input" => $_POST["user_name"], "require" => "true", "message" => $lang['login_index_username_isnull']),
                 array("input" => $_POST["password"], "require" => "true", "message" => $lang['login_index_password_isnull']),

shop/control/member_address.php

@@ -56,7 +56,7 @@ class member_addressControl extends BaseMemberControl{
 			/**
 			 * 验证表单信息
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["true_name"],"require"=>"true","message"=>$lang['member_address_receiver_null']),
 				array("input"=>$_POST["area_id"],"require"=>"true","validator"=>"Number","message"=>$lang['member_address_wrong_area']),

shop/control/member_connect.php

@@ -37,7 +37,7 @@ class member_connectControl extends BaseMemberControl {
 			/**
 			 * 填写密码信息验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["new_password"],		"require"=>"true","validator"=>"Length","min"=>6,"max"=>20,"message"=>Language::get('member_qqconnect_password_null')),
 				array("input"=>$_POST["confirm_password"],	"require"=>"true","validator"=>"Compare","operator"=>"==","to"=>$_POST["new_password"],"message"=>Language::get('member_qqconnect_input_two_password_again')),
@@ -84,7 +84,7 @@ class member_connectControl extends BaseMemberControl {
 			/**
 			 * 填写密码信息验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["new_password"],		"require"=>"true","validator"=>"Length","min"=>6,"max"=>20,"message"=>Language::get('member_sconnect_password_null')),
 				array("input"=>$_POST["confirm_password"],	"require"=>"true","validator"=>"Compare","operator"=>"==","to"=>$_POST["new_password"],"message"=>Language::get('member_sconnect_input_two_password_again')),

shop/control/member_flea.php

@@ -112,7 +112,7 @@ class member_fleaControl extends BaseMemberControl{
 			/**
 			 * 验证表单
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 			array("input"=>$_POST["goods_name"],"require"=>"true","message"=>$lang['store_goods_index_flea_name_null']),
 			array("input"=>$_POST["goods_price"],"require"=>"true","validator"=>"Double","message"=>$lang['store_goods_index_flea_price_null'])
@@ -287,7 +287,7 @@ class member_fleaControl extends BaseMemberControl{
 			/**
 			 * 验证表单
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 			array("input"=>$_POST["goods_name"],"require"=>"true","message"=>$lang['store_goods_index_flea_name_null']),
 			array("input"=>$_POST["goods_price"],"require"=>"true","validator"=>"Double","message"=>$lang['store_goods_index_flea_price_null'])

shop/control/member_inform.php

@@ -151,7 +151,7 @@ class member_informControl extends BaseMemberControl{
         $input['inform_handle_datetime'] = 1;
 
         //验证输入的数据
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$input["inform_content"], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"100","message"=>Language::get('inform_content_null')),
             array("input"=>$input["inform_subject_content"], "require"=>"true", "validator"=>"Length","min"=>"1","max"=>"50","message"=>Language::get('para_error')),

shop/control/member_mallconsult.php

@@ -75,7 +75,7 @@ class member_mallconsultControl extends BaseMemberControl {
         }
 
         //验证表单信息
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$_POST["type_id"],"require"=>"true","validator"=>"Number","message"=>"请选择咨询类型"),
             array("input"=>$_POST["consult_content"],"require"=>"true","message"=>"请填写咨询内容")

shop/control/member_message.php

@@ -176,7 +176,7 @@ class member_messageControl extends BaseMemberControl {
 			showDialog(Language::get('home_message_noallowsend'));
 		}
 		if (chksubmit()) {
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["to_member_name"],"require"=>"true","message"=>Language::get('home_message_receiver_null')),
 				array("input"=>$_POST["msg_content"],"require"=>"true","message"=>Language::get('home_message_content_null')),
@@ -379,7 +379,7 @@ class member_messageControl extends BaseMemberControl {
 			if ($message_id <=0){
 				showMessage(Language::get('wrong_argument'),'index.php?act=member_message&op=message','html','error');
 			}
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["msg_content"],"require"=>"true","message"=>Language::get('home_message_reply_content_null'))
 			);

shop/control/member_security.php

@@ -30,7 +30,7 @@ class member_securityControl extends BaseMemberControl {
      * 绑定邮箱 - 发送邮件
      */
     public function send_bind_emailOp() {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$_POST["email"], "require"=>"true", 'validator'=>'email',"message"=>'请正确填写邮箱')
         );
@@ -205,7 +205,7 @@ class member_securityControl extends BaseMemberControl {
 
         if(!chksubmit()) exit();
 
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$_POST["password"],		"require"=>"true",		"message"=>'请正确输入密码'),
             array("input"=>$_POST["confirm_password"],	"require"=>"true",		"validator"=>"Compare","operator"=>"==","to"=>$_POST["password"],"message"=>'两次密码输入不一致'),
@@ -234,7 +234,7 @@ class member_securityControl extends BaseMemberControl {
 
         if(!chksubmit()) exit();
 
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
                 array("input"=>$_POST["password"],		"require"=>"true",		"message"=>'请正确输入密码'),
                 array("input"=>$_POST["confirm_password"],	"require"=>"true",		"validator"=>"Compare","operator"=>"==","to"=>$_POST["password"],"message"=>'两次密码输入不一致'),
@@ -257,7 +257,7 @@ class member_securityControl extends BaseMemberControl {
         $model_member = Model('member');
         $member_info = $model_member->getMemberInfoByID($_SESSION['member_id'],'member_mobile_bind');
         if (chksubmit()) {
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                 array("input"=>$_POST["mobile"], "require"=>"true", 'validator'=>'mobile',"message"=>'请正确填写手机号'),
                 array("input"=>$_POST["vcode"], "require"=>"true", 'validator'=>'number',"message"=>'请正确填写手机验证码'),
@@ -296,7 +296,7 @@ class member_securityControl extends BaseMemberControl {
      * 修改手机号 - 发送验证码
      */
     public function send_modify_mobileOp() {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$_GET["mobile"], "require"=>"true", 'validator'=>'mobile',"message"=>'请正确填写手机号码'),
         );

shop/control/member_snsindex.php

@@ -66,7 +66,7 @@ class member_snsindexControl extends BaseMemberControl {
 	 * 添加SNS分享心情
 	 */
 	public function addtraceOp(){
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$validate_arr[] = array("input"=>$_POST["content"], "require"=>"true","message"=>Language::get('sns_sharemood_content_null'));
 		$validate_arr[] = array("input"=>$_POST["content"], "validator"=>'Length',"min"=>0,"max"=>140,"message"=>Language::get('sns_content_beyond'));
 		//发帖数超过最大次数出现验证码
@@ -125,7 +125,7 @@ class member_snsindexControl extends BaseMemberControl {
 	public function sharegoodsOp(){
 		Language::read('member_sharemanage');
 		if ($_POST['form_submit'] == 'ok'){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_arr[] = array("input"=>$_POST["choosegoodsid"], "require"=>"true","message"=>Language::get('sns_sharegoods_choose'));
 			$validate_arr[] = array("input"=>$_POST["comment"], "validator"=>'Length',"min"=>0,"max"=>140,"message"=>Language::get('sns_content_beyond'));
 			//发帖数超过最大次数出现验证码
@@ -340,7 +340,7 @@ class member_snsindexControl extends BaseMemberControl {
 	public function sharestoreOp(){
 		Language::read('member_sharemanage');
 		if ($_POST['form_submit'] == 'ok'){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$validate_arr[] = array("input"=>$_POST["choosestoreid"], "require"=>"true","message"=>Language::get('sns_sharestore_choose'));
 			$validate_arr[] = array("input"=>$_POST["comment"], "validator"=>'Length',"min"=>0,"max"=>140,"message"=>Language::get('sns_content_beyond'));
 			//发帖数超过最大次数出现验证码
@@ -713,7 +713,7 @@ class member_snsindexControl extends BaseMemberControl {
 		if($originalid <= 0){
 			showDialog(Language::get('wrong_argument'),'','error');
 		}
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$originaltype = intval($_POST['originaltype'])>0?intval($_POST['originaltype']):0;
 		$validate_arr[] = array("input"=>$_POST["commentcontent"], "require"=>"true","message"=>Language::get('sns_comment_null'));
 		$validate_arr[] = array("input"=>$_POST["commentcontent"], "validator"=>'Length',"min"=>0,"max"=>140,"message"=>Language::get('sns_content_beyond'));
@@ -845,7 +845,7 @@ class member_snsindexControl extends BaseMemberControl {
 	 * 喜欢商品(访客登录后操作)
 	 */
 	public function editlikeOp(){
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$validate_arr[] = array("input"=>$_GET["id"], "require"=>"true","message"=>Language::get('sns_likegoods_choose'));
 		$obj_validate -> validateparam = $validate_arr;
 		$error = $obj_validate->validate();
@@ -969,7 +969,7 @@ class member_snsindexControl extends BaseMemberControl {
 	 * 添加转发
 	 */
 	public function addforwardOp(){
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$originalid = intval($_POST["originalid"]);
 		$validate_arr[] = array("input"=>$originalid, "require"=>"true",'validator'=>'Compare',"operator"=>' > ','to'=>0,"message"=>Language::get('sns_forward_fail'));
 		$validate_arr[] = array("input"=>$_POST["forwardcontent"], "validator"=>'Length',"min"=>0,"max"=>140,"message"=>Language::get('sns_content_beyond'));

shop/control/predeposit.php

@@ -171,7 +171,7 @@ class predepositControl extends BaseMemberControl {
 	 */
 	public function pd_cash_addOp(){
 		if (chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$pdc_amount = abs(floatval($_POST['pdc_amount']));
 			$validate_arr[] = array("input"=>$pdc_amount, "require"=>"true",'validator'=>'Compare','operator'=>'>=',"to"=>'0.01',"message"=>Language::get('predeposit_cash_add_pricemin_error'));
 			$validate_arr[] = array("input"=>$_POST["pdc_bank_name"], "require"=>"true","message"=>Language::get('predeposit_cash_add_shoukuanbanknull_error'));

shop/control/sconnect.php

@@ -61,7 +61,7 @@ class sconnectControl extends BaseHomeControl{
 		}
 
 		//注册验证
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$obj_validate->validateparam = array(
 		array("input"=>$_POST["user_name"],		"require"=>"true",		"message"=>Language::get('login_usersave_username_isnull')),
 		array("input"=>$_POST["password"],		"require"=>"true",		"message"=>Language::get('login_usersave_password_isnull')),
@@ -135,7 +135,7 @@ class sconnectControl extends BaseHomeControl{
 		}
 
 		//登录验证
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$obj_validate->validateparam = array(
 			array("input"=>$_POST["user_name"],		"require"=>"true", "message"=>Language::get('login_index_username_isnull')),
 			array("input"=>$_POST["password"],		"require"=>"true", "message"=>Language::get('login_index_password_isnull'))

shop/control/store_brand.php

@@ -68,7 +68,7 @@ class store_brandControl extends BaseSellerControl {
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
                 array("input"=>$_POST["brand_name"], "require"=>"true", "message"=>$lang['store_goods_brand_name_null']),
 				array("input"=>$_POST["brand_initial"], "require"=>"true", "message"=>'请填写首字母')
@@ -123,7 +123,7 @@ class store_brandControl extends BaseSellerControl {
 			/**
 			 * 验证
 			 */
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
                 array("input"=>$_POST["brand_name"], "require"=>"true", "message"=>$lang['store_goods_brand_name_null']),
 				array("input"=>$_POST["brand_initial"], "require"=>"true", "message"=>'请填写首字母')

shop/control/store_complain.php

@@ -120,7 +120,7 @@ class store_complainControl extends BaseSellerControl{
         $input = array();
         $input['appeal_message'] = trim($_POST['input_appeal_message']);
         //验证输入的信息
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$input['appeal_message'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"255","message"=>Language::get('appeal_message_error')),
         );

shop/control/store_deliver_set.php

@@ -38,7 +38,7 @@ class store_deliver_setControl extends BaseSellerControl {
         $model_daddress = Model('daddress');
         if (chksubmit()) {
             //保存 新增/编辑 表单
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST["seller_name"],"require"=>"true","message"=>$lang['store_daddress_receiver_null']),
 				array("input"=>$_POST["area_id"],"require"=>"true","validator"=>"Number","message"=>$lang['store_daddress_wrong_area']),
@@ -188,7 +188,7 @@ class store_deliver_setControl extends BaseSellerControl {
 	        showDialog(Language::get('store_storeinfo_error'),'index.php?act=store_printsetup','error');
 	    }
 	    if(chksubmit()){
-	        $obj_validate = new Validate();
+	        $obj_validate = new Validator();
 	        $obj_validate->validateparam = array(
 	                array("input"=>$_POST['store_printdesc'], "require"=>"true","validator"=>"Length","min"=>1,"max"=>200,"message"=>Language::get('store_printsetup_desc_error'))
 	        );

shop/control/store_goods_add.php

@@ -148,7 +148,7 @@ class store_goods_addControl extends BaseSellerControl
     public function save_goodsOp() {
         if (chksubmit()) {
             // 验证表单
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                     array (
                             "input" => $_POST["g_name"],

shop/control/store_goods_online.php

@@ -227,7 +227,7 @@ class store_goods_onlineControl extends BaseSellerControl {
             showDialog(L('store_goods_index_goods_edit_fail'), urlShop('store_goods_online', 'index'));
         }
         // 验证表单
-        $obj_validate = new Validate ();
+        $obj_validate = new Validator ();
         $obj_validate->validateparam = array (
             array (
                 "input" => $_POST["g_name"],

shop/control/store_joinin.php

@@ -139,7 +139,7 @@ class store_joininControl extends BaseHomeControl {
     }
 
     private function step2_save_valid($param) {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$param['company_name'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>"公司名称不能为空且必须小于50个字"),
             array("input"=>$param['company_address'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>"公司地址不能为空且必须小于50个字"),
@@ -236,7 +236,7 @@ class store_joininControl extends BaseHomeControl {
     }
 
     private function step3_save_valid($param) {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$param['bank_account_name'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>"银行开户名不能为空且必须小于50个字"),
             array("input"=>$param['bank_account_number'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"20","message"=>"银行账号不能为空且必须小于20个字"),
@@ -342,7 +342,7 @@ class store_joininControl extends BaseHomeControl {
     }
 
     private function step4_save_valid($param) {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$param['store_name'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>"店铺名称不能为空且必须小于50个字"),
             array("input"=>$param['sg_id'], "require"=>"true","message"=>"店铺等级不能为空"),

shop/control/store_joinin_c2c.php

@@ -126,7 +126,7 @@ class store_joinin_c2cControl extends BaseHomeControl {
 	exit;
     }
     private function step2_save_valid($param) {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$param['company_name'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>"店铺名称不能为空且必须小于50个字"),
             array("input"=>$param['company_address'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>"所在地不能为空且必须小于50个字"),
@@ -193,7 +193,7 @@ class store_joinin_c2cControl extends BaseHomeControl {
     }
 
     private function step3_save_valid($param) {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
 
             array("input"=>$param['settlement_bank_account_name'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>"支付宝不能为空且必须小于50个字"),
@@ -288,7 +288,7 @@ class store_joinin_c2cControl extends BaseHomeControl {
     }
 
     private function step4_save_valid($param) {
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
             array("input"=>$param['store_name'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>"店铺名称不能为空且必须小于50个字"),
             array("input"=>$param['sg_id'], "require"=>"true","message"=>"店铺等级不能为空"),

shop/control/store_livegroup.php

@@ -55,7 +55,7 @@ class store_livegroupControl extends BaseSellerControl {
 	 */
 	public function groupbuy_addOp(){
 		if(chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>trim($_POST["groupbuy_name"]),"require"=>"true","message"=>'抢购名称不能为空'),
 				array("input"=>trim($_POST["start_time"]),"require"=>"true","message"=>'开始时间不能为空'),
@@ -152,7 +152,7 @@ class store_livegroupControl extends BaseSellerControl {
 	 */
 	public function edit_livegroupbuyOp(){
 		if(chksubmit()){//数据验证
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 					array("input"=>trim($_POST["groupbuy_name"]),"require"=>"true","message"=>'抢购名称不能为空'),
 					array("input"=>trim($_POST["start_time"]),"require"=>"true","message"=>'开始时间不能为空'),

shop/control/store_msg.php

@@ -247,7 +247,7 @@ class store_msgControl extends BaseSellerControl {
             showDialog(L('wrong_argument'), 'reload');
         }
 
-        $obj_validate = new Validate();
+        $obj_validate = new Validator();
         $obj_validate->validateparam = array(
                 array("input"=>$_POST["short_number"], "require"=>"false" ,"validator"=>"mobile", "message"=>'请填写正确的手机号码'),
                 array("input"=>$_POST["mail_number"], "require"=>"false" ,"validator"=>"email", "message"=>'请填写正确的邮箱'),

shop/control/store_plate.php

@@ -46,7 +46,7 @@ class store_plateControl extends BaseSellerControl {
     public function plate_addOp() {
         if (chksubmit()) {
             // 验证表单
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                     array("input" => $_POST["p_name"], "require" => "true", "message" => '请填写版式名称'),
                     array("input" => $_POST["p_content"], "require" => "true", "message" => '请填写版式内容')
@@ -91,7 +91,7 @@ class store_plateControl extends BaseSellerControl {
                 showMessage(L('wrong_argument'), '', '', 'error');
             }
             // 验证表单
-            $obj_validate = new Validate();
+            $obj_validate = new Validator();
             $obj_validate->validateparam = array(
                     array("input" => $_POST["p_name"], "require" => "true", "message" => '请填写版式名称'),
                     array("input" => $_POST["p_content"], "require" => "true", "message" => '请填写版式内容')

shop/control/store_printsetup.php

@@ -25,7 +25,7 @@ class store_printsetupControl extends BaseSellerControl {
 			showDialog(Language::get('store_storeinfo_error'),'index.php?act=store_printsetup','error');
 		}
 		if(chksubmit()){
-			$obj_validate = new Validate();
+			$obj_validate = new Validator();
 			$obj_validate->validateparam = array(
 				array("input"=>$_POST['store_printdesc'], "require"=>"true","validator"=>"Length","min"=>1,"max"=>200,"message"=>Language::get('store_printsetup_desc_error'))
 			);

shop/control/store_sns.php

@@ -119,7 +119,7 @@ class store_snsControl extends BaseSellerControl{
 		/**
 		 * 验证表单
 		 */
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$obj_validate->validateparam = array(
 				array("input"=>$_POST["content"],"require"=>"true","validator"=>"Length","max"=>140,"min"=>1,"message"=>Language::get('store_sns_center_error')),
 				array("input"=>$_POST["goods_url"],"require"=>"false","validator"=>"url","message"=>Language::get('store_goods_index_goods_price_null')),

shop/control/store_snshome.php

@@ -164,7 +164,7 @@ class store_snshomeControl extends BaseStoreSnsControl{
 		if($stid <= 0){
 			showDialog(Language::get('wrong_argument'),'','error');
 		}
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$validate_arr[] = array("input"=>$_POST["commentcontent"], "require"=>"true","message"=>Language::get('sns_comment_null'));
 		$validate_arr[] = array("input"=>$_POST["commentcontent"], "validator"=>'Length',"min"=>0,"max"=>140,"message"=>Language::get('sns_content_beyond'));
 		//评论数超过最大次数出现验证码
@@ -223,7 +223,7 @@ class store_snshomeControl extends BaseStoreSnsControl{
 		// 验证用户是否登录
 		$this->checkLoginStatus();
 
-		$obj_validate = new Validate();
+		$obj_validate = new Validator();
 		$stid = intval($_POST["stid"]);
 		$validate_arr[] = array("input"=>$_POST["forwardcontent"], "validator"=>'Length',"min"=>0,"max"=>140,"message"=>Language::get('sns_content_beyond'));
 		//发帖数超过最大次数出现验证码

shop/control/store_voucher.php

@@ -165,7 +165,7 @@ class store_voucherControl extends BaseSellerControl{
         }
         if(chksubmit()){
 	        //验证提交的内容面额不能大于限额
-	        $obj_validate = new Validate();
+	        $obj_validate = new Validator();
 	        $obj_validate->validateparam = array(
 	            array("input"=>$_POST['txt_template_title'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>Language::get('voucher_template_title_error')),
 	            array("input"=>$_POST['txt_template_total'], "require"=>"true","validator"=>"Number","message"=>Language::get('voucher_template_total_error')),
@@ -294,7 +294,7 @@ class store_voucherControl extends BaseSellerControl{
         }
         if(chksubmit()){
 	        //验证提交的内容面额不能大于限额
-	        $obj_validate = new Validate();
+	        $obj_validate = new Validator();
 	        $obj_validate->validateparam = array(
 	            array("input"=>$_POST['txt_template_title'], "require"=>"true","validator"=>"Length","min"=>"1","max"=>"50","message"=>Language::get('voucher_template_title_error')),
 	            array("input"=>$_POST['txt_template_total'], "require"=>"true","validator"=>"Number","message"=>Language::get('voucher_template_total_error')),