Added Option to lock account (flag 'L' in sambaAcctFlags if sambaVer=3.x)

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

diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index 8b5cf10a7bf1365e65fae675c577af22ebdcb15d..2fc31e6f52ebeac3e7d35cbe809ac2a5c050c301 100644 (file)
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -496,8 +496,11 @@ class sambaAccount extends plugin
     }
 
     /* Checkboxes */
-    foreach(array(  "N" => "no_password_required",
-          "D" => "temporary_disable") as $key => $val){
+    foreach(array(  
+              "N" => "no_password_required",
+              "D" => "temporary_disable",
+              "L" => "automatically_disable") 
+          as $key => $val){
       if (is_integer(strpos($this->sambaAcctFlags, "$key"))) {
         $smarty->assign("flags$key", "checked");
       } else {
@@ -512,7 +515,7 @@ class sambaAccount extends plugin
       $smarty->assign("flagsC", "checked");
     }
     if ($this->logon_time_set=="1"){
-      $smarty->assign("flagsL", "checked");
+      $smarty->assign("flagsT", "checked");
     }
     if ($this->logoff_time_set=="1"){
       $smarty->assign("flagsO", "checked");

diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl
index ceea6c9f152d11f318170060577d84b2c2a5a4ab..93e5d20ff5071ead20acb3bd8362fc03b4fc4758 100644 (file)
--- a/plugins/personal/samba/samba3.tpl
+++ b/plugins/personal/samba/samba3.tpl
@@ -220,6 +220,9 @@
    <br>
    <input type=checkbox name="temporary_disable" value="1" {$flagsD} {$temporary_disableACL}>
    {t}Temporary disable samba account{/t}
+   <br>
+        <input type=checkbox name="automatically_disable" value="1" {$flagsL} {$automatically_disableACL}>
+   {t}Lock samba account{/t}
    <br>
    <input type=checkbox name="password_expires" value="1" {$flagsC} {$password_expiresACL}>
    {t}Password expires on{/t}
@@ -233,7 +236,7 @@
     {html_options values=$years output=$years selected=$year}
    </select>
    <br>
-   <input type=checkbox name="logon_time_set" value="1" {$flagsL} {$logon_time_setACL}>
+   <input type=checkbox name="logon_time_set" value="1" {$flagsT} {$logon_time_setACL}>
    {t}Limit Logon Time{/t}
    <select name=sambaLogonTime_day onChange="createResult_sambaLogonTime(this.form,this.form.sambaLogonTime);" {$sambaLogonTimeACL}>
    {html_options values=$sambaLogonTime_days output=$sambaLogonTime_days selected=$sambaLogonTime_day}
@@ -280,7 +283,7 @@
   <td style="vertical-align:top;">
    {t}Allow connection from these workstations only{/t}
    <br>
-   <select style="width:350px;" name="workstation_list[]" size=8 multiple {$sambaUserWorkstationACL}>
+   <select style="width:350px;" name="workstation_list[]" size=10 multiple {$sambaUserWorkstationACL}>
     {html_options values=$workstations output=$workstations}
    </select>
    <br>