Merge branch 'master' into 'master'

Marius Cramer · Marius Cramer · commit eb1177f61b02 · 2015-08-23T15:48:37.000+02:00
Master

See merge request !221
diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
@@ -186,7 +186,8 @@ public function suggest_ips($type = 'IPv4'){
 		global $app;
 
 		if($type == 'IPv4'){
-			$regex = "/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/";
+//			$regex = "/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/";
+			$regex = "/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/";
 		} else {
 			// IPv6
 			$regex = "/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i";
diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
@@ -1058,11 +1058,10 @@ function validateField($field_name, $field_value, $validators) {
 				}
 				break;
 
-
-
 			case 'ISIPV4':
 				$vip=1;
-				if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+//				if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+				if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $field_value)){
 					$groups=explode(".", $field_value);
 					foreach($groups as $group){
 						if($group<0 or $group>255)
@@ -1078,6 +1077,7 @@ function validateField($field_name, $field_value, $validators) {
 					}
 				}
 				break;
+
 			case 'ISIP':
 				if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
 				if($validator['allowempty'] == 'y' && $field_value == '') {
@@ -1107,7 +1107,8 @@ function validateField($field_name, $field_value, $validators) {
 							if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
 								$ip_ok = 1;
 							}
-							if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+//							if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+							if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $field_value)){
 								$ip_ok = 1;
 							}
 							if($ip_ok == 0) {
diff --git a/interface/lib/classes/validate_database.inc.php b/interface/lib/classes/validate_database.inc.php
@@ -44,7 +44,8 @@ function valid_ip_list($field_name, $field_value, $validator) {
 				$cur_value = trim($cur_value);
 
 				$valid = true;
-				if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $cur_value)) {
+//				if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $cur_value)) {
+				if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $cur_value)) {
 					$groups = explode(".", $cur_value);
 					foreach($groups as $group){
 						if($group<0 or $group>255)
diff --git a/interface/lib/classes/validate_dns.inc.php b/interface/lib/classes/validate_dns.inc.php
@@ -315,7 +315,8 @@ function validate_xfer($field_name, $field_value, $validator) {
 					if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
 						$ip_ok = 1;
 					}
-					if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+//					if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+					if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $field_value)){
 						$ip_ok = 1;
 					}
 					if($ip_ok == 0) {
diff --git a/interface/web/admin/form/server_ip_map.tform.php b/interface/web/admin/form/server_ip_map.tform.php
@@ -28,8 +28,8 @@
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-$form["title"]    = "IP Addresse mapping";
-$form["description"]  = "";
+$form["title"]    = "IPv4 Address mapping";
+$form["description"]  = "Form to map IPv4-addresses for Web-Server";
 $form["name"]    = "server_ip_map";
 $form["action"]   = "server_ip_map_edit.php";
 $form["db_table"]  = "server_ip_map";
diff --git a/interface/web/admin/lib/lang/ar_server_ip_map.lng b/interface/web/admin/lib/lang/ar_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_ip_map.lng b/interface/web/admin/lib/lang/bg_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/br_server_ip_map.lng b/interface/web/admin/lib/lang/br_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/cz_server_ip_map.lng b/interface/web/admin/lib/lang/cz_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_ip_map.lng b/interface/web/admin/lib/lang/de_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Aktiv';
 $wb["ip_error_wrong"] = 'Die neue IP ist ungueltig';
 $wb["destination_ip_empty"] = 'Die neue IP ist leer.';
 $wb["source_ip_empty"] = 'Die eigentliche IP ist leer.';
+$wb["server_empty_error"] = 'Der Server ist leer.';
 $wb["duplicate_mapping_error"] = "Mapping existiert bereits.";
-$wb["duplicate_mapping_error"] = "Die eigentliche IP darf keine IP des Rewrite-Servers sein.";
+$wb["ip_mapping_error"] = "Die eigentliche IP darf keine IP des Rewrite-Servers sein.";
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_ip_map.lng b/interface/web/admin/lib/lang/el_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/en_server_ip_map.lng b/interface/web/admin/lib/lang/en_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_ip_map.lng b/interface/web/admin/lib/lang/es_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_ip_map.lng b/interface/web/admin/lib/lang/fi_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_ip_map.lng b/interface/web/admin/lib/lang/fr_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/hr_server_ip_map.lng b/interface/web/admin/lib/lang/hr_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_ip_map.lng b/interface/web/admin/lib/lang/hu_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_ip_map.lng b/interface/web/admin/lib/lang/id_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_ip_map.lng b/interface/web/admin/lib/lang/it_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_ip_map.lng b/interface/web/admin/lib/lang/ja_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_ip_map.lng b/interface/web/admin/lib/lang/nl_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server_ip_map.lng b/interface/web/admin/lib/lang/pl_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server_ip_map.lng b/interface/web/admin/lib/lang/pt_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_ip_map.lng b/interface/web/admin/lib/lang/ro_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_ip_map.lng b/interface/web/admin/lib/lang/ru_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_ip_map.lng b/interface/web/admin/lib/lang/se_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_ip_map.lng b/interface/web/admin/lib/lang/sk_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_ip_map.lng b/interface/web/admin/lib/lang/tr_server_ip_map.lng
@@ -6,6 +6,7 @@ $wb["active_txt"] = 'Active';
 $wb["ip_error_wrong"] = 'The Destination IP address is invalid';
 $wb["destination_ip_empty"] = 'The Destination IP is empty.';
 $wb["source_ip_empty"] = 'The Source IP is empty.';
+$wb["server_empty_error"] = 'The Server is empty.';
 $wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["duplicate_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
 ?>
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
@@ -42,7 +42,7 @@
 	'link' => 'admin/server_ip_list.php',
 	'html_id'   => 'server_ip_list');
 
-$items[] = array(   'title'  => 'Server IP mapping',
+$items[] = array(   'title'  => 'Server IPv4 mapping',
 	'target'  => 'content',
 	'link' => 'admin/server_ip_map_list.php',
 	'html_id'   => 'server_ip_map_list');
diff --git a/interface/web/admin/server_ip_map_edit.php b/interface/web/admin/server_ip_map_edit.php
@@ -59,7 +59,7 @@ function onShowEnd() {
 		$app->tpl->setVar('server_id', $server_select);
 
 		// ip-list
-		$sql = "SELECT server_ip.server_ip_id, server_ip.ip_address AS ip_address, server.server_name, CONCAT(server_ip.ip_address,' :: [', server.server_name, ']') AS source FROM server_ip, server WHERE (server_ip.server_id = server.server_id AND server.web_server =1 AND mirror_server_id = 0 AND virtualhost = 'y')";
+		$sql = "SELECT server_ip.server_ip_id, server_ip.ip_address AS ip_address, server.server_name, CONCAT(server_ip.ip_address,' :: [', server.server_name, ']') AS source FROM server_ip, server WHERE (server_ip.server_id = server.server_id AND server.web_server =1 AND mirror_server_id = 0 AND virtualhost = 'y' AND IP_TYPE = 'IPv4')";
 		$ips = $app->db->queryAllRecords($sql);
 		$ip_select = "<option value=''></option>";
 		if(is_array($ips)) {
@@ -77,9 +77,11 @@ function onShowEnd() {
 	function onBeforeInsert() {
 		global $app;
 
+		if($this->dataRecord['server_id']=='') $app->tform->errorMessage .= $app->tform->wordbook['server_empty_error'];
+
 		$sql = "SELECT * FROM server_ip WHERE server_id = ? and ip_address = ?";
 		$ip_check=$app->db->queryOneRecord($sql, $this->dataRecord['server_id'], $this->dataRecord['source_ip']);
-		if (is_array($ip_check)) $app->tform->errorMessage .= $app->tform->wordbook['duplicate_mapping_error'];
+		if (is_array($ip_check)) $app->tform->errorMessage .= $app->tform->wordbook['ip_mapping_error'];
 
 		$sql = 'SELECT count(*) as no FROM server_ip_map WHERE server_id = ? AND source_ip = ? AND destination_ip = ?';
 		$check = $app->db->queryOneRecord($sql, $this->dataRecord['server_id'], $this->dataRecord['source_ip'], $this->dataRecord['destination_ip']);
@@ -88,9 +90,12 @@ function onBeforeInsert() {
 
 	function onBeforeUpdate() {
 		global $app;
+
+		if($this->dataRecord['server_id']=='') $app->tform->errorMessage .= $app->tform->wordbook['server_empty_error'];
+
 		$sql = "SELECT * FROM server_ip WHERE server_id = ? and ip_address = ?";
 		$ip_check=$app->db->queryOneRecord($sql, $this->dataRecord['server_id'], $this->dataRecord['source_ip']);
-		if (is_array($ip_check)) $app->tform->errorMessage .= $app->tform->wordbook['duplicate_mapping_error'];
+		if (is_array($ip_check)) $app->tform->errorMessage .= $app->tform->wordbook['ip_mapping_error'];
 
 		$this->oldDataRecord = $app->tform->getDataRecord($this->id);
 		if ($this->dataRecord['source_ip'] != $this->oldDataRecord['source_ip'] || $this->dataRecord['destination_ip'] != $this->oldDataRecord['destination_ip']) {
diff --git a/server/lib/classes/functions.inc.php b/server/lib/classes/functions.inc.php
@@ -230,7 +230,8 @@ public function suggest_ips($type = 'IPv4'){
 		global $app;
 
 		if($type == 'IPv4'){
-			$regex = "/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/";
+//			$regex = "/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/";
+			$regex = "/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/";
 		} else {
 			// IPv6
 			$regex = "/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i";
diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -101,7 +101,8 @@ function process_host_list($action, $database_name, $database_user, $database_pa
 			$valid = true;
 			if($db_host == '%' || $db_host == 'localhost') {
 				$valid = true;
-			} elseif(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $db_host)) {
+//			} elseif(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $db_host)) {
+			} elseif(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $db_host)) {
 				$groups = explode('.', $db_host);
 				foreach($groups as $group){
 					if($group<0 or $group>255)

Original file line number	Diff line number	Diff line change
`@@ -1058,11 +1058,10 @@ function validateField($field_name, $field_value, $validators) {`
`1058`	`1058`	`}`
`1059`	`1059`	`break;`
`1060`	`1060`
`1061`		`-`
`1062`		`-`
`1063`	`1061`	`case 'ISIPV4':`
`1064`	`1062`	`$vip=1;`
`1065`		`- if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){`
	`1063`	`+// if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){`
	`1064`	`+ if(preg_match("/^((25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\\.){3}(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)$/", $field_value)){`
`1066`	`1065`	`$groups=explode(".", $field_value);`
`1067`	`1066`	`foreach($groups as $group){`
`1068`	`1067`	`if($group<0 or $group>255)`
`@@ -1078,6 +1077,7 @@ function validateField($field_name, $field_value, $validators) {`
`1078`	`1077`	`}`
`1079`	`1078`	`}`
`1080`	`1079`	`break;`
	`1080`	`+`
`1081`	`1081`	`case 'ISIP':`
`1082`	`1082`	`if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';`
`1083`	`1083`	`if($validator['allowempty'] == 'y' && $field_value == '') {`
`@@ -1107,7 +1107,8 @@ function validateField($field_name, $field_value, $validators) {`
`1107`	`1107`	`if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}\|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:\|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){`
`1108`	`1108`	`$ip_ok = 1;`
`1109`	`1109`	`}`
`1110`		`- if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){`
	`1110`	`+// if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){`
	`1111`	`+ if(preg_match("/^((25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\\.){3}(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)$/", $field_value)){`
`1111`	`1112`	`$ip_ok = 1;`
`1112`	`1113`	`}`
`1113`	`1114`	`if($ip_ok == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,8 @@ function validate_xfer($field_name, $field_value, $validator) {`
`315`	`315`	`if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}\|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:\|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){`
`316`	`316`	`$ip_ok = 1;`
`317`	`317`	`}`
`318`		`- if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){`
	`318`	`+// if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){`
	`319`	`+ if(preg_match("/^((25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\\.){3}(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)$/", $field_value)){`
`319`	`320`	`$ip_ok = 1;`
`320`	`321`	`}`
`321`	`322`	`if($ip_ok == 0) {`