From 3e5549bfad51314c7542331c6e3b51cf09243cb0 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Tue, 29 Jul 2008 23:18:40 +0000
Subject: [PATCH] functions.inc.php: - move DNS checks from check_email() to
 check_domain() - add clear error message on non-resolvable domains (using
 flash_error() -   this is probably not the best solution, but better than
 nothing) - made error messages translatable

create-domain.php:
- avoid duplicated call to check_domain (to avoid duplicated error message)
- domains are now DNS-checked on creation - see the changes in check_domain()
  in functions.inc.php

languages/*:
- added error messages for the above changes


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@429 a1433add-5e2c-0410-b055-b7f2511e0802
---
 create-domain.php    |  2 +-
 functions.inc.php    | 82 ++++++++++++++++++++++----------------------
 languages/bg.lang    |  3 ++
 languages/ca.lang    |  3 ++
 languages/cn.lang    |  3 ++
 languages/cs.lang    |  3 ++
 languages/da.lang    |  3 ++
 languages/de.lang    |  3 ++
 languages/en.lang    |  3 ++
 languages/es.lang    |  3 ++
 languages/et.lang    |  3 ++
 languages/eu.lang    |  3 ++
 languages/fi.lang    |  3 ++
 languages/fo.lang    |  3 ++
 languages/fr.lang    |  3 ++
 languages/hr.lang    |  3 ++
 languages/hu.lang    |  3 ++
 languages/is.lang    |  3 ++
 languages/it.lang    |  3 ++
 languages/ja.lang    |  3 ++
 languages/lt.lang    |  3 ++
 languages/mk.lang    |  3 ++
 languages/nb.lang    |  3 ++
 languages/nl.lang    |  3 ++
 languages/nn.lang    |  3 ++
 languages/pl.lang    |  3 ++
 languages/pt-br.lang |  3 ++
 languages/ru.lang    |  3 ++
 languages/sk.lang    |  3 ++
 languages/sl.lang    |  3 ++
 languages/sv.lang    |  3 ++
 languages/tr.lang    |  3 ++
 languages/tw.lang    |  3 ++
 33 files changed, 135 insertions(+), 42 deletions(-)

diff --git a/create-domain.php b/create-domain.php
index 2035b7cb..425f195b 100644
--- a/create-domain.php
+++ b/create-domain.php
@@ -76,8 +76,8 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
       if (isset ($_POST['fTransport'])) $tTransport = escape_string ($_POST['fTransport']);
       if (isset ($_POST['fDefaultaliases'])) $tDefaultaliases = escape_string ($_POST['fDefaultaliases']);
       if (isset ($_POST['fBackupmx'])) $tBackupmx = escape_string ($_POST['fBackupmx']);
+      /* if (empty ($fDomain) or !check_domain ($fDomain)) */ $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2'];
       if (domain_exist ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error'];
-      if (empty ($fDomain) or !check_domain ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2'];
    }
 
    if ($error != 1)
diff --git a/functions.inc.php b/functions.inc.php
index d214e265..26c8e16e 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -227,14 +227,37 @@ function check_string ($var)
 // TODO: make check_domain able to handle as example .local domains
 function check_domain ($domain)
 {
-   if (preg_match ('/([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($domain)))
-   {
-      return true;
-   }
-   else
+   global $CONF;
+   global $PALANG;
+
+   if (!preg_match ('/([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($domain)))
    {
+      flash_error(sprintf($PALANG['pInvalidDomainRegex'], htmlentities($domain)));
       return false;
    }
+
+   if (isset($CONF['emailcheck_resolve_domain']) && 'YES' == $CONF['emailcheck_resolve_domain'] && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7)))) 
+   {
+
+      // Look for an AAAA, A, or MX record for the domain
+
+      if(function_exists('checkdnsrr')) {
+         // AAAA (IPv6) is only available in PHP v. >= 5
+         if (version_compare(phpversion(), "5.0.0", ">="))
+         {
+            if (checkdnsrr($domain,'AAAA')) return true;
+         }
+         if (checkdnsrr($domain,'A')) return true;
+         if (checkdnsrr($domain,'MX')) return true;
+         flash_error(sprintf($PALANG['pInvalidDomainDNS'], htmlentities($domain)));
+         return false;
+      }
+      else {
+         flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!");
+      }
+   }
+
+   return true;
 }
 
 
@@ -260,47 +283,24 @@ function check_email ($email)
       $ce_email = preg_replace("/#/", '@', $ce_email);
    }
 
-   if (isset($CONF['emailcheck_resolve_domain']) && 'YES' == $CONF['emailcheck_resolve_domain'] && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7)))) 
+   // Perform non-domain-part sanity checks
+   if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', trim ($ce_email)))
    {
-
-      // Perform non-domain-part sanity checks
-      if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', trim ($ce_email)))
-      {
-         return false;
-      }
-
-      // Determine domain name
-      $matches=array();
-      if (!preg_match('|@(.+)$|',$ce_email,$matches))
-      {
-         return false;
-      }
-      $domain=$matches[1];
-
-      // Look for an AAAA, A, or MX record for the domain
-
-      if(function_exists('checkdnsrr')) {
-         // AAAA (IPv6) is only available in PHP v. >= 5
-         if (version_compare(phpversion(), "5.0.0", ">="))
-         {
-            if (checkdnsrr($domain,'AAAA')) return true;
-         }
-         if (checkdnsrr($domain,'A')) return true;
-         if (checkdnsrr($domain,'MX')) return true;
-         flash_error("Invalid domain, and/or not discoverable in DNS");
-         return false;
-      }
-      else {
-         flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!");
-      }
+      flash_error($PALANG['pInvalidMailRegex']);
+      return false;
    }
 
