Backports from 2.7

[gosa.git] / gosa-core / plugins / admin / ogroups / class_ogroup.inc

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index c68ac83f4794400b9ef91abd7e136b2624b591c0..cb719055c989632e07a5c4f0f0aaeae6bc304644 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -66,7 +66,7 @@ class ogroup extends plugin
     var $view_logged = FALSE;
 
     var $copyMembers = TRUE;
-
+    var $wasDyGroup = FALSE;
     var $baseSelector;
 
     /* Already assigned Workstations. Will be hidden in selection. 
@@ -361,6 +361,17 @@ class ogroup extends plugin
             $data[$key] = $dn;
             $lData[$key] = array('data'=> array(image($image),$name));
         }
+
+        if($this->isRestrictedByDynGroup()){
+            $this->memberListing->setDeleteable(false);
+            $smarty->assign("memberACL", preg_replace("/[^r]/", "", $this->getacl("member")));
+            $smarty->assign("isRestrictedByDynGroup", TRUE);
+            
+        }else{
+            $this->memberListing->setDeleteable(true);
+            $smarty->assign("isRestrictedByDynGroup", FALSE);
+        }
+
         $this->memberListing->setListData($data,$lData);
         $this->memberListing->update();
         $smarty->assign("memberList",$this->memberListing->render());
@@ -374,6 +385,17 @@ class ogroup extends plugin
     }
 
 
+    function isRestrictedByDynGroup()
+    {
+        $bool = FALSE;
+        if(isset($this->parent->by_object['DynamicLdapGroup'])){
+            $bool = $this->parent->by_object['DynamicLdapGroup']->isAttributeDynamic('member');
+        }
+        $this->wasDyGroup |= $bool;
+        return($bool);
+    }
+
+
     function set_acl_base($base)
     {
         plugin::set_acl_base($base);
@@ -710,9 +732,11 @@ class ogroup extends plugin
         plugin::save();
 
         /* Move members to target array */
-        $this->attrs['member'] =array();
-        foreach ($this->member as $key => $desc){
-            $this->attrs['member'][]= LDAP::fix($key);
+        if(!$this->wasDyGroup && !$this->isRestrictedByDynGroup()){
+            $this->attrs['member'] =array();
+            foreach ($this->member as $key => $desc){
+                $this->attrs['member'][]= LDAP::fix($key);
+            }
         }
 
         $ldap= $this->config->get_ldap_link();