Fixed inherit / default for terminalStartup

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

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 84c72ffb0cdca81346b7b3830114e68900073f6f..d325b74781be91868baee2c6935406b918953f11 100644 (file)
--- 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= "";
+  var $gotoBootKernel= "default-inherit";
   var $gotoKernelParameters= "";
   var $gotoLdapServer= "";
   var $gotoModules= array();
@@ -36,7 +36,7 @@ class termstartup extends plugin
   {
     plugin::plugin ($config, $dn);
 
-    $this->gotoBootKernels = array("default"=>"["._("inherited")."]");
+    $this->gotoBootKernels = array("default-inherit"=>"["._("inherited")."]");
 
     /* Get arrays */
     foreach (array("gotoModules") as $val){
@@ -95,9 +95,17 @@ class termstartup extends plugin
       } else {
         $fh= popen($command, "r");
         while (!feof($fh)) {
-          $buffer= fgets($fh, 256);
+          $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[]= $buffer;
+            $this->gotoBootKernels[$name]= $value;
           }
         }
         pclose($fh);
@@ -107,7 +115,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;
@@ -128,7 +136,7 @@ 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;
         }
       }
@@ -304,7 +312,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 +371,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();
       } 
     }

diff --git a/plugins/admin/systems/terminalStartup.tpl b/plugins/admin/systems/terminalStartup.tpl
index e45fa874a85cc0039f1b09636471ee324a29492d..6a5d38f02a7c53a1d14f2930071dcff0a50b4083 100644 (file)
--- a/plugins/admin/systems/terminalStartup.tpl
+++ b/plugins/admin/systems/terminalStartup.tpl
@@ -7,7 +7,7 @@
     <tr>
      <td style="width:30%"><LABEL for="gotoBootKernel">{t}Boot kernel{/t}</LABEL></td>
      <td>
-       <select id="gotoBootKernel" name="gotoBootKernel" {$gotoBootKernelACL} onchange='document.mainform.submit()'>
+       <select id="gotoBootKernel" name="gotoBootKernel" {$gotoBootKernelACL}>
        {html_options options=$gotoBootKernels  selected=$gotoBootKernel}
        <option disabled>&nbsp;</option>
        </select>