Fixed gotoBootKernels to work with 'newlines' and ':' seperators

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

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 54929b931d63b9f440502c39f5f141f4a7b26f3b..9c12a77f64930f8e7e1a42c7044a9baa72ad73a2 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -231,8 +231,11 @@ class workstartup extends plugin
       } else {
         $fh= popen($command, "r");
         while (!feof($fh)) {
-          $buffer= fgets($fh, 256);
-          $this->gotoBootKernels[]= $buffer;
+          $buffer= trim(fgets($fh, 256));
+          
+          if ($buffer != ""){
+            $this->gotoBootKernels[preg_replace('/:.*$/', '', $buffer)]= $buffer;
+          }
         }
         pclose($fh);
         sort($this->gotoBootKernels);

diff --git a/plugins/admin/systems/workstationStartup.tpl b/plugins/admin/systems/workstationStartup.tpl
index 98c709cca9cc3808fa988aa96456465485a4f277..ae77f1aec841ea209d097e37d2d8e8e3c48d6eea 100644 (file)
--- a/plugins/admin/systems/workstationStartup.tpl
+++ b/plugins/admin/systems/workstationStartup.tpl
@@ -12,8 +12,8 @@
     <tr>
      <td><LABEL for="gotoBootKernel">{t}Boot kernel{/t}</LABEL></td>
      <td style="width:70%">
-        <select id="gotoBootKernel" name="gotoBootKernel" {$gotoBootKernelACL} onchange='document.mainform.submit()'>
-         {html_options values=$gotoBootKernels output=$gotoBootKernels selected=$gotoBootKernel}
+        <select id="gotoBootKernel" name="gotoBootKernel" {$gotoBootKernelACL}>
+         {html_options options=$gotoBootKernels selected=$gotoBootKernel}
          <option disabled>&nbsp;</option>
        </select>
       </td>