From bb2930cba6529c7d3418b1751116163d05f3c672 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 23 Aug 2015 06:29:42 -0400
Subject: [PATCH] update ipv4-mapping
---
interface/web/admin/lib/lang/cz_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/hr_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/hu_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/el_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/id_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/sk_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/se_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/fi_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/ja_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/fr_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/ru_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/en_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/tr_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/pl_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/de_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/es_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/ro_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/it_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/nl_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/bg_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/pt_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/br_server_ip_map.lng | 3 +
interface/web/admin/lib/lang/ar_server_ip_map.lng | 3 +
interface/web/admin/form/server_ip_map.tform.php | 4 +-
interface/web/admin/server_ip_map_edit.php | 11 ++++-
interface/web/admin/lib/module.conf.php | 2
26 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/interface/web/admin/form/server_ip_map.tform.php b/interface/web/admin/form/server_ip_map.tform.php
index d85bab3..146904a 100644
--- 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 Addresse 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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index 4e11c72..1e7ef59 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index b76eee7..94508ab 100644
--- 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["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
index 0c4671e..124656b 100644
--- 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
index c274e0b..4442287 100644
--- a/interface/web/admin/server_ip_map_edit.php
+++ b/interface/web/admin/server_ip_map_edit.php
@@ -59,7 +59,7 @@
$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 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 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']) {
--
Gitblit v1.9.1