-   if (preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($ce_email)))
+   // Determine domain name
+   $matches=array();
+   if (!preg_match('|@(.+)$|',$ce_email,$matches))
    {
-      return true;
+      flash_error($PALANG['pInvalidMailRegex']);
+      return false;
    }
-   flash_error("Invalid email address, fails regexp check");
-   return false;
+   $domain=$matches[1];
+
+   # check domain name
+   return check_domain($domain);
 }
 
 
diff --git a/languages/bg.lang b/languages/bg.lang
index 80ffbbcd..cdf22d49 100644
--- a/languages/bg.lang
+++ b/languages/bg.lang
@@ -375,6 +375,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/ca.lang b/languages/ca.lang
index 1f208f5a..e405bfe8 100644
--- a/languages/ca.lang
+++ b/languages/ca.lang
@@ -374,6 +374,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/cn.lang b/languages/cn.lang
index 59912a2b..77b901e6 100644
--- a/languages/cn.lang
+++ b/languages/cn.lang
@@ -374,6 +374,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/cs.lang b/languages/cs.lang
index 9885509a..f6cc2c1a 100644
--- a/languages/cs.lang
+++ b/languages/cs.lang
@@ -386,6 +386,9 @@ $PALANG['pStatus_undeliverable'] = 'možná NEDORUČITELNÉ ';
 $PALANG['pStatus_custom'] = 'Doručeno do ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 $PALANG['pPasswordTooShort'] = "Heslo je příliš krátké - je vyžadováno minimálně %s znaků";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Stahovat poštu pro:';
 $PALANG['pFetchmail_new_entry'] = 'Nová položka';
 $PALANG['pFetchmail_database_save_error'] = 'Tuto položku není možné uložit do databáze!';
diff --git a/languages/da.lang b/languages/da.lang
index c5cc807d..1818a6e9 100644
--- a/languages/da.lang
+++ b/languages/da.lang
@@ -385,6 +385,9 @@ $PALANG['pStatus_custom'] = 'Leveres til ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
 $PALANG['pPasswordTooShort'] = "Adgangskoden er for kort - mindst %s tegn kræves";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 
 $PALANG['pFetchmail_welcome'] = 'Hent post for:';
 $PALANG['pFetchmail_new_entry'] = 'Ny regel';
diff --git a/languages/de.lang b/languages/de.lang
index 7cbe2f0a..7d40567a 100644
--- a/languages/de.lang
+++ b/languages/de.lang
@@ -385,6 +385,9 @@ $PALANG['pStatus_custom'] = 'Zustellung an ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
 $PALANG['pPasswordTooShort'] = "Das Passwort ist zu kurz - mindestens %s Zeichen ben&ouml;tigt";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 
 $PALANG['pFetchmail_welcome'] = 'E-Mail Abruf f&uuml;r: ';
 $PALANG['pFetchmail_new_entry'] = 'Neuer Eintrag';
