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

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 10ef98a06..596cf2baf 100644
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/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= "";
   var $gotoKernelParameters= "";
   var $gotoLdapServer= "";
   var $gotoModules= array();
@@ -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-inherit"=>"["._("inherited")."]");
+    plugin::plugin ($config, $dn, $parent);
 
     /* Get arrays */
     foreach (array("gotoModules") as $val){
@@ -97,15 +95,20 @@ class termstartup extends plugin
         while (!feof($fh)) {
           $buffer= trim(fgets($fh, 256));
 
-          $name=$value = $buffer;
-    
-          if(preg_match("/:/",$buffer)){
-            $name = preg_replace("/:.*$/","",$buffer);
-            $value= preg_replace("/^.*:/","",$buffer);
-          }
-
           if(!empty($buffer)){
-            $this->gotoBootKernels[$name]= $value;
+
+            $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);
@@ -126,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){
@@ -138,6 +141,9 @@ class termstartup extends plugin
           case 'gotoLdapServer':
             $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;
         }
       }
     }