From e8b6259a454cac85731205eeb0c5ebe5bdf49583 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 27 Jun 2005 05:39:30 +0000 Subject: [PATCH] Tidy git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@860 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/personal/generic/class_user.inc | 2 +- plugins/personal/posix/generic.tpl | 2 +- plugins/personal/samba/class_sambaAccount.inc | 5 +++++ plugins/personal/samba/samba2.tpl | 2 +- plugins/personal/samba/samba3.tpl | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index 32ff64268..55efea49c 100644 --- 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 b76447a25..91300d702 100644 --- a/plugins/personal/posix/generic.tpl +++ b/plugins/personal/posix/generic.tpl @@ -128,7 +128,7 @@
diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc index b8ac7c5c0..534299949 100644 --- 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 f77bf6727..7ad198e71 100644 --- a/plugins/personal/samba/samba2.tpl +++ b/plugins/personal/samba/samba2.tpl @@ -14,7 +14,7 @@ diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl index a9fece182..973c3a609 100644 --- a/plugins/personal/samba/samba3.tpl +++ b/plugins/personal/samba/samba3.tpl @@ -14,7 +14,7 @@ @@ -66,7 +66,7 @@ -- 2.30.2