From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 11 Apr 2006 06:44:34 +0000 (+0000)
Subject: * Modified filter to match on a single "." in the begining of a string for
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1211bfc60d8a9f6514f6578ad6e5dca758c25478;p=gosa.git

* 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 9d3897710..6f332c1b6 100644
--- 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 cfb1112da..98c709cca 100644
--- 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 107af0066..33d577c28 100644
--- 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;
         }