From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 26 Nov 2008 13:40:46 +0000 (+0000)
Subject: Updated samba handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=15005034e54905478ec1cb51f70496282c77d141;p=gosa.git

Updated samba handling
-sambaHomeDrive can be empty.


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

diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index 42b84c089..e366f9848 100644
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -508,7 +508,7 @@ class sambaAccount extends plugin
       }
       $smarty->assign("domains", $domains);
     }
-    $letters= array();
+    $letters= array("");
     for ($i= 68; $i<91; $i++){
       $letters[]= chr($i).":";
     }
@@ -750,6 +750,14 @@ class sambaAccount extends plugin
 
     if ($this->samba3){
 
+      /* sambaHomePath requires sambaHomeDrive and vice versa */
+      if(!empty($this->sambaHomePath) && empty($this->sambaHomeDrive)){
+        $message[]= msgPool::required(_("Home drive"));
+      }
+      if(!empty($this->sambaHomeDrive) && empty($this->sambaHomePath)){
+        $message[]= msgPool::required(_("Home path"));
+      }
+
       /* Strings */
       foreach (array( "sambaHomePath" => _("Home directory"),
             "sambaProfilePath" => _("Profile path")) as $key => $val){
diff --git a/gosa-plugins/samba/personal/samba/samba3.tpl b/gosa-plugins/samba/personal/samba/samba3.tpl
index 64ee0a3b1..aecc65815 100644
--- a/gosa-plugins/samba/personal/samba/samba3.tpl
+++ b/gosa-plugins/samba/personal/samba/samba3.tpl
@@ -17,7 +17,6 @@
 {/render}
 {render acl=$sambaHomeDriveACL  checkbox=$multiple_support checked=$use_sambaHomeDrive}
       <select size="1" name="sambaHomeDrive">
-       <option disabled>&nbsp;</option>
        {html_options values=$drives output=$drives selected=$sambaHomeDrive}
       </select>
 {/render}
@@ -110,7 +109,6 @@
 {/render}
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_CtxWFHomeDirDrive}
       <select size="1" id="CtxWFHomeDirDrive" name="CtxWFHomeDirDrive"  {$tsloginstate}>
-       <option disabled>&nbsp;</option>
        {html_options values=$drives output=$drives selected=$CtxWFHomeDirDrive}
       </select>
 {/render}