From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 28 Apr 2010 14:27:04 +0000 (+0000)
Subject: Updated ogroup tabs
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f8690114625f2a4783d8ef812deddd251fb4ed45;p=gosa.git

Updated ogroup tabs
- Applied commit 15748
- Tabs will not be directly removed anymore, instead they will be marked for removal. This keep settings made in the corresponding tabs, until we save.


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17914 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc b/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
index bea1067d8..95a603cb6 100644
--- a/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
@@ -22,351 +22,361 @@
 
 class ogrouptabs extends tabs
 {
-  var $base= "";
-  var $acl_category; 
- 
-  function reload($dd)
-  {
-    $objects      = preg_replace('/[\[\]]/', '', $dd);
-
-    /* Check if we have a group with a set different mixed objects.
-     */
-    $mixed_type = FALSE;
-    for($i = 0 ; $i < (strlen($objects) -1 );$i++){
-      $mixed_type |= $objects[$i] != $objects[($i+1)];
-    }
- 
-    /* If there is a phonequeue,
-     * but there is no user left with goPhoneAccount ... remove it.
-     */
-    $usePhoneTab = false;
-    if(class_available("phonequeue")){
-
-      foreach($this->by_object['ogroup']->memberList as $dn => $val){
-        if(isset($this->by_object['ogroup']->objcache[$dn])){
-          $obj = $this->by_object['ogroup']->objcache[$dn];
-          if(isset($obj['objectClass'])){
-            if(in_array("goFonAccount",$obj['objectClass'])){
-              $usePhoneTab = true;
-            }
-          }
+    var $base= "";
+    var $acl_category; 
+    var $to_remove=array();
+
+    /*! \brief Stage an object for removal */
+    function remove($object) {
+        if (!isset($this->to_remove[$object])) {
+            $this->to_remove[$object] = $this->by_object[$object];
+            unset($this->by_object[$object]);
+            unset($this->by_name[$object]);
         }
-      }
-      if((!$usePhoneTab && isset($this->by_object['phonequeue']))||
-         (!preg_match("/U/",$objects) && isset($this->by_object['phonequeue']))){
-        $this->by_object['phonequeue']->remove_from_parent();
-        unset($this->by_object['phonequeue']);
-        unset($this->by_name['phonequeue']);
-      }
     }
 
-    /* Remove mail group if there is no user anymore 
-     */
-    if(class_available("mailogroup")){
-      if(!preg_match("/U/",$objects) && isset($this->by_object['mailogroup'])){
-        $this->by_object['mailogroup']->remove_from_parent();
-        unset($this->by_object['mailogroup']);
-        unset($this->by_name['mailogroup']);
-      }
+    /*! \brief Unstage an object from removal */
+    function add($object) {
+        if (isset($this->to_remove[$object])) {
+            unset($this->to_remove[$object]);
+        }
     }
 
-    /* Remove terminal group, if theres no terminal left in the object list 
-     */
-    if(class_available("termgroup")){
-      if(($mixed_type && isset($this->by_object['termgroup'])) ||
-          !preg_match("/T/",$objects) && !preg_match("/W/",$objects) && isset($this->by_object['termgroup'])){
-        $this->by_object['termgroup']->remove_from_parent();
-        unset($this->by_object['termgroup']);
-        unset($this->by_name['termgroup']);
-      }
-    }
-    if(class_available("termservice")){
-      if(($mixed_type && isset($this->by_object['termservice'])) ||
-          !preg_match("/T/",$objects) &&(isset($this->by_object['termservice']))){
-        $this->by_object['termservice']->remove_from_parent();
-        unset($this->by_object['termservice']);
-        unset($this->by_name['termservice']);
-      }
-    }
-    if(class_available("termstartup")){
-      if(($mixed_type && isset($this->by_object['termstartup'])) ||
-          !preg_match("/T/",$objects)&&(isset($this->by_object['termstartup']))){
-        $this->by_object['termstartup']->remove_from_parent();
-        unset($this->by_object['termstartup']);
-        unset($this->by_name['termstartup']);
-      }
-    }
+    function reload($dd)
+    {
+        $objects      = preg_replace('/[\[\]]/', '', $dd);
 
-    /* Remove ws tabs, if theres no ws left in the object list */
-    if(class_available("workservice")){
-      if(($mixed_type && isset($this->by_object['workservice'])) ||
-          (!preg_match("/W/",$objects))&&(isset($this->by_object['workservice']))){
-        $this->by_object['workservice']->remove_from_parent();
-        unset($this->by_object['workservice']);
-        unset($this->by_name['workservice']);
-      }
-    }
-    if(class_available("workstartup")){
-      if(($mixed_type && isset($this->by_object['workstartup'])) ||
-          (!preg_match("/S/",$objects) && !preg_match("/W/",$objects))&&(isset($this->by_object['workstartup']))){
-        $this->by_object['workstartup']->remove_from_parent();
-        unset($this->by_object['workstartup']);
-        unset($this->by_name['workstartup']);
-        if (isset($this->by_object['faiSummary'])){
-          $this->by_object['faiSummary']->remove_from_parent();
-          unset($this->by_object['faiSummary']);
-          unset($this->by_name['faiSummary']);
+        /* Check if we have a group with a set different mixed objects.
+         */
+        $mixed_type = FALSE;
+        for($i = 0 ; $i < (strlen($objects) -1 );$i++){
+            $mixed_type |= $objects[$i] != $objects[($i+1)];
         }
-      }
-    }
-  
-    /* Create goPhoneAccount if theres an user with goPhoneAccount
-     * but only if there is currently no queue enabled.
-     */
-    if(class_available("phonequeue")){
-      if(!isset($this->by_object['phonequeue'])){
-        foreach($this->by_object['ogroup']->memberList as $dn => $val){
-          if(isset($this->by_object['ogroup']->objcache[$dn])){
-            $obj = $this->by_object['ogroup']->objcache[$dn];
-            if(isset($obj['objectClass'])){
-              if(in_array("goFonAccount",$obj['objectClass'])){
-                $this->by_name['phonequeue']= _("Phone queue");
-                $this->by_object['phonequeue']= new phonequeue($this->config, $this->dn);
-                $this->by_object['phonequeue']->parent= &$this;
-                break;
-              }
+
+        /* If there is a phonequeue,
+         * but there is no user left with goPhoneAccount ... remove it.
+         */
+        $usePhoneTab = false;
+        if(class_available("phonequeue")){
+
+            foreach($this->by_object['ogroup']->memberList as $dn => $val){
+                if(isset($this->by_object['ogroup']->objcache[$dn])){
+                    $obj = $this->by_object['ogroup']->objcache[$dn];
+                    if(isset($obj['objectClass'])){
+                        if(in_array("goFonAccount",$obj['objectClass'])){
+                            $usePhoneTab = true;
+                        }
+                    }
+                }
+            }
+            if((!$usePhoneTab && isset($this->by_object['phonequeue']))||
+                    (!preg_match("/U/",$objects) && isset($this->by_object['phonequeue']))){
+                $this->remove('phonequeue');
             }
-          }
         }
-      }
-    }
 
-    /* Add mail group tab , if there is curerntly no mail tab defined */ 
-    if(class_available("mailogroup")){
-      if((preg_match("/U/",$objects))&&(!isset($this->by_object['mailogroup']))){
-        if ($this->config->get_cfg_value("mailmethod") == "kolab"){
-          $this->by_name['mailogroup']= _("Mail");
-          $this->by_object['mailogroup']= new mailogroup($this->config, $this->dn);
-          $this->by_object['mailogroup']->parent= &$this;
+        /* Remove mail group if there is no user anymore 
+         */
+        if(class_available("mailogroup")){
+            if(!preg_match("/U/",$objects) && isset($this->by_object['mailogroup'])){
+                $this->remove('mailogroup');
+            }
         }
-      }
-    }
 
-    /* Add Terminal tab */
-    if(class_available("termgroup")){
-      if(!$mixed_type && 
-          ((preg_match("/T/",$objects)) || (preg_match("/W/",$objects)))&&(!isset($this->by_object['termgroup']))){
-        if(!isset($this->by_object['termgroup'])){
-          $this->by_name['termgroup']= _("Systems");
-          $this->by_object['termgroup']= new termgroup($this->config, $this->dn);
-          $this->by_object['termgroup']->inheritTimeServer = false;
-          $this->by_object['termgroup']->parent= &$this;
+        /* Remove terminal group, if theres no terminal left in the object list 
+         */
+        if(class_available("termgroup")){
+            if(($mixed_type && isset($this->by_object['termgroup'])) ||
+                    !preg_match("/T/",$objects) && !preg_match("/W/",$objects) && isset($this->by_object['termgroup'])){
+                $this->remove('termgroup');    
+            }
         }
-      }
-    }
-    if(class_available("termstartup")){
-      if(!$mixed_type &&
-          preg_match("/T/",$objects) &&(!isset($this->by_object['termstartup']))){
-        if(!isset($this->by_object['termstartup'])){
-          $this->by_name['termstartup']= _("Startup");
-          $this->by_object['termstartup']= new termstartup($this->config, $this->dn,$this->by_object['ogroup']);
-	  $this->by_object['termstartup']->parent= &$this;
-	  $this->by_object['termstartup']->acl = "#all#";
+        if(class_available("termservice")){
+            if(($mixed_type && isset($this->by_object['termservice'])) ||
+                    !preg_match("/T/",$objects) &&(isset($this->by_object['termservice']))){
+                $this->remove('termservice');    
+            }
         }
-      }
-    }
-    if(!$mixed_type &&
-        class_available("termservice")){
-      if(preg_match("/T/",$objects) &&(!isset($this->by_object['termservice']))){
-        if(!isset($this->by_object['termservice'])){
-          $this->by_name['termservice']= _("Devices");
-          $this->by_object['termservice']= new termservice($this->config, $this->dn,$this->by_object['ogroup']);
-	  $this->by_object['termservice']->parent= &$this;
-	  $this->by_object['termservice']->acl = "#all#";
+        if(class_available("termstartup")){
+            if(($mixed_type && isset($this->by_object['termstartup'])) ||
+                    !preg_match("/T/",$objects)&&(isset($this->by_object['termstartup']))){
+                $this->remove('termstartup');
+            }
         }
-      }
-    }
 
-    /* Add Workstation tabs */
-    if(class_available("workstartup")){
-      if(!$mixed_type &&
-          (preg_match("/S/",$objects) || preg_match("/W/",$objects))&&(!isset($this->by_object['workstartup']))){
-        $this->by_name['workstartup']= _("Startup");
-        $this->by_object['workstartup']= new workstartup($this->config, $this->dn);
-        $this->by_object['workstartup']->parent= &$this;
-        $this->by_object['workstartup']->acl = "#all#";
-      }
-    }
-    if(!$mixed_type &&
-        class_available("workservice")){
-      if((preg_match("/W/",$objects))&&(!isset($this->by_object['workservice']))){
-        $this->by_name['workservice']= _("Devices");
-        $this->by_object['workservice']= new workservice($this->config, $this->dn);
-        $this->by_object['workservice']->inheritTimeServer = false;
-        $this->by_object['workservice']->parent= &$this;
-        $this->by_object['workservice']->acl = "#all#";
-      }
-    }
-    if(class_available("faiSummary")){
-      if(!$mixed_type &&
-          (preg_match("/S/",$objects) || preg_match("/W/",$objects))&&(!isset($this->by_object['faiSummary']))){
-        $this->by_name['faiSummary']= _("FAI summary");
-        $this->by_object['faiSummary']= new faiSummaryTab($this->config, $this->dn);
-        $this->by_object['faiSummary']->parent= &$this;
-      }
-    }
+        /* Remove ws tabs, if theres no ws left in the object list */
+        if(class_available("workservice")){
+            if(($mixed_type && isset($this->by_object['workservice'])) ||
+                    (!preg_match("/W/",$objects))&&(isset($this->by_object['workservice']))){
+                $this->remove('workservice');
+            }
+        }
+        if(class_available("workstartup")){
+            if(($mixed_type && isset($this->by_object['workstartup'])) ||
+                    (!preg_match("/S/",$objects) && !preg_match("/W/",$objects))&&(isset($this->by_object['workstartup']))){
+                $this->remove('workstartup');
+                if (isset($this->by_object['faiSummary'])){
+                    $this->remove('faiSummary');
+                }
+            }
+        }
 
-    /* Add environment tab if user or group is member in this object group*/
-    if(class_available("environment")){
-      if((preg_match("/G/",$objects) || preg_match("/U/",$objects)) && !isset($this->by_name['environment'])){
-        $this->by_name['environment']= _("Environment");
-        $this->by_object['environment']= new environment($this->config, $this->dn);
-        $this->by_object['environment']->acl = "#all#";
-        $this->by_object['environment']->parent= &$this;
-      }
-    }
+        /* Create goPhoneAccount if theres an user with goPhoneAccount
+         * but only if there is currently no queue enabled.
+         */
+        if(class_available("phonequeue")){
+            if(!isset($this->by_object['phonequeue'])){
+                foreach($this->by_object['ogroup']->memberList as $dn => $val){
+                    if(isset($this->by_object['ogroup']->objcache[$dn])){
+                        $obj = $this->by_object['ogroup']->objcache[$dn];
+                        if(isset($obj['objectClass'])){
+                            if(in_array("goFonAccount",$obj['objectClass'])){
+                                $this->by_name['phonequeue']= _("Phone queue");
+                                $this->by_object['phonequeue']= new phonequeue($this->config, $this->dn);
+                                $this->by_object['phonequeue']->parent= &$this;
+                                $this->add('phonequeue');
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /* Add mail group tab , if there is curerntly no mail tab defined */ 
+        if(class_available("mailogroup")){
+            if((preg_match("/U/",$objects))&&(!isset($this->by_object['mailogroup']))){
+                if ($this->config->get_cfg_value("mailmethod") == "kolab"){
+                    $this->by_name['mailogroup']= _("Mail");
+                    $this->by_object['mailogroup']= new mailogroup($this->config, $this->dn);
+                    $this->by_object['mailogroup']->parent= &$this;
+                    $this->add('mailogroup');
+                }
+            }
+        }
+
+        /* Add Terminal tab */
+        if(class_available("termgroup")){
+            if(!$mixed_type && 
+                    ((preg_match("/T/",$objects)) || (preg_match("/W/",$objects)))&&(!isset($this->by_object['termgroup']))){
+                if(!isset($this->by_object['termgroup'])){
+                    $this->by_name['termgroup']= _("Systems");
+                    $this->by_object['termgroup']= new termgroup($this->config, $this->dn);
+                    $this->by_object['termgroup']->inheritTimeServer = false;
+                    $this->by_object['termgroup']->parent= &$this;
+                    $this->add('termgroup');
+                }
+            }
+        }
+        if(class_available("termstartup")){
+            if(!$mixed_type &&
+                    preg_match("/T/",$objects) &&(!isset($this->by_object['termstartup']))){
+                if(!isset($this->by_object['termstartup'])){
+                    $this->by_name['termstartup']= _("Startup");
+                    $this->by_object['termstartup']= new termstartup($this->config, $this->dn,$this->by_object['ogroup']);
+                    $this->by_object['termstartup']->parent= &$this;
+                    $this->by_object['termstartup']->acl = "#all#";
+                    $this->add('termstartup');
+                }
+            }
+        }
+        if(!$mixed_type &&
+                class_available("termservice")){
+            if(preg_match("/T/",$objects) &&(!isset($this->by_object['termservice']))){
+                if(!isset($this->by_object['termservice'])){
+                    $this->by_name['termservice']= _("Devices");
+                    $this->by_object['termservice']= new termservice($this->config, $this->dn,$this->by_object['ogroup']);
+                    $this->by_object['termservice']->parent= &$this;
+                    $this->by_object['termservice']->acl = "#all#";
+                    $this->add('termservice');
+                }
+            }
+        }
+
+        /* Add Workstation tabs */
+        if(class_available("workstartup")){
+            if(!$mixed_type &&
+                    (preg_match("/S/",$objects) || preg_match("/W/",$objects))&&(!isset($this->by_object['workstartup']))){
+                $this->by_name['workstartup']= _("Startup");
+                $this->by_object['workstartup']= new workstartup($this->config, $this->dn);
+                $this->by_object['workstartup']->parent= &$this;
+                $this->add("workstartup");
+            }
+        }
+        if(!$mixed_type &&
+                class_available("workservice")){
+            if((preg_match("/W/",$objects))&&(!isset($this->by_object['workservice']))){
+                $this->by_name['workservice']= _("Devices");
+                $this->by_object['workservice']= new workservice($this->config, $this->dn);
+                $this->by_object['workservice']->inheritTimeServer = false;
+                $this->by_object['workservice']->parent= &$this;
+                $this->add("workservice");
+            }
+        }
+        if(class_available("faiSummary")){
+            if(!$mixed_type &&
+                    (preg_match("/S/",$objects) || preg_match("/W/",$objects))&&(!isset($this->by_object['faiSummary']))){
+                $this->by_name['faiSummary']= _("FAI summary");
+                $this->by_object['faiSummary']= new faiSummaryTab($this->config, $this->dn);
+                $this->by_object['faiSummary']->parent= &$this;
+                $this->add("faiSummary");
+            }
+        }
 
-    /* Remove environment tab if not required any longer */
-    if(class_available("environment")){
-      if(!preg_match("/G/",$objects) && !preg_match("/U/",$objects) && isset($this->by_name['environment'])){
-        $this->by_object['environment']->remove_from_parent();
-        unset($this->by_name['environment']);
-        unset($this->by_object['environment']);
-      }
+        /* Add environment tab if user or group is member in this object group*/
+        if(class_available("environment")){
+            if((preg_match("/G/",$objects) || preg_match("/U/",$objects)) && !isset($this->by_name['environment'])){
+                $this->by_name['environment']= _("Environment");
+                $this->by_object['environment']= new environment($this->config, $this->dn);
+                $this->by_object['environment']->parent= &$this;
+                $this->add("environment");
+            }
+        }
+
+        /* Remove environment tab if not required any longer */
+        if(class_available("environment")){
+            if(!preg_match("/G/",$objects) && !preg_match("/U/",$objects) && isset($this->by_name['environment'])){
+                $this->remove("environment");
+            }
+        }
+
+        /* Add application tab if user or group is member in this object group*/
+        if(class_available("appgroup")){
+            if((preg_match("/G/",$objects) || preg_match("/U/",$objects)) && !isset($this->by_name['appgroup'])){
+                $this->by_name['appgroup']= _("Applications");
+                $this->by_object['appgroup']= new appgroup($this->config, $this->dn);
+                $this->by_object['appgroup']->acl = "#all#";
+                $this->by_object['appgroup']->parent= &$this;
+                $this->add('appgroup');
+            }
+        }
+
+        /* Remove application tab if not required any longer */
+        if(class_available("appgroup")){
+            if(!preg_match("/G/",$objects) && !preg_match("/U/",$objects) && isset($this->by_name['appgroup'])){
+                $this->remove('appgroup');
+            }
+        }
+
+        /* Move reference tab to second position from right */
+        if(class_available("acl")){
+            if(isset($this->by_name['acl'])){
+                $tmp = $this->by_name['acl'];
+                unset($this->by_name['acl']);
+                $this->by_name['acl'] = $tmp;
+            }
+
+            /* Move reference tab to last position*/
+            if(class_available("reference")){
+                if(isset($this->by_name['reference'])){
+                    $tmp = $this->by_name['reference'];
+                    unset($this->by_name['reference']);
+                    $this->by_name['reference'] = $tmp;
+                }
+            }
+
+            /* Reset acls */
+            if($this->dn == "new"){
+                $this->set_acl_base($this->base);
+            }else{
+                $this->set_acl_base($this->dn);
+            }
+            foreach($this->by_object as $name => $obj){
+                $this->by_object[$name]->set_acl_category($this->acl_category);
+            }
+        }
     }
 
-    /* Add application tab if user or group is member in this object group*/
-    if(class_available("appgroup")){
-      if((preg_match("/G/",$objects) || preg_match("/U/",$objects)) && !isset($this->by_name['appgroup'])){
-        $this->by_name['appgroup']= _("Applications");
-        $this->by_object['appgroup']= new appgroup($this->config, $this->dn);
-        $this->by_object['appgroup']->acl = "#all#";
-        $this->by_object['appgroup']->parent= &$this;
-      }
+    function execute(){
+        $str = "";
+        $this->by_object['ogroup']->AddDelMembership();
+        $this->reload($this->by_object['ogroup']->gosaGroupObjects);
+        $str .= tabs::execute();
+        return ( $str);
+    }  
+
+    function ogrouptabs($config, $data, $dn,$category ="ogroups",$hide_refs = FALSE, $hide_acls = FALSE)
+    {
+
+        tabs::tabs($config, $data, $dn, $category,$hide_refs, $hide_acls);
+        $this->base= $this->by_object['ogroup']->base;
+        $this->acl_category = $category;
+
+        /* Add references/acls/snapshots */
+        $this->reload($this->by_object['ogroup']->gosaGroupObjects);
+        $this->addSpecialTabs();
     }
 
-    /* Remove application tab if not required any longer */
-    if(class_available("appgroup")){
-      if(!preg_match("/G/",$objects) && !preg_match("/U/",$objects) && isset($this->by_name['appgroup'])){
-        $this->by_object['appgroup']->remove_from_parent();
-        unset($this->by_name['appgroup']);
-        unset($this->by_object['appgroup']);
-      }
+
+    function check($ignore_account= FALSE)
+    {
+        return (tabs::check(FALSE));
     }
 
-    /* Move reference tab to second position from right */
-    if(class_available("acl")){
-      if(isset($this->by_name['acl'])){
-        $tmp = $this->by_name['acl'];
-        unset($this->by_name['acl']);
-        $this->by_name['acl'] = $tmp;
-      }
-
-      /* Move reference tab to last position*/
-      if(class_available("reference")){
-        if(isset($this->by_name['reference'])){
-          $tmp = $this->by_name['reference'];
-          unset($this->by_name['reference']);
-          $this->by_name['reference'] = $tmp;
+
+    function save_object($save_current= FALSE)
+    {
+        tabs::save_object($save_current);
+
+        /* Update reference, transfer variables */
+        $baseobject= $this->by_object['ogroup'];
+        foreach ($this->by_object as $name => $obj){
+
+            /* Don't touch base object */
+            if ($name != 'ogroup'){
+                $obj->parent    = &$this;
+                $obj->uid       = $baseobject->uid;
+                $obj->cn        = $baseobject->cn;
+                $obj->sn        = $baseobject->uid;
+                $obj->givenName = $baseobject->uid;
+                $this->by_object[$name]= $obj;
+            }
+
+            /* Update parent in base object */
+            $this->by_object['ogroup']->parent= &$this;
         }
-      }
-
-      /* Reset acls */
-      if($this->dn == "new"){
-        $this->set_acl_base($this->base);
-      }else{
-        $this->set_acl_base($this->dn);
-      }
-      foreach($this->by_object as $name => $obj){
-        $this->by_object[$name]->set_acl_category($this->acl_category);
-      }
     }
-  }
-
-  function execute(){
-    $str = "";
-    $this->by_object['ogroup']->AddDelMembership();
-    $this->reload($this->by_object['ogroup']->gosaGroupObjects);
-    $str .= tabs::execute();
-    return ( $str);
-  }  
-
-  function ogrouptabs($config, $data, $dn,$category ="ogroups",$hide_refs = FALSE, $hide_acls = FALSE)
-  {
-
-    tabs::tabs($config, $data, $dn, $category,$hide_refs, $hide_acls);
-    $this->base= $this->by_object['ogroup']->base;
-    $this->acl_category = $category;
-
-    /* Add references/acls/snapshots */
-    $this->reload($this->by_object['ogroup']->gosaGroupObjects);
-    $this->addSpecialTabs();
-  }
-
-
-  function check($ignore_account= FALSE)
-  {
-    return (tabs::check(FALSE));
-  }
-
-
-  function save_object($save_current= FALSE)
-  {
-    tabs::save_object($save_current);
-
-    /* Update reference, transfer variables */
-    $baseobject= $this->by_object['ogroup'];
-    foreach ($this->by_object as $name => $obj){
-
-      /* Don't touch base object */
-      if ($name != 'ogroup'){
-        $obj->parent    = &$this;
-        $obj->uid       = $baseobject->uid;
-        $obj->cn        = $baseobject->cn;
-        $obj->sn        = $baseobject->uid;
-        $obj->givenName = $baseobject->uid;
-        $this->by_object[$name]= $obj;
-      }
-
-      /* Update parent in base object */
-      $this->by_object['ogroup']->parent= &$this;
-    }
-  }
 
 
-  function save($ignore_account= FALSE)
-  {
-    $baseobject= $this->by_object['ogroup'];
+    function save($ignore_account= FALSE)
+    {
+        $baseobject= $this->by_object['ogroup'];
 
-    /* Check for new 'dn', in order to propagate the
-       'dn' to all plugins */
-    $new_dn= 'cn='.$baseobject->cn.','.get_ou('ogroupRDN').$baseobject->base;
+        /* Check for new 'dn', in order to propagate the
+           'dn' to all plugins */
+        $new_dn= 'cn='.$baseobject->cn.','.get_ou('ogroupRDN').$baseobject->base;
 
-    /* Move group? */
-    if (LDAP::fix($this->dn) != LDAP::fix($new_dn)){
+        /* Move group? */
+        if (LDAP::fix($this->dn) != LDAP::fix($new_dn)){
 
-      /* Write entry on new 'dn' */
-      if ($this->dn != "new"){
-        $baseobject->move($this->dn, $new_dn);
-        $this->by_object['ogroup']= $baseobject;
-      }
+            /* Write entry on new 'dn' */
+            if ($this->dn != "new"){
+                $baseobject->move($this->dn, $new_dn);
+                $this->by_object['ogroup']= $baseobject;
+            }
 
-      /* Happen to use the new one */
-      $this->dn= $new_dn;
-    }
+            /* Happen to use the new one */
+            $this->dn= $new_dn;
+        }
 
-    if ($this->dn == "new"){
-      $this->dn= 'cn='.$baseobject->cn.','.get_ou('ogroupRDN').$baseobject->base;
-    }
+        if ($this->dn == "new"){
+            $this->dn= 'cn='.$baseobject->cn.','.get_ou('ogroupRDN').$baseobject->base;
+        }
 
-    tabs::save();
-  }
+        /* Only delete attributes if there are members left */
+        if (count($this->by_object['ogroup']->memberList) != 0) {
+            foreach(array_keys($this->to_remove) as $object) {
+                $this->to_remove[$object]->remove_from_parent();
+            }
+        }
+        tabs::save();
+    }
 
-  function getCopyDialog()
-  {
-    $this->reload($this->by_object['ogroup']->gosaGroupObjects); 
-    return(tabs::getCopyDialog());
-  }
+    function getCopyDialog()
+    {
+        $this->reload($this->by_object['ogroup']->gosaGroupObjects); 
+        return(tabs::getCopyDialog());
+    }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: