-Re-added input field for sambaKickoffTime

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

diff --git a/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc b/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc
index fef9a66dab14d541a4408ff361bedc896e8bbe6a..88b9fc2dd0cef7c84d309131d2871e36f20a6c37 100644 (file)
--- a/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc
+++ b/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc
@@ -102,6 +102,10 @@ class netatalk extends plugin {
     $this->get_netatalk_shares(); 
     $this->apple_user_share = $this->selectedshare;
 
+    if(!$this->is_account){
+        $this->apple_user_share = key($this->shares);
+    }
+
     /* Save initial account state */
     $this->initially_was_account = $this->is_account;
   }

diff --git a/gosa-plugins/samba/personal/samba/samba3.tpl b/gosa-plugins/samba/personal/samba/samba3.tpl
index c6eba890936841792c7382d6a6014cab53159634..d0ae6d52d82c4e140fda7c52bdf7af2e813457da 100644 (file)
--- a/gosa-plugins/samba/personal/samba/samba3.tpl
+++ b/gosa-plugins/samba/personal/samba/samba3.tpl
@@ -377,6 +377,34 @@
                 {render acl=$cannotChangePasswordACL  checkbox=$multiple_support checked=$use_cannotChangePassword}
                  <input type='checkbox' value='1' name='flag_cannotChangePassword'
                     {if $flag_cannotChangePassword} checked {/if} id='flag_cannotChangePassword'>
+    </table>
+    <table>
+      <tr>
+        <td colspan=2>
+           {render acl=$sambaKickoffTimeACL  checkbox=$multiple_support checked=$use_sambaKickoffTime}
+             <input id="flag_sambaKickoffTime" type=checkbox name="flag_sambaKickoffTime" value="1" 
+                    {if $flag_sambaKickoffTime} checked {/if} class="center">
+           {/render}
+           <label for="flag_sambaKickoffTime">{t}Account expires after{/t}</label>
+         </td>
+         <td style='width:200px;'>
+           {render acl=$sambaKickoffTimeACL}
+             <input type="text" id="sambaKickoffTime" name="sambaKickoffTime" class="date" style='width:100px' value="{$sambaKickoffTime}">
+                {if $sambaKickoffTimeACL|regex_replace:"/[cdmr]/":"" == "w"}
+                  <script type="text/javascript">
+                    {literal}
+                       var datepicker2 = new DatePicker({ 
+                            relative : 'sambaKickoffTime', 
+                            language : '{/literal}{$lang}{literal}', 
+                            keepFieldEmpty : true, 
+                            enableCloseEffect : false, 
+                            enableShowEffect : false });
+                    {/literal}
+                  </script>
+               {/if}
+            {/render}
+          </td>
+       </tr>
                 {/render}
             </td>
             <td>