diff --git a/languages/en.lang b/languages/en.lang
index 14a61bae..ca8ef63c 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -386,6 +386,9 @@ $PALANG['pStatus_custom'] = 'Delivers to ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check";
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS";
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check";
 
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:';
 $PALANG['pFetchmail_new_entry'] = 'New entry';
diff --git a/languages/es.lang b/languages/es.lang
index 799fa5a7..2e708b9e 100644
--- a/languages/es.lang
+++ b/languages/es.lang
@@ -375,6 +375,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/et.lang b/languages/et.lang
index 19e1ef4f..c374a28a 100644
--- a/languages/et.lang
+++ b/languages/et.lang
@@ -378,6 +378,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/eu.lang b/languages/eu.lang
index bf723240..f1499f8f 100644
--- a/languages/eu.lang
+++ b/languages/eu.lang
@@ -373,6 +373,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/fi.lang b/languages/fi.lang
index c427174c..cfa5be30 100644
--- a/languages/fi.lang
+++ b/languages/fi.lang
@@ -376,6 +376,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/fo.lang b/languages/fo.lang
index 55dc50d2..976dbe8e 100644
--- a/languages/fo.lang
+++ b/languages/fo.lang
@@ -379,6 +379,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/fr.lang b/languages/fr.lang
index 2161de0b..0b0d88e5 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -376,6 +376,9 @@ $PALANG['pStatus_undeliverable'] = 'Non délivrable ';
 $PALANG['pStatus_custom'] = 'Délivré à ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 $PALANG['pPasswordTooShort'] = "Mot de passe trop court. - %s caractères minimum";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :';
 $PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée';
 $PALANG['pFetchmail_database_save_error'] = 'Impossible d\'enregistrer cette entrée dans la base!';
diff --git a/languages/hr.lang b/languages/hr.lang
index 89699458..511e3b15 100644
--- a/languages/hr.lang
+++ b/languages/hr.lang
@@ -372,6 +372,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/hu.lang b/languages/hu.lang
index f8ad45d3..94888a03 100644
--- a/languages/hu.lang
+++ b/languages/hu.lang
@@ -386,6 +386,9 @@ $PALANG['pStatus_custom'] = 'Ide kézbesítődik ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
 $PALANG['pPasswordTooShort'] = "A Jelszó túl rövid - legalább %s karakter szükséges";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 
 $PALANG['pFetchmail_welcome'] = 'Mail lehozása:';
 $PALANG['pFetchmail_new_entry'] = 'Új bejegyzés';
diff --git a/languages/is.lang b/languages/is.lang
index 20c13b2e..ae616e56 100644
--- a/languages/is.lang
+++ b/languages/is.lang
@@ -373,6 +373,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/it.lang b/languages/it.lang
index 6df792e2..29b74da7 100644
--- a/languages/it.lang
+++ b/languages/it.lang
@@ -375,6 +375,9 @@ $PALANG['pStatus_undeliverable'] = 'presumibilmente NON CONSEGNABILE ';
 $PALANG['pStatus_custom'] = 'In consegna a ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 $PALANG['pPasswordTooShort'] = "Password troppo breve - minimo %s caratteri";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Ricevi posta per:';
 $PALANG['pFetchmail_new_entry'] = 'Nuova voce';
 $PALANG['pFetchmail_database_save_error'] = 'Impossibile registrare nel database!';
diff --git a/languages/ja.lang b/languages/ja.lang
index e3182192..2b0dad4e 100644
--- a/languages/ja.lang
+++ b/languages/ja.lang
@@ -384,6 +384,9 @@ $PALANG['pStatus_custom'] = '配送先 ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
 $PALANG['pPasswordTooShort'] = "パスワードが短すぎます。最低 %s 文字必要です。"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 
 $PALANG['pFetchmail_welcome'] = 'メール取得:';
 $PALANG['pFetchmail_new_entry'] = '新しいエントリ';
