Fixed ogroup acls stuff

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

diff --git a/plugins/admin/ogroups/class_termgroup.inc b/plugins/admin/ogroups/class_termgroup.inc
index f803cb85adb6880f89b3fd21abf65925f19665bb..5abb02d36c7eaead079c3376e5485a0c7cb5ceb6 100644 (file)
--- a/plugins/admin/ogroups/class_termgroup.inc
+++ b/plugins/admin/ogroups/class_termgroup.inc
@@ -105,7 +105,7 @@ class termgroup extends plugin
      /* Call common method to give check the hook */
     $message= plugin::check();
 
-    if ($this->acl_is_createable() && $this->dn == "new"){
+    if (!$this->acl_is_createable() && $this->dn == "new"){
       $message[]= _("You have no permissions to create a workstation on this 'Base'.");
     }
 

diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index e6bb6720f32079a717ef165a7fe8b743687d273b..8c7afb6583465e6fc62b9f32d4e236b6a65f29fc 100644 (file)
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -61,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;
           }
         }
@@ -75,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;
         }
       }
@@ -87,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;
       }
@@ -98,16 +95,13 @@ 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;
       }
     }
@@ -142,7 +136,7 @@ class ogrouptabs extends tabs
     return ( $str);
   }  
 
-  function ogrouptabs($config, $data, $dn,$category ="")
+  function ogrouptabs($config, $data, $dn,$category ="ogroups")
   {
 
     tabs::tabs($config, $data, $dn, $category);
@@ -265,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: