Updated Terminal Service/Startup

-Inherit/default modifications.

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

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
index 6d752007eefc45f774d05b6b646b6d22d292c270..2f8141c64aed94ae7f5b451d83b4e086aaf9068f 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
@@ -166,7 +166,9 @@ class termservice extends plugin
 
     /* Terminal server methods 
      */
-    $this->XMethods["default"]= _("default");
+    if($this->is_ogroup_member){
+      $this->XMethods["default"]= _("inherited");
+    }
     $this->XMethods["xdmcp"]  = _("XDMCP");
     $this->XMethods["ldm"]    = _("LDM");
     $this->XMethods["rdp"]    = _("Windows RDP");

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
index 2e7675e2fc0e261e7578147280e1055a02070077..0099181296652aa66fc95f284d5134517d087ffe 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
@@ -9,7 +9,7 @@ class termstartup extends plugin
   /* Generic terminal attributes */
   var $bootmode= "G";
   var $goLdapServerList= array();
-  var $gotoBootKernel= "default-inherit";
+  var $gotoBootKernel= "default";
   var $gotoKernelParameters= "";
   var $gotoLdapServer= "";
   var $gotoModules= array();
@@ -42,7 +42,7 @@ class termstartup extends plugin
   {
     plugin::plugin ($config, $dn, $parent);
 
-    $this->gotoBootKernels = array("default-inherit"=>"["._("inherited")."]");
+    $this->gotoBootKernels = array("default"=> ("default"));
 
     /* Get arrays */
     foreach (array("gotoModules") as $val){
@@ -141,15 +141,17 @@ class termstartup extends plugin
     $ldap->cd($this->config->current['BASE']);
     $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".LDAP::prepare4filter($this->dn)."))");
     if ($ldap->count() == 1){
-      $map= array("gotoLdapServer");
+      $map= array("gotoLdapServer","gotoBootKernel");
       $attrs= $ldap->fetch();
 
       foreach ($map as $name){
         if (!isset($attrs[$name][0])){
           continue;
         }
-
         switch ($name){
+          case 'gotoBootKernel':
+            $this->gotoBootKernels["default"] = "["._("inherited")."]"; 
+          break;
           case 'gotoLdapServer':
             $this->goLdapServerList= array_merge(array('default-inherit' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
             break;
@@ -458,7 +460,7 @@ class termstartup extends plugin
 
     /* Strip out 'default' values */
     foreach(array("gotoBootKernel") as $value){
-      if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default-inherit"){
+      if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default"){
         $this->attrs[$value] = array();
       } 
     }