[debian-edu-commits] debian-edu/pkg-team/ 05/07: debian/patches: Add 1012_allow-one-level-domains-in-email-addresses.patch. Allow one-level domains in email addresses (such as <uid>@intern, as used in Debian Edu by default). (Closes: #794738).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit e1c23ccda0c3d4bc5280e2770bacbc7a9c4239d3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 24 13:27:16 2015 +0200

    debian/patches: Add 1012_allow-one-level-domains-in-email-addresses.patch. Allow one-level domains in email addresses (such as <uid>@intern, as used in Debian Edu by default). (Closes: #794738).
---
 ...llow-one-level-domains-in-email-addresses.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/1012_allow-one-level-domains-in-email-addresses.patch b/debian/patches/1012_allow-one-level-domains-in-email-addresses.patch
new file mode 100644
index 0000000..cfa68e7
--- /dev/null
+++ b/debian/patches/1012_allow-one-level-domains-in-email-addresses.patch
@@ -0,0 +1,22 @@
+Description: Allow one-level domains in email addresses
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Abstract:
+ Make it possible to use one-level domains in email address
+ (such as <uid>@intern) as commonly used in a Debian Edu
+ default installation.
+
+--- a/gosa-core/include/utils/class_tests.inc
++++ b/gosa-core/include/utils/class_tests.inc
+@@ -237,10 +237,10 @@
+       return (TRUE);
+     }
+     if ($template){
+-      return preg_match ("/^[._a-z0-9{\[\]}%\+-]+@[_a-{}\[\]%z0-9-]+(\.[a-z0-9-]+)(\.[a-z0-9-]+)*$/i",
++      return preg_match ("/^[^0-9][a-zA-Z0-9_{\[\]}%]+([.][a-zA-Z0-9_{\[\]}%]\+-]+)*[@][a-zA-Z0-9_-{\[\]}%]+([.][a-zA-Z0-9_-{\[\]}%]+)*$/",
+           $address);
+     } else {
+-      return preg_match ("/^[._a-z0-9\+-]+@[_a-z0-9-]+(\.[a-z0-9i-]+)(\.[a-z0-9-]+)*$/i",
++      return preg_match ("/^[^0-9][a-zA-Z0-9_\+-]+([.][a-zA-Z0-9_\+-]+)*[@][a-zA-Z0-9_-]+([.][a-zA-Z0-9_-]+)*$/",
+           $address);
+     }
+   }
diff --git a/debian/patches/series b/debian/patches/series
index a2b4012..a9e8c56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,7 @@
 1009_fix-insertDhcp-icon-in-dhcp-section-overview.patch
 1010_fix-entry-removal-in-mail-plugin.patch
 1011_define-isPluginModified.patch
+1012_allow-one-level-domains-in-email-addresses.patch
 2001_fix-smarty-location.patch
 2002_fix-template-location.patch
 2003_fix-class-mapping.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git