X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalStartup.inc;h=596cf2bafe009d239bcc8429f4c0a6ca0ea5b3b1;hb=8edf1b0390149b39682c7e02c394fec56940874d;hp=7a02964f21b2b15e9cac8df5a262bdbd8d7a387f;hpb=b73b7ab43a1b732ccf81c6348bffbfe9b01eae76;p=gosa.git

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 7a02964f2..596cf2baf 100644
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -32,11 +32,9 @@ class termstartup extends plugin
   var $orig_dn= "";
   var $ignore_account= TRUE;
 
-  function termstartup ($config, $dn= NULL)
+  function termstartup ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
-
-    $this->gotoBootKernels = array("default"=>"["._("inherited")."]");
+    plugin::plugin ($config, $dn, $parent);
 
     /* Get arrays */
     foreach (array("gotoModules") as $val){
@@ -95,9 +93,22 @@ class termstartup extends plugin
       } else {
         $fh= popen($command, "r");
         while (!feof($fh)) {
-          $buffer= fgets($fh, 256);
+          $buffer= trim(fgets($fh, 256));
+
           if(!empty($buffer)){
-            $this->gotoBootKernels[]= $buffer;
+
+            $name=$value = $buffer;
+
+            if(preg_match("/:/",$buffer)){
+              $name = preg_replace("/:.*$/","",$buffer);
+              $value= preg_replace("/^.*:/","",$buffer);
+              $this->gotoBootKernels[$name]= $name.":".$value;
+            }else{
+              $this->gotoBootKernels[$name]= $value;
+            }
+            if(empty($this->gotoBootKernel)){
+              $this->gotoBootKernel = $name; 
+            }
           }
         }
         pclose($fh);
@@ -107,7 +118,7 @@ class termstartup extends plugin
     $tmp = $this->config->data['SERVERS']['LDAP'];  
     foreach($tmp as $server){
       $visible = $server;
-      if($server == "default"){
+      if($server == "default-inherit"){
         $visible = "["._("inherited")."]";
       }
       $this->goLdapServerList[$server] = $visible;
@@ -118,7 +129,7 @@ class termstartup extends plugin
     $ldap->cd($this->config->current['BASE']);
     $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))");
     if ($ldap->count() == 1){
-      $map= array("gotoLdapServer");
+      $map= array("gotoLdapServer","gotoBootKernel");
       $attrs= $ldap->fetch();
 
       foreach ($map as $name){
@@ -128,7 +139,10 @@ class termstartup extends plugin
 
         switch ($name){
           case 'gotoLdapServer':
-            $this->goLdapServerList= array_merge(array('default' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+            $this->goLdapServerList= array_merge(array('default-inherit' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+            break;
+          case 'gotoBootKernel':
+            $this->gotoBootKernels= array_merge(array('default-inherit' => _("inherited").' ['.$attrs[$name][0].']' ), $this->gotoBootKernels);
             break;
         }
       }
@@ -304,7 +318,7 @@ class termstartup extends plugin
     /* Find proper terminal path for tftp configuration
        FIXME: This is suboptimal when the default has changed to
        another location! */
-    if ($this->gotoTerminalPath == "default"){
+    if ($this->gotoTerminalPath == "default-inherit"){
       $ldap= $this->config->get_ldap_link();
 
       /* Strip relevant part from dn, keep trailing ',' */
@@ -363,7 +377,7 @@ class termstartup extends plugin
 
     /* Strip out 'default' values */
     foreach(array("gotoBootKernel","gotoLdapServer") as $value){
-      if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default"){
+      if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default-inherit"){
         $this->attrs[$value] = array();
       } 
     }