From 11f9f3b88ce052d1af3cd3fd1657281672d18216 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Thu, 13 Feb 2014 19:39:38 +0000
Subject: [PATCH] functions.inc.php - check_domain(): update regex for new,
 longer TLDs like .photography  
 https://sourceforge.net/p/postfixadmin/bugs/310/

(+ Changelog update)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.3@1636 a1433add-5e2c-0410-b055-b7f2511e0802
---
 CHANGELOG.TXT     | 1 +
 functions.inc.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index d67beda9..9b45cc2e 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -18,6 +18,7 @@ Changes since 2.3.6 release
   - don't trim() mail address to avoid that aliases starting with a space are
     allowed. This fixes http://sourceforge.net/p/postfixadmin/bugs/210/ and
     https://sourceforge.net/p/postfixadmin/feature-requests/113/
+  - update regex in check_domain() to support new, longer TLDs like .photography
   - mark vacation_notification.notified field as latin1 to avoid overlong index
   - vacation.pl: encode subject
   - vacation.pl: disable use of TLS by default due to a bug in Mail::Sender 0.8.22
diff --git a/functions.inc.php b/functions.inc.php
index 5184e447..26db679f 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -229,7 +229,7 @@ function check_domain ($domain)
     global $CONF;
     global $PALANG;
 
-    if (!preg_match ('/^([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', ($domain)))
+    if (!preg_match ('/^([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,11}$/i', ($domain)))
     {
         flash_error(sprintf($PALANG['pInvalidDomainRegex'], htmlentities($domain)));
         return false;