X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fogroups%2Ftabs_ogroups.inc;h=dbae97bb2a337e1a635168aafbbe2a758c8d476f;hb=c410b9d1ae522912520874bb30aa1f581753b708;hp=138d86e345fee5223f74c9d3c085d3a7c392a859;hpb=1ce3b4be7c4621817ffbb43bf85fcd576d2ad63a;p=gosa.git

diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index 138d86e34..dbae97bb2 100644
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -23,16 +23,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']);
@@ -46,6 +45,9 @@ class ogrouptabs extends tabs
       $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 +74,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;
       }
     }
@@ -97,15 +102,25 @@ class ogrouptabs extends tabs
         $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;
+    }
   }
 
   function execute(){
     $str = "";
-	/* Call parent execute */
-	plugin::execute();
 
     $this->by_object['ogroup']->AddDelMembership();
     $this->reload($this->by_object['ogroup']->gosaGroupObjects);
@@ -167,6 +182,9 @@ class ogrouptabs extends tabs
           break;
       }
     }
+
+    /* Add references/acls/snapshots */
+    $this->addSpecialTabs();
   }
 
 
@@ -225,6 +243,10 @@ class ogrouptabs extends tabs
     }
 
     tabs::save();
+
+    /* Fix tagging if needed */
+		$baseobject->dn= $new_dn;
+    $baseobject->handle_object_tagging();
   }
 
 }