From 4d4f2264f72fc34444b4487e9ae592bcd4cd07c0 Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Mon, 22 Dec 2008 08:28:59 -0500
Subject: [PATCH] some reverse and improve

---
 /dev/null                              |    4 ----
 interface/lib/classes/tform.inc.php    |   12 +++++++-----
 interface/lib/lang/en.lng              |    9 +++++++++
 interface/lib/classes/listform.inc.php |    3 ---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index a57fab5..a3946eb 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -59,9 +59,6 @@
 		}
 		
 		//* 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);
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index ca8ac3f..2ea9c0c 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -130,9 +130,6 @@
                 $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 @@
 								}
 								}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
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index 724ac0d..b5732c5 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -7,4 +7,13 @@
 $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";
 ?>
diff --git a/interface/web/lang/lib/lang/bg_list.lng b/interface/web/lang/lib/lang/bg_list.lng
deleted file mode 100644
index 77ece3b..0000000
--- a/interface/web/lang/lib/lang/bg_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$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';
-?>
diff --git a/interface/web/lang/lib/lang/bg_tform.lng b/interface/web/lang/lib/lang/bg_tform.lng
deleted file mode 100644
index 6851d8b..0000000
--- a/interface/web/lang/lib/lang/bg_tform.lng
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/lang/lib/lang/de_list.lng b/interface/web/lang/lib/lang/de_list.lng
deleted file mode 100644
index 77ece3b..0000000
--- a/interface/web/lang/lib/lang/de_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$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';
-?>
diff --git a/interface/web/lang/lib/lang/de_tform.lng b/interface/web/lang/lib/lang/de_tform.lng
deleted file mode 100644
index 6851d8b..0000000
--- a/interface/web/lang/lib/lang/de_tform.lng
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/lang/lib/lang/en_list.lng b/interface/web/lang/lib/lang/en_list.lng
deleted file mode 100644
index 30814d0..0000000
--- a/interface/web/lang/lib/lang/en_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$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';
-?>
diff --git a/interface/web/lang/lib/lang/en_tform.lng b/interface/web/lang/lib/lang/en_tform.lng
deleted file mode 100644
index 1137d2f..0000000
--- a/interface/web/lang/lib/lang/en_tform.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['btn_save_txt'] = "Save";
-$wb['btn_cancel_txt'] = "Cancel";
-$wb['ipv4_validator_error_txt'] = "Is not valid IP address";
-?>
diff --git a/interface/web/lang/lib/lang/es_list.lng b/interface/web/lang/lib/lang/es_list.lng
deleted file mode 100644
index 77ece3b..0000000
--- a/interface/web/lang/lib/lang/es_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$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';
-?>
diff --git a/interface/web/lang/lib/lang/es_tform.lng b/interface/web/lang/lib/lang/es_tform.lng
deleted file mode 100644
index 6851d8b..0000000
--- a/interface/web/lang/lib/lang/es_tform.lng
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/lang/lib/lang/fr_list.lng b/interface/web/lang/lib/lang/fr_list.lng
deleted file mode 100644
index 77ece3b..0000000
--- a/interface/web/lang/lib/lang/fr_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$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';
-?>
diff --git a/interface/web/lang/lib/lang/fr_tform.lng b/interface/web/lang/lib/lang/fr_tform.lng
deleted file mode 100644
index 6851d8b..0000000
--- a/interface/web/lang/lib/lang/fr_tform.lng
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/lang/lib/lang/it_list.lng b/interface/web/lang/lib/lang/it_list.lng
deleted file mode 100644
index 85ca2dd..0000000
--- a/interface/web/lang/lib/lang/it_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['page_txt'] = 'Pagina';
-$wb['page_of_txt'] = 'di';
-$wb['page_next_txt'] = 'Successiva';
-$wb['page_back_txt'] = 'Precedente';
-$wb['delete_txt'] = 'Cancella';
-$wb['filter_txt'] = 'Filtra';
-$wb['add_new_record_txt'] = 'Aggiungi nuovo record';
-?>
diff --git a/interface/web/lang/lib/lang/it_tform.lng b/interface/web/lang/lib/lang/it_tform.lng
deleted file mode 100644
index 7daf105..0000000
--- a/interface/web/lang/lib/lang/it_tform.lng
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$wb['btn_save_txt'] = 'Salva';
-$wb['btn_cancel_txt'] = 'Annulla';
-?>
diff --git a/interface/web/lang/lib/lang/nl_list.lng b/interface/web/lang/lib/lang/nl_list.lng
deleted file mode 100644
index 77ece3b..0000000
--- a/interface/web/lang/lib/lang/nl_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$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';
-?>
diff --git a/interface/web/lang/lib/lang/nl_tform.lng b/interface/web/lang/lib/lang/nl_tform.lng
deleted file mode 100644
index 6851d8b..0000000
--- a/interface/web/lang/lib/lang/nl_tform.lng
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/lang/lib/lang/ru_list.lng b/interface/web/lang/lib/lang/ru_list.lng
deleted file mode 100644
index 77ece3b..0000000
--- a/interface/web/lang/lib/lang/ru_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$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';
-?>
diff --git a/interface/web/lang/lib/lang/ru_tform.lng b/interface/web/lang/lib/lang/ru_tform.lng
deleted file mode 100644
index 6851d8b..0000000
--- a/interface/web/lang/lib/lang/ru_tform.lng
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/lang/lib/lang/se_list.lng b/interface/web/lang/lib/lang/se_list.lng
deleted file mode 100644
index 77ece3b..0000000
--- a/interface/web/lang/lib/lang/se_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$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';
-?>
diff --git a/interface/web/lang/lib/lang/se_tform.lng b/interface/web/lang/lib/lang/se_tform.lng
deleted file mode 100644
index 6851d8b..0000000
--- a/interface/web/lang/lib/lang/se_tform.lng
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>

--
Gitblit v1.9.1