Fixed Terminal inheritance.

-Allow to inherit graphic drivers

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

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
index 0c043fe3c0728d5bb194c26de9c6d0eaee57530c..ab2207e8304b246e20851d8f348a86aa4e3b357a 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
@@ -689,7 +689,7 @@ class termgeneric extends plugin
 
     /* Set workstation service attributes to inherited */
     if($this->member_of_ogroup && isset($this->parent->by_object['termservice'])){
-      foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",
+      foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant","gotoXDriver",
             "gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseport") as $name){
         $this->parent->by_object['termservice']->$name = "default";
       }
@@ -699,9 +699,8 @@ class termgeneric extends plugin
     if($this->member_of_ogroup && isset($this->parent->by_object['termstartup'])){
       $this->parent->by_object['termstartup']->gotoBootKernel = "default-inherited";
       $this->parent->by_object['termstartup']->gotoLdapServer = "default-inherited";
-
-      $this->parent->by_object['workstartup']->gotoLdap_inherit = TRUE;
-      $this->parent->by_object['workstartup']->gotoLdapServers = array();
+      $this->parent->by_object['termstartup']->gotoLdap_inherit = TRUE;
+      $this->parent->by_object['termstartup']->gotoLdapServers = array();
     }
   }
 }

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
index 12edba01f448e04be542226c32ed29fefc8fc706..2f4c305158a3d2c335aef4e822473f5dd7f2d9be 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
@@ -241,7 +241,7 @@ class termservice extends plugin
         "gotoXColordepth", 
         "gotoXKbModel", 
         "gotoXKbLayout",
-#        "gotoXDriver",
+        "gotoXDriver",
         "gotoXdmcpServer",
         "gotoXKbVariant",
         "gotoXMouseType", 
@@ -256,9 +256,9 @@ class termservice extends plugin
         }
 
         switch ($name){
-#         case 'gotoXDriver': 
-#           $this->XDrivers = array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->XDrivers;
-#           break;
+         case 'gotoXDriver': 
+           $this->XDrivers = array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->XDrivers;
+           break;
           case 'gotoXMethod': 
             $this->XMethods = array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->XMethods;
             if(isset($attrs['gotoXdmcpServer'])){
@@ -626,7 +626,12 @@ class termservice extends plugin
         $drivers[] = $driver;
       }
     }
-    return($drivers);
+
+    $tmp = array();
+    foreach($drivers as $name){
+      $tmp[$name] = $name;
+    }
+    return($tmp);
   }
 
   function send_goto_reload()