From 5545bec4f1142304cd427f3cf726c919e2c4a7c0 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 22 Nov 2007 12:27:49 +0000
Subject: [PATCH] Tested groupMail with cyrus mail method - works. - Some minor
 changes

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@7852 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/admin/groups/class_groupMail.inc | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index fb5e15ba0..3dbdf1b62 100644
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -365,10 +365,10 @@ class mailgroup extends plugin
     }
 
     /* Add ACL? */
+    if (isset($_POST["add_acl"])){
+      $this->imapacl[""]= "l";
+    }
     foreach ($this->indexed_user as $nr => $user){
-      if (isset($_POST["add_$nr"])){
-        $this->imapacl[""]= "l";
-      }
       if (isset($_POST["del_$nr"])){
         unset ($this->imapacl[$user]);
       }
@@ -575,8 +575,6 @@ class mailgroup extends plugin
         }
         $tmp.= "</select>&nbsp;";
         if ($nr == $count - 1){
-          $tmp.= "<input type=submit value=\""._("Add")."\" ".
-            "name=\"add_$nr\" $perm>";
         }
         if ($count > 3){
           $tmp.= "<input type=submit value=\""._("Remove")."\" ".
@@ -586,6 +584,7 @@ class mailgroup extends plugin
       $this->indexed_user[$nr]= $user;
       $this->indexed_acl[$nr++]= $acl;
     }
+    $tmp.= "<tr><td></td><td></td><td><input type=submit value='"._("Add")."' name='add_acl' $perm>";
     $smarty->assign("plusattributes", $tmp);
 
     /* Show main page */
@@ -817,8 +816,12 @@ I: Only insider delivery */
      */
     foreach ($this->imapacl as $user => $acl){
 
+      if (empty($user) || $user == ""){
+        unset($this->imapacl[$user]);
+      }
+  
       /* Skip placeholder */
-      if ($user == "" || preg_match("/%members%/",$user)){
+      if (empty($user) || $user == "" || preg_match("/%members%/",$user)){
         continue;
       }
 
-- 
2.30.2