diff --git a/languages/lt.lang b/languages/lt.lang
index 4882955a..7bf1f6e4 100644
--- a/languages/lt.lang
+++ b/languages/lt.lang
@@ -374,6 +374,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/mk.lang b/languages/mk.lang
index 7dd467d5..fa2088ad 100644
--- a/languages/mk.lang
+++ b/languages/mk.lang
@@ -375,6 +375,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/nb.lang b/languages/nb.lang
index de260290..0283ce0a 100644
--- a/languages/nb.lang
+++ b/languages/nb.lang
@@ -374,6 +374,9 @@ $PALANG['pStatus_undeliverable'] = 'kan kanskje IKKE LEVERES ';
 $PALANG['pStatus_custom'] = 'Leverer til ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 $PALANG['pPasswordTooShort'] = "Passordet er for kort - det må inneholde minst %s tegn";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Hent e-post for:';
 $PALANG['pFetchmail_new_entry'] = 'Ny oppføring';
 $PALANG['pFetchmail_database_save_error'] = 'Kunne ikke lagre denne oppføringen i databasen!';
diff --git a/languages/nl.lang b/languages/nl.lang
index 5316a507..6c830f00 100644
--- a/languages/nl.lang
+++ b/languages/nl.lang
@@ -375,6 +375,9 @@ $PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren ';
 $PALANG['pStatus_custom'] = 'Bezorgen op ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 $PALANG['pPasswordTooShort'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Haal mail op voor:';
 $PALANG['pFetchmail_new_entry'] = 'Nieuw item';
 $PALANG['pFetchmail_database_save_error'] = 'Niet in staat dit item toe te voegen aan database!';
diff --git a/languages/nn.lang b/languages/nn.lang
index c1414235..b3cfd6a8 100644
--- a/languages/nn.lang
+++ b/languages/nn.lang
@@ -370,6 +370,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/pl.lang b/languages/pl.lang
index 4a6d5263..f874d451 100644
--- a/languages/pl.lang
+++ b/languages/pl.lang
@@ -379,6 +379,9 @@ $PALANG['pStatus_undeliverable'] = 'może być NIEDOSTARCZALNA ';
 $PALANG['pStatus_custom'] = 'Dostarczyć do ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 $PALANG['pPasswordTooShort'] = "Hasło jest za krótkie - musi mieć minimum %s znaków";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Pobierz pocztę dla:';
 $PALANG['pFetchmail_new_entry'] = 'Nowy wpis';
 $PALANG['pFetchmail_database_save_error'] = 'Wpis nie może być zapisany w bazie danych!';
diff --git a/languages/pt-br.lang b/languages/pt-br.lang
index 49018164..0e6f12bd 100644
--- a/languages/pt-br.lang
+++ b/languages/pt-br.lang
@@ -374,6 +374,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/ru.lang b/languages/ru.lang
index 4487059d..ef6cb306 100644
--- a/languages/ru.lang
+++ b/languages/ru.lang
@@ -386,6 +386,9 @@ $PALANG['pStatus_custom'] = 'Доставляется для ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
 $PALANG['pPasswordTooShort'] = "Пароль слишком короткий - требуется %s символов";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 
 $PALANG['pFetchmail_welcome'] = 'Собирать почту для:';
 $PALANG['pFetchmail_new_entry'] = 'Новая запись';
diff --git a/languages/sk.lang b/languages/sk.lang
index 537eccc1..560fee88 100644
--- a/languages/sk.lang
+++ b/languages/sk.lang
@@ -374,6 +374,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/sl.lang b/languages/sl.lang
index 77ec29ef..2b13c7ec 100644
--- a/languages/sl.lang
+++ b/languages/sl.lang
@@ -374,6 +374,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/sv.lang b/languages/sv.lang
index 0269ad3a..e5c8145b 100644
--- a/languages/sv.lang
+++ b/languages/sv.lang
@@ -376,6 +376,9 @@ $PALANG['pStatus_undeliverable'] = 'kanske misslyckades leverera ';
 $PALANG['pStatus_custom'] = 'Levereras till ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 $PALANG['pPasswordTooShort'] = "För kort lösenord - ett lösenord på %s tecken krävs";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Hämta mail för:';
 $PALANG['pFetchmail_new_entry'] = 'Ny anteckning';
 $PALANG['pFetchmail_database_save_error'] = 'Misslyckades med att spara anteckningen i databasen!';
diff --git a/languages/tr.lang b/languages/tr.lang
index 3f0378c3..0e2e405a 100644
--- a/languages/tr.lang
+++ b/languages/tr.lang
@@ -374,6 +374,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/tw.lang b/languages/tw.lang
index 06ede860..cbf84f4a 100644
--- a/languages/tw.lang
+++ b/languages/tw.lang
@@ -374,6 +374,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX