* Modified filter to match on a single "." in the begining of a string for

  kiosk profiles.
* Fixed display of kernels

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

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

diff --git a/plugins/admin/systems/workstationStartup.tpl b/plugins/admin/systems/workstationStartup.tpl
index cfb1112dad947fc11520520574af24202e914f01..98c709cca9cc3808fa988aa96456465485a4f277 100644 (file)
--- a/plugins/admin/systems/workstationStartup.tpl
+++ b/plugins/admin/systems/workstationStartup.tpl
@@ -13,7 +13,7 @@
      <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 options=$gotoBootKernels selected=$gotoBootKernel}
+         {html_options values=$gotoBootKernels output=$gotoBootKernels selected=$gotoBootKernel}
          <option disabled>&nbsp;</option>
        </select>
       </td>

diff --git a/plugins/personal/environment/class_kioskManagementDialog.inc b/plugins/personal/environment/class_kioskManagementDialog.inc
index 107af006611388d184d48eb4300bf908aaa543cf..33d577c289a840d0b2b8d2e5fe0bb2bd84d10927 100644 (file)
--- a/plugins/personal/environment/class_kioskManagementDialog.inc
+++ b/plugins/personal/environment/class_kioskManagementDialog.inc
@@ -137,7 +137,7 @@ class kioskManagementDialog extends plugin
     }else{
       $a_return = array();
       while($file = readdir($dir)){
-        if(!(($file==".")||($file==".."))){
+        if(!preg_match("/^\./", $file)){
           $name = $file;
           $a_return[$name] = $name;
         }