X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fogroups%2Ftabs_ogroups.inc;h=6664bce7e02a2d61f80f24bc4a44433841573735;hb=2738e56e22f23c43e980dea2d34a3c21baa645e9;hp=dbae97bb2a337e1a635168aafbbe2a758c8d476f;hpb=40fc655fc551f57d6463e4265ce39e72ebbc1132;p=gosa.git

diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index dbae97bb2..6664bce7e 100644
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -3,7 +3,8 @@
 class ogrouptabs extends tabs
 {
   var $base= "";
-  
+  var $acl_category; 
+ 
   function reload($dd){
     $objects= preg_replace('/[\[\]]/', '', $dd);
     
@@ -60,7 +61,6 @@ class ogrouptabs extends tabs
             require_once("class_phonequeue.inc");
             $this->by_name['phonequeue']= _("Phone queue");
             $this->by_object['phonequeue']= new phonequeue($this->config, $this->dn);
-            $this->by_object['phonequeue']->acl = "#all#";
             $this->by_object['phonequeue']->parent= &$this;
           }
         }
@@ -74,7 +74,6 @@ class ogrouptabs extends tabs
           require_once("class_mailogroup.inc");
           $this->by_name['mailogroup']= _("Mail");
           $this->by_object['mailogroup']= new mailogroup($this->config, $this->dn);
-          $this->by_object['mailogroup']->acl = "#all#";
           $this->by_object['mailogroup']->parent= &$this;
         }
       }
@@ -86,7 +85,6 @@ class ogrouptabs extends tabs
       if(!isset($this->by_object['termgroup'])){
         $this->by_name['termgroup']= _("System");
         $this->by_object['termgroup']= new termgroup($this->config, $this->dn);
-        $this->by_object['termgroup']->acl = "#all#";
         $this->by_object['termgroup']->inheritTimeServer = false;
         $this->by_object['termgroup']->parent= &$this;
       }
@@ -97,19 +95,23 @@ class ogrouptabs extends tabs
       if(!isset($this->by_object['workstartup'])){
         $this->by_name['workstartup']= _("Startup");
         $this->by_object['workstartup']= new workstartup($this->config, $this->dn);
-        $this->by_object['workstartup']->acl = "#all#";
         $this->by_object['workstartup']->parent= &$this;
         $this->by_name['workservice']= _("Devices");
         $this->by_object['workservice']= new workservice($this->config, $this->dn);
-        $this->by_object['workservice']->acl = "#all#";
         $this->by_object['workservice']->inheritTimeServer = false;
         $this->by_object['workservice']->parent= &$this;
         $this->by_name['faiSummary']= _("Summary");
         $this->by_object['faiSummary']= new faiSummaryTab($this->config, $this->dn);
-        $this->by_object['faiSummary']->acl = "#all#";
         $this->by_object['faiSummary']->parent= &$this;
       }
     }
+
+    /* Move reference tab to second position from right */
+    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(isset($this->by_name['reference'])){
@@ -117,22 +119,28 @@ class ogrouptabs extends tabs
       unset($this->by_name['reference']);
       $this->by_name['reference'] = $tmp;
     }
+
+    /* Reset acls */
+    $this->set_acl_base($this->base);
+    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)
+  function ogrouptabs($config, $data, $dn,$category ="ogroups")
   {
 
-    tabs::tabs($config, $data, $dn);
+    tabs::tabs($config, $data, $dn, $category);
     $this->base= $this->by_object['ogroup']->base;
+    $this->acl_category = $category;
 
     /* Insert extra tabs for several object types - if present */
 
@@ -184,6 +192,7 @@ class ogrouptabs extends tabs
     }
 
     /* Add references/acls/snapshots */
+    $this->reload($this->by_object['ogroup']->gosaGroupObjects);
     $this->addSpecialTabs();
   }
 
@@ -204,10 +213,11 @@ class ogrouptabs extends tabs
 
       /* Don't touch base object */
       if ($name != 'ogroup'){
-        $obj->parent= &$this;
-        $obj->uid= $baseobject->uid;
-        $obj->sn= $baseobject->uid;
-        $obj->givenName= $baseobject->uid;
+        $obj->parent    = &$this;
+        $obj->uid       = $baseobject->uid;
+        $obj->cn        = $baseobject->cn;
+        $obj->sn        = $baseobject->uid;
+        $obj->givenName = $baseobject->uid;
         $this->by_object[$name]= $obj;
       }
 
@@ -249,6 +259,11 @@ class ogrouptabs extends tabs
     $baseobject->handle_object_tagging();
   }
 
+  function getCopyDialog()
+  {
+    $this->reload($this->by_object['ogroup']->gosaGroupObjects); 
+    return(tabs::getCopyDialog());
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: