Tidy

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

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 32ff64268d9b4dea49e1e046eff84014b8c4f28c..55efea49c9ec5af05ea07c8649f2772fdee75b7f 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -228,7 +228,7 @@ class user extends plugin
     $smarty->assign("year", $date["year"]);
 
     /* Assign sex */
-    $sex= array(0 => "", "F" => _("female"), "M" => _("male"));
+    $sex= array(0 => " ", "F" => _("female"), "M" => _("male"));
     $smarty->assign("gender_list", $sex);
 
     /* Get random number for pictures */

diff --git a/plugins/personal/posix/generic.tpl b/plugins/personal/posix/generic.tpl
index b76447a2536025ce224b126090e5de8253ff1552..91300d7025325a641936fcdc8d1f5cdd3eda2917 100644 (file)
--- a/plugins/personal/posix/generic.tpl
+++ b/plugins/personal/posix/generic.tpl
@@ -128,7 +128,7 @@
    <select style="width:350px;" id="wslist" name="workstation_list[]" size=4 multiple {$trustmodeACL} {$trusthide}>
     {html_options values=$workstations output=$workstations}
        {if $emptyArrAccess}
-               <option>
+               <option disabled>&nbsp;</option>
        {/if}
    </select>
    <br>

diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index b8ac7c5c0aec083dbce6ed2f335994074592a1bb..5342999495c4efa1de2f7db3698630a70fc3e5f4 100644 (file)
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -499,6 +499,11 @@ class sambaAccount extends plugin
       /* Fill sambaUserWorkstations */
       $ws= split(",", $this->sambaUserWorkstations);
       sort($ws);
+      
+      /* Tidy checks for empty option, and smarty will produce one if array[0]="" */
+      if(($ws[0]=="")&&(count($ws)==1)) $ws=array();
+
+
       $smarty->assign("workstations", $ws);
       $smarty->assign("sambaUserWorkstationACL", chkacl($this->acl,"sambauserworkstation"));
     }

diff --git a/plugins/personal/samba/samba2.tpl b/plugins/personal/samba/samba2.tpl
index f77bf6727f81e46997b58d5672238a9fb985428e..7ad198e717256a8b3aef2c0d520718516134e059 100644 (file)
--- a/plugins/personal/samba/samba2.tpl
+++ b/plugins/personal/samba/samba2.tpl
@@ -14,7 +14,7 @@
      <td>
       <input name="smbHome" size=30 maxlength=60 {$smbHomeACL} value="{$smbHome}">
       <select size="1" name="homeDrive" {$homeDriveACL}>
-       <option></option>
+       <option disabled>&nbsp;</option>
        {html_options values=$drives output=$drives selected=$homeDrive}
       </select>
      </td>

diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl
index a9fece1821851f45350a092242feb3e1dafdce5b..973c3a609c05c5aa2e7b82bdc93ff4e94f85ea5d 100644 (file)
--- a/plugins/personal/samba/samba3.tpl
+++ b/plugins/personal/samba/samba3.tpl
@@ -14,7 +14,7 @@
      <td>
       <input name="sambaHomePath" size=30 maxlength=60 {$sambaHomePathACL} value="{$sambaHomePath}">
       <select size="1" name="sambaHomeDrive" {$sambaHomeDriveACL}>
-       <option></option>
+       <option disabled>&nbsp;</option>
        {html_options values=$drives output=$drives selected=$sambaHomeDrive}
       </select>
      </td>
@@ -66,7 +66,7 @@
      <td>
       <input name="CtxWFHomeDir" size=30 maxlength=60 {$CtxWFHomeDirACL} value="{$CtxWFHomeDir}">
       <select size="1" name="CtxWFHomeDirDrive" {$CtxWFHomeDirDriveACL}>
-       <option></option>
+       <option disabled>&nbsp;</option>
        {html_options values=$drives output=$drives selected=$CtxWFHomeDirDrive}
       </select>
      </td>