From 43824ba30fc122ca5f1d196ef72006e285c7abab Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Mon, 13 Jun 2011 09:19:49 -0400
Subject: [PATCH] Validate DNS notify host. Customers were putting email addresses in there. Testing for IP addresses.

---
 interface/web/dns/lib/lang/en_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/ja_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/pt_dns_soa.lng |    1 +
 interface/web/dns/form/dns_soa.tform.php  |    4 ++++
 interface/web/dns/lib/lang/ru_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/el_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/cz_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/it_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/fr_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/hu_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/id_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/bg_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/se_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/pl_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/nl_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/ro_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/br_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/es_dns_soa.lng |    3 +++
 interface/web/dns/lib/lang/fi_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/sk_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/ar_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/tr_dns_soa.lng |    1 +
 interface/web/dns/lib/lang/de_dns_soa.lng |    1 +
 23 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php
index 9599f4c..fb5b04a 100644
--- a/interface/web/dns/form/dns_soa.tform.php
+++ b/interface/web/dns/form/dns_soa.tform.php
@@ -175,6 +175,10 @@
 		'also_notify' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
+			'validators'    => array (  0 => array (    'type'  => 'ISIPV4',
+														'errmsg'=> 'also_notify_error_regex'
+													),
+									),
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
diff --git a/interface/web/dns/lib/lang/ar_dns_soa.lng b/interface/web/dns/lib/lang/ar_dns_soa.lng
index e63ffb7..4edef4e 100644
--- a/interface/web/dns/lib/lang/ar_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ar_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Email is empty.';
 $wb['mbox_error_regex'] = 'Email format invalid.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/bg_dns_soa.lng b/interface/web/dns/lib/lang/bg_dns_soa.lng
index e63ffb7..4edef4e 100644
--- a/interface/web/dns/lib/lang/bg_dns_soa.lng
+++ b/interface/web/dns/lib/lang/bg_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Email is empty.';
 $wb['mbox_error_regex'] = 'Email format invalid.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_soa.lng b/interface/web/dns/lib/lang/br_dns_soa.lng
index abc5ab5..a0d2bb5 100644
--- a/interface/web/dns/lib/lang/br_dns_soa.lng
+++ b/interface/web/dns/lib/lang/br_dns_soa.lng
@@ -22,6 +22,7 @@
 $wb['mbox_error_empty'] = 'Correio está em branco.';
 $wb['mbox_error_regex'] = 'Correio com formato inválido.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Atualizar ACL';
 $wb['seconds_txt'] = 'Segundos';
 $wb['eg_domain_tld'] = 'e.x. dominio.ext';
diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng
index d601933..0accdef 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa.lng
@@ -22,6 +22,7 @@
 $wb['mbox_error_empty'] = 'Email je prázdný.';
 $wb['mbox_error_regex'] = 'Email má chybný formát.';
 $wb['also_notify_txt'] = 'Také upozornit';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Aktualizovat ACL';
 $wb['seconds_txt'] = 'vteřin';
 $wb['eg_domain_tld'] = 'např. domena.cz';
diff --git a/interface/web/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng
index d619a3c..f075161 100644
--- a/interface/web/dns/lib/lang/de_dns_soa.lng
+++ b/interface/web/dns/lib/lang/de_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Email ist leer.';
 $wb['mbox_error_regex'] = 'Email Format ungültig.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng
index e6b5925..aedeccc 100644
--- a/interface/web/dns/lib/lang/el_dns_soa.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Το Email δεν έχει οριστεί.';
 $wb['mbox_error_regex'] = 'Email με μη έγκυρη μορφοποίηση.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/en_dns_soa.lng b/interface/web/dns/lib/lang/en_dns_soa.lng
index 5211f2f..5d45f34 100644
--- a/interface/web/dns/lib/lang/en_dns_soa.lng
+++ b/interface/web/dns/lib/lang/en_dns_soa.lng
@@ -22,6 +22,7 @@
 $wb["mbox_error_empty"] = 'Email is empty.';
 $wb["mbox_error_regex"] = 'Email format invalid.';
 $wb["also_notify_txt"] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb["update_acl_txt"] = 'Update ACL';
 $wb['seconds_txt'] = 'Seconds';
 $wb['eg_domain_tld'] = 'e.g. domain.tld';
diff --git a/interface/web/dns/lib/lang/es_dns_soa.lng b/interface/web/dns/lib/lang/es_dns_soa.lng
index 8db9739..9d7dd6a 100644
--- a/interface/web/dns/lib/lang/es_dns_soa.lng
+++ b/interface/web/dns/lib/lang/es_dns_soa.lng
@@ -22,5 +22,8 @@
 $wb['mbox_error_empty'] = 'Correo vacío.';
 $wb['mbox_error_regex'] = 'Formato de correo no válido.';
 $wb['also_notify_txt'] = 'Notificar también a';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Actualizar ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/fi_dns_soa.lng b/interface/web/dns/lib/lang/fi_dns_soa.lng
index f8d1765..f3401b1 100755
--- a/interface/web/dns/lib/lang/fi_dns_soa.lng
+++ b/interface/web/dns/lib/lang/fi_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Sähköpostiosoite on tyhjä.';
 $wb['mbox_error_regex'] = 'Sähköpostiosoite on vääränlainen';
 $wb['also_notify_txt'] = 'Läheta ilmoitus';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Päivitä ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_soa.lng b/interface/web/dns/lib/lang/fr_dns_soa.lng
