X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fogroups%2Ftabs_ogroups.inc;h=d0659618d68230ddc83ebc75b9292e4fb2867a00;hb=c742134f3925bc3ac583d4a0d02b169b98a33a98;hp=33346fbf17311d3756a106a146bb1432ba70cf86;hpb=48f5da5bdbd9f4b258e22996adfc309c64856bed;p=gosa.git

diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index 33346fbf1..d0659618d 100644
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -11,9 +11,10 @@ class ogrouptabs extends tabs
      * but there is no user left with goPhoneAccount ... remove it.
      */
     $usePhoneTab = false;
+    $o_cache = $this->by_object['ogroup']->objcache;
     foreach($this->by_object['ogroup']->memberList as $dn => $val){
-      if(isset($val['objectClass'])){
-        if(in_array("goFonAccount",$val['objectClass'])){
+      if(isset($o_cache[$dn]['objectClass'])){
+        if(in_array("goFonAccount",$o_cache[$dn]['objectClass'])){
           $usePhoneTab = true;
         }
       }
@@ -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,18 +40,25 @@ 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();
+      $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
      * but only if there is currently no queue enabled.
      */
+    $o_cache = $this->by_object['ogroup']->objcache;
     if(!isset($this->by_object['phonequeue'])){
       foreach($this->by_object['ogroup']->memberList as $dn => $val){
-        if(isset($val['objectClass'])){
-          if(in_array("goFonAccount",$val['objectClass'])){
+        if(isset($o_cache[$dn]['objectClass'])){
+          if(in_array("goFonAccount",$o_cache[$dn]['objectClass'])){
             require_once("class_phonequeue.inc");
             $this->by_name['phonequeue']= _("Phone queue");
             $this->by_object['phonequeue']= new phonequeue($this->config, $this->dn);
@@ -69,17 +76,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;
       }
     }
@@ -91,8 +101,24 @@ 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']= _("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(){
@@ -127,9 +153,10 @@ class ogrouptabs extends tabs
           case "U":
             /* Append a PhoneQueue, if objectClass = goFonAccount */
             $use = false;
+          $o_cache = $this->by_object['ogroup']->objcache;
           foreach($this->by_object['ogroup']->memberList as $dn => $val){
-            if(isset($val['objectClass'])){
-              if(in_array("goFonAccount",$val['objectClass'])){
+            if(isset($o_cache[$dn]['objectClass'])){
+              if(in_array("goFonAccount",$o_cache[$dn]['objectClass'])){
                 $use = true; 
               }
             }
@@ -157,12 +184,13 @@ class ogrouptabs extends tabs
           break;
       }
     }
+    $this->reload($this->by_object['ogroup']->gosaGroupObjects);
   }
 
 
   function check()
   {
-    return (tabs::check(TRUE));
+    return (tabs::check(FALSE));
   }
 
 
@@ -176,10 +204,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;
       }
 
@@ -215,6 +244,20 @@ class ogrouptabs extends tabs
     }
 
     tabs::save();
+
+    /* Fix tagging if needed */
+		$baseobject->dn= $new_dn;
+    $baseobject->handle_object_tagging();
+  }
+
+  function saveCopyDialog()
+  {
+    tabs::saveCopyDialog();
+    $baseobject= $this->by_object['ogroup'];
+    $cn = $baseobject->cn;
+    foreach($this->by_object as  $name => $obj){
+      $this->by_object[$name]->cn = $cn;
+    }
   }
 
 }