From 5e5bec58422458345757364cdb429d7311093307 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 27 Apr 2010 13:56:34 +0000
Subject: [PATCH] Updated object group member handling

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17889 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/plugins/admin/ogroups/class_ogroup.inc | 7 ++++++-
 gosa-core/plugins/admin/ogroups/generic.tpl      | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index dce0461ec..e3f3768fe 100644
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -191,6 +191,12 @@ class ogroup extends plugin
         $objects = $this->objectSelect->save();
         $skipped = FALSE;
         foreach($objects as $object){
+          $dn = $object['dn'];
+
+          // Do not add existing members twice!
+          if(isset($this->member["$dn"])){
+              continue;
+          }
 
           $tmp = "";
           foreach($this->memberList as $obj){
@@ -199,7 +205,6 @@ class ogroup extends plugin
 
           $type  = $this->getObjectType($object);
           $name= $this->getObjectName($object);
-          $dn = $object['dn'];
 
           /* Fill array */
           if (isset($object["description"][0])){
diff --git a/gosa-core/plugins/admin/ogroups/generic.tpl b/gosa-core/plugins/admin/ogroups/generic.tpl
index 2670e1503..34b4d8c2a 100644
--- a/gosa-core/plugins/admin/ogroups/generic.tpl
+++ b/gosa-core/plugins/admin/ogroups/generic.tpl
@@ -43,7 +43,6 @@
 {render acl=$memberACL}
    {$memberList}
 {/render}
-   <br>
 {render acl=$memberACL}
    <button type='submit' name='edit_membership'>{msgPool type=addButton}</button>&nbsp;
 {/render}
-- 
2.30.2