X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Ftabs_terminal.inc;h=cac248e2ec5f80e7b5a332908440beddba8d9573;hb=83bf4784d9c121ae787dd9b266a24ae2f56c7b83;hp=52513f9ee7a928fee6589be2cdcf53539e608b71;hpb=e299f0ca47a924516f2afbe4e922f2418b75315c;p=gosa.git

diff --git a/plugins/admin/systems/tabs_terminal.inc b/plugins/admin/systems/tabs_terminal.inc
index 52513f9ee..cac248e2e 100644
--- a/plugins/admin/systems/tabs_terminal.inc
+++ b/plugins/admin/systems/tabs_terminal.inc
@@ -5,7 +5,25 @@ class termtabs extends tabs
 
   function termtabs($config, $data, $dn)
   {
-    tabs::tabs($config, $data, $dn);
+    /* Save dn */
+    $this->dn= $dn;
+    $this->config= $config;
+
+    foreach ($data as $tab){
+      if($tab['CLASS'] == "printgeneric"){
+        $this->by_name[$tab['CLASS']]= $tab['NAME'];
+        $this->by_object[$tab['CLASS']]= new $tab['CLASS']($this->config, $this->dn,$this);
+        $this->by_object[$tab['CLASS']]->parent= &$this;
+      }else{
+        $this->by_name[$tab['CLASS']]= $tab['NAME'];
+        $this->by_object[$tab['CLASS']]= new $tab['CLASS']($this->config, $this->dn);
+        $this->by_object[$tab['CLASS']]->parent= &$this;
+      }
+      /* Initialize current */
+      if ($this->current == ""){
+        $this->current= $tab['CLASS'];
+      }
+    }
   }
 
   function save_object($save_current= FALSE)
@@ -13,8 +31,16 @@ class termtabs extends tabs
     tabs::save_object($save_current);
 
     /* Update reference, transfer variables */
-    $this->by_object['termstartup']->gotoTerminalPath=
-      $this->by_object['termgeneric']->gotoTerminalPath;
+    if(isset($this->by_object['termstartup'])){
+      $this->by_object['termstartup']->gotoTerminalPath=
+        $this->by_object['termgeneric']->gotoTerminalPath;
+    }
+   
+    /* Assign current cn to all other plugins */ 
+    $baseobject= $this->by_object['termgeneric'];
+    foreach ($this->by_object as $key => $obj){
+      $this->by_object[$key]->cn= $baseobject->cn;
+    }
   }
 
 
@@ -24,6 +50,7 @@ class termtabs extends tabs
        'dn' to all plugins */
     $baseobject= $this->by_object['termgeneric'];
     $this->dn= "cn=".$baseobject->cn.",ou=terminals,ou=systems,".$baseobject->base;
+    $baseobject->dn= $this->dn;
 
     foreach ($this->by_object as $key => $obj){
       $this->by_object[$key]->dn= $this->dn;
@@ -31,6 +58,14 @@ class termtabs extends tabs
     }
 
     tabs::save(TRUE);
+    if(isset($this->by_object['printgeneric'])){
+      if(($this->by_object['printgeneric']->is_account==false)&&($this->by_object['printgeneric']->initially_was_account==true)){
+        $this->by_object['printgeneric']->remove_from_parent();
+      }
+    }
+
+    /* Fix tagging if needed */
+    $baseobject->handle_object_tagging();
   }
 
 }