Merge branch 'master' into 'stable-3.1'

Master



See merge request !287

Author: Marius Burkard

interface/lib/classes/validate_server.inc.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ Copyright (c) 2016, Florian Schaal, schaal @it
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ @author Florian Schaal, info@schaal-24.de
+*/
+
+
+class validate_server {
+
+	function get_error($errmsg) {
+		global $app;
+		if(isset($app->tform->wordbook[$errmsg])) {
+			return $app->tform->wordbook[$errmsg]."<br>\r\n";
+		} else {
+			 return $errmsg."<br>\r\n";
+		}
+	}
+
+	/**
+	 * Validator function for server-ip
+	*/
+	function check_server_ip($field_name, $field_value, $validator) {
+		if($_POST['ip_type'] == 'IPv4') {
+			if(!filter_var($field_value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+				return $this->get_error($validator['errmsg']);
+			}
+		} elseif ($_POST['ip_type'] == 'IPv6') {
+			if(!filter_var($field_value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+				return $this->get_error($validator['errmsg']);
+			}
+		} else return $this->get_error($validator['errmsg']);
+	}
+
+}
+

interface/web/admin/form/server_ip.tform.php

@@ -121,7 +121,7 @@
 		'ip_address' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
-			'validators' => array (  0 => array ( 'type' => 'ISIP',
+			'validators' => array (  0 => array ( 'type' => 'CUSTOME', 'class' => 'validate_server', 'function' => 'check_server_ip',
 					'errmsg'=> 'ip_error_wrong'),
 				1 => array ( 'type' => 'UNIQUE',
 					'errmsg'=> 'ip_error_unique'),

interface/web/admin/form/server_ip_map.tform.php

@@ -69,7 +69,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
 			'validators' => array (  
-				0 => array ( 'type' => 'ISIP', 'errmsg'=> 'ip_error_wrong'),
+				0 => array ( 'type' => 'ISIPV4', 'errmsg'=> 'ip_error_wrong'),
 				1 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'destination_ip_empty'),
             ),
 			'default' => '',

server/plugins-available/network_settings_plugin.inc.php

@@ -110,7 +110,7 @@ function update($event_name, $data) {
 						/*
 						 * don't insert the main-ip again!
 						 */
-						if ($rec['ip_address'] != $server_config['ip_address'])
+						if ($rec['ip_address'] != $server_config['ip_address'] && filter_var($rec['ip_address'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
 						{
 							$ip_records[$n] = array(
 								'id' => $n,
@@ -188,7 +188,7 @@ function update($event_name, $data) {
 						/*
 						 * don't insert the main-ip again!
 						 */
-						if ($rec['ip_address'] != $server_config['ip_address'])
+						if ($rec['ip_address'] != $server_config['ip_address'] && filter_var($rec['ip_address'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
 						{
 							$ip_records[$n] = array(
 								'id' => $n,