From e2a219e2971cbbc048c34470e435df4eea752a82 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 29 Jun 2016 05:27:58 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
---
interface/web/admin/form/server_ip_map.tform.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/web/admin/form/server_ip_map.tform.php b/interface/web/admin/form/server_ip_map.tform.php
index 146904a..4f7ed3d 100644
--- a/interface/web/admin/form/server_ip_map.tform.php
+++ b/interface/web/admin/form/server_ip_map.tform.php
@@ -28,7 +28,7 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-$form["title"] = "IPv4 Addresse mapping";
+$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";
@@ -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' => '',
--
Gitblit v1.9.1