index fb4d1d7..3fc7da5 100644
--- a/interface/web/dns/lib/lang/fr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/fr_dns_soa.lng
@@ -22,6 +22,7 @@
 $wb['mbox_error_regex'] = "L'adresse e-mail est dun format invalide.";
 $wb['limit_dns_zone_txt'] = "Le nombre maximal de zones DNS pour votre compte est atteint.";
 $wb['also_notify_txt'] = "Notifier également";
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = "Mettre à jour ACL";
 ?>
 
diff --git a/interface/web/dns/lib/lang/hu_dns_soa.lng b/interface/web/dns/lib/lang/hu_dns_soa.lng
index bf65226..de75bc6 100644
--- a/interface/web/dns/lib/lang/hu_dns_soa.lng
+++ b/interface/web/dns/lib/lang/hu_dns_soa.lng
@@ -22,6 +22,7 @@
 $wb['mbox_error_empty'] = 'Email is empty.';
 $wb['mbox_error_regex'] = 'Email format invalid.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 $wb['seconds_txt'] = 'Seconds';
 $wb['eg_domain_tld'] = 'e.g. domain.tld';
diff --git a/interface/web/dns/lib/lang/id_dns_soa.lng b/interface/web/dns/lib/lang/id_dns_soa.lng
index 210df1c..b28719e 100644
--- a/interface/web/dns/lib/lang/id_dns_soa.lng
+++ b/interface/web/dns/lib/lang/id_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Email kosong.';
 $wb['mbox_error_regex'] = 'Format Email tidak valid.';
 $wb['also_notify_txt'] = 'Notifikasi Juga';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Mutakhirkan ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_soa.lng b/interface/web/dns/lib/lang/it_dns_soa.lng
index e63ffb7..4edef4e 100644
--- a/interface/web/dns/lib/lang/it_dns_soa.lng
+++ b/interface/web/dns/lib/lang/it_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Email is empty.';
 $wb['mbox_error_regex'] = 'Email format invalid.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/ja_dns_soa.lng b/interface/web/dns/lib/lang/ja_dns_soa.lng
index d00e8af..84ede70 100644
--- a/interface/web/dns/lib/lang/ja_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ja_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'メールアドレスを指定してください';
 $wb['mbox_error_regex'] = 'メールアドレスの形式が不正です。';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/nl_dns_soa.lng b/interface/web/dns/lib/lang/nl_dns_soa.lng
index 5278940..bab77f9 100644
--- a/interface/web/dns/lib/lang/nl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/nl_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'E-mail is niet ingvuld.';
 $wb['mbox_error_regex'] = 'E-mail formaat ongeldig.';
 $wb['also_notify_txt'] = 'ook notifcatie';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng
index a9756a8..9f9054a 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'E-mail jest pusty.';
 $wb['mbox_error_regex'] = 'E-mail ma niepoprawny format.';
 $wb['also_notify_txt'] = 'Także powiadom';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Zaktualizuj ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/pt_dns_soa.lng b/interface/web/dns/lib/lang/pt_dns_soa.lng
index 17a797a..8ff40fa 100644
--- a/interface/web/dns/lib/lang/pt_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pt_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Correio está em branco.';
 $wb['mbox_error_regex'] = 'Correio com formato inválido.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Actualizar ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/ro_dns_soa.lng b/interface/web/dns/lib/lang/ro_dns_soa.lng
index a70d730..e73e4bc 100644
--- a/interface/web/dns/lib/lang/ro_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ro_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Email-ul este gol';
 $wb['mbox_error_regex'] = 'Format email invalid.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_soa.lng b/interface/web/dns/lib/lang/ru_dns_soa.lng
index 7723d71..d953854 100644
--- a/interface/web/dns/lib/lang/ru_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ru_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Email пуст.';
 $wb['mbox_error_regex'] = 'Email имеет неправильный формат.';
 $wb['also_notify_txt'] = 'Известить';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Обновить ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/se_dns_soa.lng b/interface/web/dns/lib/lang/se_dns_soa.lng
index e63ffb7..4edef4e 100644
--- a/interface/web/dns/lib/lang/se_dns_soa.lng
+++ b/interface/web/dns/lib/lang/se_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Email is empty.';
 $wb['mbox_error_regex'] = 'Email format invalid.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/sk_dns_soa.lng b/interface/web/dns/lib/lang/sk_dns_soa.lng
index 18189e5..0f8ddec 100644
--- a/interface/web/dns/lib/lang/sk_dns_soa.lng
+++ b/interface/web/dns/lib/lang/sk_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Email je prázdny.';
 $wb['mbox_error_regex'] = 'Email má neplatný formát.';
 $wb['also_notify_txt'] = 'Also Notify';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'Update ACL';
 ?>
diff --git a/interface/web/dns/lib/lang/tr_dns_soa.lng b/interface/web/dns/lib/lang/tr_dns_soa.lng
index 8c93cd3..2915567 100644
--- a/interface/web/dns/lib/lang/tr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/tr_dns_soa.lng
@@ -22,5 +22,6 @@
 $wb['mbox_error_empty'] = 'Email boş.';
 $wb['mbox_error_regex'] = 'Email geçersiz formatta.';
 $wb['also_notify_txt'] = 'Ayrıca Bildir';
+$wb['also_notify_error_regex'] = 'Please use an IP address.';
 $wb['update_acl_txt'] = 'ACL Güncelle';
 ?>

--
Gitblit v1.9.1