X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fogroups%2Ftabs_ogroups.inc;h=35d19c4ff23b4a7a2f2c347f8708a1a7b6130c15;hb=0eebfd3829749fcdcc5d9995ca9675d99f81888a;hp=7bab9be66701c0a9e22012fc6c363714ac0a71b9;hpb=9e224361c465d095345c67e7c4656c5a5a2c7488;p=gosa.git

diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index 7bab9be66..35d19c4ff 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);
     
@@ -23,16 +24,15 @@ class ogrouptabs extends tabs
       unset($this->by_object['phonequeue']);
       unset($this->by_name['phonequeue']);
     }
-
     /* Remove mail group if there is no user anymore */
-    if((!preg_match("/U/",$objects))&&(isset($this->by_object['mailgroup']))){
-      $this->by_object['mailgroup']->remove_from_parent();
-      unset($this->by_object['mailgroup']);
-      unset($this->by_name['mailgroup']);
+    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']);
     }
     
     /* Remove terminal group, if theres no terminal left in the object list */
-    if((!preg_match("/T/",$objects))&&(isset($this->by_object['termgroup']))){
+    if(((!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']);
@@ -40,12 +40,15 @@ class ogrouptabs extends tabs
     
     /* Remove ws tabs, if theres no ws left in the object list */
     if((!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']);
-//      $this->by_object['workservice']->remove_from_parent();
+      $this->by_object['workservice']->remove_from_parent();
       unset($this->by_object['workservice']);
       unset($this->by_name['workservice']);
+      $this->by_object['workstartup']->remove_from_parent();
+      unset($this->by_object['workstartup']);
+      unset($this->by_name['workstartup']);
+      $this->by_object['faiSummary']->remove_from_parent();
+      unset($this->by_object['faiSummary']);
+      unset($this->by_name['faiSummary']);
     }
   
     /* Create goPhoneAccount if theres an user with goPhoneAccount
@@ -72,17 +75,20 @@ 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;
         }
       }
     }
 
     /* Add Terminal tab */
-    if((preg_match("/T/",$objects))&&(!isset($this->by_object['termgroup']))){
+    if(((preg_match("/T/",$objects)) || (preg_match("/W/",$objects)))&&(!isset($this->by_object['termgroup']))){
       require_once("class_termgroup.inc");
       if(!isset($this->by_object['termgroup'])){
-        $this->by_name['termgroup']= _("Terminals");
+        $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;
       }
     }
@@ -94,27 +100,47 @@ class ogrouptabs extends tabs
         $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']= _("Service");
+        $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 last position*/
+    if(isset($this->by_name['reference'])){
+      $tmp = $this->by_name['reference'];
+      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 ="")
   {
 
-    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 */
 
@@ -164,12 +190,15 @@ class ogrouptabs extends tabs
           break;
       }
     }
+
+    /* Add references/acls/snapshots */
+    $this->addSpecialTabs();
   }
 
 
   function check()
   {
-    return (tabs::check(TRUE));
+    return (tabs::check(FALSE));
   }
 
 
@@ -222,6 +251,10 @@ class ogrouptabs extends tabs
     }
 
     tabs::save();
+
+    /* Fix tagging if needed */
+		$baseobject->dn= $new_dn;
+    $baseobject->handle_object_tagging();
   }
 
 }