From 959c3430b3ff47ba6d4c0ec89b713beda1e9c812 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 17 Jan 2013 09:34:23 -0500
Subject: [PATCH] Disabled the IPv6 prefix functions in 3.0.5. They will get introduced in 3.0.6.
---
interface/lib/classes/tform.inc.php | 4 +++-
interface/web/admin/lib/lang/en_server_config.lng | 3 ---
install/tpl/server.ini.master | 1 -
interface/web/admin/form/server_config.tform.php | 8 ++++----
interface/web/admin/templates/server_config_server_edit.htm | 5 +++--
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 520c722..590a80e 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -8,7 +8,6 @@
auto_network_configuration=n
ip_address=0.0.0.0
netmask=255.255.255.0
-v6_prefix=
gateway=0.0.0.0
hostname=server1.domain.tld
nameservers=8.8.8.8,8.8.4.4
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index bd28db4..7580ead 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -887,6 +887,7 @@
}
}
break;
+ /*
case 'ISV6PREFIX':
$v6_prefix_ok = 0;
$explode_field_value = explode(':',$field_value);
@@ -917,7 +918,8 @@
if($v6_prefix_ok <> 1){
$this->errorMessage .= $errmsg."<br />\r\n";
}
- break;
+ 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)){
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index c4f18c9..8a466ac 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -85,7 +85,8 @@
'value' => '',
'width' => '15',
'maxlength' => '255'
- ),
+ ),
+ /*
'v6_prefix' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -93,7 +94,8 @@
'errmsg' => 'v6_prefix_wrong'),
),
'default' => ''
- ),
+ ),
+ */
'gateway' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -420,8 +422,6 @@
'default' => 'n',
'value' => array(0 => 'n',1 => 'y')
),
-
-
*/
'vhost_conf_dir' => array(
'datatype' => 'VARCHAR',
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index dbaf39e..75b22d6 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -170,7 +170,4 @@
$wb["web_folder_protection_txt"] = 'Make web folders immutable (extended attributes)';
$wb["overtraffic_notify_admin_txt"] = 'Send overtraffic notification to admin';
$wb["overtraffic_notify_client_txt"] = 'Send overtraffic notification to client';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_wrong"] = 'Invalid v6 Netmask format.';
?>
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 40c4051..6616f9f 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -19,10 +19,11 @@
<label for="netmask">{tmpl_var name='netmask_txt'}</label>
<input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
</div>
- <div class="ctrlHolder">
+ <!--<div class="ctrlHolder">
<label for="v6_prefix">{tmpl_var name='v6_prefix_txt'}</label>
<input name="v6_prefix" id="v6_prefix" value="{tmpl_var name='v6_prefix'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
- </div>
+ </div>
+ -->
<div class="ctrlHolder">
<label for="gateway">{tmpl_var name='gateway_txt'}</label>
<input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
--
Gitblit v1.9.1