some reverse and improve

Author: fantu

interface/lib/classes/listform.inc.php

@@ -59,9 +59,6 @@ public function loadListDef($file, $module = '')
 		}
 
 		//* Set local Language File
-		$lng_file = ISPC_WEB_PATH.'/lang/lib/lang/'.$_SESSION['s']['language'].'_list.lng';
-		if(!file_exists($lng_file)) $lng_file = ISPC_WEB_PATH.'/lang/lib/lang/en_'.'_list.lng';
-		include($lng_file);
 		$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_'.$this->listDef['name'].'_list.lng';
 		if(!file_exists($lng_file)) $lng_file = 'lib/lang/en_'.$this->listDef['name'].'_list.lng';
 		include($lng_file);

interface/lib/classes/tform.inc.php

@@ -130,9 +130,6 @@ function loadFormDef($file,$module = '') {
                 $this->module = $module;
 				$wb = array();
 
-				$lng_file = ISPC_WEB_PATH.'/lang/lib/lang/'.$_SESSION['s']['language'].'_tform.lng';
-				if(!file_exists($lng_file)) $lng_file = ISPC_WEB_PATH.'/lang/lib/lang/en'.'_tform.lng';
-				include($lng_file);
                 if($module == '') {
 					$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng";
 					if(!file_exists($lng_file)) $lng_file = "lib/lang/en_".$this->formDef["name"].".lng";
@@ -641,8 +638,13 @@ function validateField($field_name, $field_value, $validators) {
 								}
 								}else{$vip=0;}
                                         if($vip==0) {
-                                                $this->errorMessage .= $field_name.": ".$this->wordbook['ipv4_validator_error_txt']."<br />\r\n";
-                                        }
+										$errmsg = $validator['errmsg'];
+                                          if(isset($this->wordbook[$errmsg])) {
+                                             $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+										  } else {
+											 $this->errorMessage .= $errmsg."<br />\r\n";
+										  }
+										}
                                 break;
                                 case 'CUSTOM':
                                         // Calls a custom class to validate this record

interface/lib/lang/en.lng

@@ -7,4 +7,13 @@ $wb['1003'] = 'The username is deactivated!';
 $wb['delete_confirmation'] = 'Do you really want to delete this record?';
 $wb['error_no_view_permission'] = 'You dont have the permission to view this record or this record does not exist!';
 $wb['error_no_delete_permission'] = 'You dont have the permission to delete this record!';
+$wb["page_txt"] = 'Page';
+$wb["page_of_txt"] = 'of';
+$wb["page_next_txt"] = 'Next';
+$wb["page_back_txt"] = 'Back';
+$wb["delete_txt"] = 'Delete';
+$wb["filter_txt"] = 'Filter';
+$wb["add_new_record_txt"] = 'Add new record';
+$wb['btn_save_txt'] = "Save";
+$wb['btn_cancel_txt'] = "Cancel";
 ?>