[debian-edu-commits] debian-edu/pkg-team/ 01/02: debian/patches: Fix 1012_allow-one-level-domains-in-email-addresses.patch. Allow mail addresses starting with a single letter followed by a dot as second character (e.g., "m.gabriel").

[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 d895331b1076216b5d5117eb137b5fb4fb6d9af8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 9 13:41:09 2015 +0200

    debian/patches: Fix 1012_allow-one-level-domains-in-email-addresses.patch. Allow mail addresses starting with a single letter followed by a dot as second character (e.g., "m.gabriel").
---
 debian/patches/1012_allow-one-level-domains-in-email-addresses.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index 1043142..42c74fd 100644
--- a/debian/patches/1012_allow-one-level-domains-in-email-addresses.patch
+++ b/debian/patches/1012_allow-one-level-domains-in-email-addresses.patch
@@ -12,11 +12,11 @@ Abstract:
      }
      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_{\[\]}%-]+)*$/",
++      return preg_match ("/^[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_-]+)*$/",
++      return preg_match ("/^[a-zA-Z0-9_\+-]+([.][a-zA-Z0-9_\+-]+)*[@][a-zA-Z0-9_-]+([.][a-zA-Z0-9_-]+)*$/",
            $address);
      }
    }

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