[debian-edu-commits] debian-edu/upstream/ 01/01: class_groupMail.inc: Make sure that sanity checks on entered mail addresses actually happen.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository gosa-plugin-mailaddress.

commit 8fb474ff5420841b10fecc751b6ff2855ebcb734
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Aug 26 22:35:54 2015 +0200

    class_groupMail.inc: Make sure that sanity checks on entered mail addresses actually happen.
---
 admin/groups/mailaddress/class_groupMail.inc | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/admin/groups/mailaddress/class_groupMail.inc b/admin/groups/mailaddress/class_groupMail.inc
index b8c9dec..cb6c6d2 100644
--- a/admin/groups/mailaddress/class_groupMail.inc
+++ b/admin/groups/mailaddress/class_groupMail.inc
@@ -351,15 +351,13 @@ class mailgroup extends plugin
 
         /* Mail address checks */
         $mail = $this->mail;
-        if(!$this->initially_was_account){
-            if (empty($mail)){
-                $message[]= msgPool::required(_("Mail address"));
-            }elseif (!tests::is_email($mail)){
-                if ($this->is_template){
-                    $message[]= msgPool::invalid(_("Mail address"),"","","{%cn}@your-domain.com");
-                } else {
-                    $message[]= msgPool::invalid(_("Mail address"),"","","your-address at your-domain.com");
-                }
+        if (empty($mail)){
+            $message[]= msgPool::required(_("Mail address"));
+        }elseif (!tests::is_email($mail)){
+            if ($this->is_template){
+                $message[]= msgPool::invalid(_("Mail address"),"","","{%cn}@your-domain.com");
+            } else {
+                $message[]= msgPool::invalid(_("Mail address"),"","","your-address at your-domain.com");
             }
         }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/gosa-plugin-mailaddress.git