Fixed ACL stuff

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

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index 8f93a5f63a151970b24c338865816cd597223765..634a28ea4e01eaeac3e774b605b79f7d85694e8d 100644 (file)
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -164,6 +164,32 @@ $ACLD['samba']=      array("acctFlags",
                        "scriptPath",
                        "smbHome",
                        "temporary_disable");
+
+$ACLD['samba'] = array (
+                                               "sambaLogonTime"        => _("Limit Logon Time"),
+                                               "sambaLogoffTime"       => _("Limit Logoff Time"), 
+                                               "sambaKickoffTime"      => _("Account expiry"),         
+                                               "sambaPwdCanChange"     => _("Can change password"),
+                                               "sambaPwdMustChange"=> _("Password expiry"), 
+                                       "sambaHomePath"         => _("Home path"), 
+                                               "sambaHomeDrive"        => _("Home drive"), 
+                                               "sambaLogonScript"      => _("Logon script"),
+                                       "sambaProfilePath"      => _("Profile path"),    
+                                               "sambaDomainName"       => _("Samba domain name"),
+                                               "allow_pwchange"        => _("Allow password change"),
+                                               "no_password_required" => _("Login from windows client requires no password"),
+                                               "temporary_disable" => _("Lock account"),
+                                               "sambaUserWorkstation"=> _("Allow connection from these workstations only"),
+                                               "connectclientdrives"   => _("Connect client drives at logon"),
+                                               "connectclientprinters" => _("Connect client printers at logon"),
+                                               "defaultprinter"                => _("Default to main client printer"),
+                                               "shadow"                                => _("Shadowing"),
+                                               "brokenconn"                    => _("On broken or timed out"),
+                                               "reconn"                                => _("Reconnect if disconnected"),
+                                               "inherit"                               => _("Inherit client config")
+                                               ) ;
+
+
 $ACLD['proxy']=      array("gosaProxyAcctFlags",
                        "gosaProxyWorkingStart",
                        "gosaProxyWorkingStop");

diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index d64aff27ab9e4c697015ff2c234f6b374d63e749..df2cba2e4dedce2f1021ba790ef447984e590dc5 100644 (file)
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -512,7 +512,7 @@ class sambaAccount extends plugin
 
 
       $smarty->assign("workstations", $ws);
-      $smarty->assign("sambaUserWorkstationACL", chkacl($this->acl,"sambauserworkstation"));
+      $smarty->assign("sambaUserWorkstationACL", chkacl($this->acl,"sambaUserWorkstation"));
     }
 
     /* Variables */

diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl
index 7191386ee608131955ff77219561d68875bb78d6..6413570ff0f654a008251e4fb53bd5657126af55 100644 (file)
--- a/plugins/personal/samba/samba3.tpl
+++ b/plugins/personal/samba/samba3.tpl
@@ -241,7 +241,7 @@
    <input id="temporary_disable" type=checkbox name="temporary_disable" value="1" {$flagsD} {$temporary_disableACL}>
    <label for="temporary_disable">{t}Lock samba account{/t}</label>
    <br>
-   <input id="password_expires" type=checkbox name="password_expires" value="1" {$flagsC} {$password_expiresACL}>
+   <input id="password_expires" type=checkbox name="password_expires" value="1" {$flagsC} {$sambaPwdMustChangeACL}>
    <label for="password_expires">{t}Password expires on{/t}</label>
    <select name=day onChange="createResult(this.form,this.form.sambaPwdMustChange);" {$sambaPwdMustChangeACL}>
     {html_options values=$days output=$days selected=$day}
@@ -253,7 +253,7 @@
     {html_options values=$years output=$years selected=$year}
    </select>
    <br>
-   <input id="logon_time_set" type=checkbox name="logon_time_set" value="1" {$flagsT} {$logon_time_setACL}>
+   <input id="logon_time_set" type=checkbox name="logon_time_set" value="1" {$flagsT} {$sambaLogonTimeACL}>
    <label for="logon_time_set">{t}Limit Logon Time{/t}</label>
    <select name=sambaLogonTime_day onChange="createResult_sambaLogonTime(this.form,this.form.sambaLogonTime);" {$sambaLogonTimeACL}>
    {html_options values=$sambaLogonTime_days output=$sambaLogonTime_days selected=$sambaLogonTime_day}
@@ -265,7 +265,7 @@
    {html_options values=$sambaLogonTime_years output=$sambaLogonTime_years selected=$sambaLogonTime_year}
    </select>
    <br>
-   <input id="logoff_time_set" type=checkbox name="logoff_time_set" value="1" {$flagsO} {$logoff_time_setACL}>
+   <input id="logoff_time_set" type=checkbox name="logoff_time_set" value="1" {$flagsO} {$sambaLogoffTimeACL}>
    <label for="logoff_time_set">{t}Limit Logoff Time{/t}</label>
    <select name=sambaLogoffTime_day onChange="createResult_sambaLogoffTime(this.form,this.form.sambaLogoffTime);" {$sambaLogoffTimeACL}>
    {html_options values=$sambaLogoffTime_days output=$sambaLogoffTime_days selected=$sambaLogoffTime_day}
@@ -277,7 +277,8 @@
    {html_options values=$sambaLogoffTime_years output=$sambaLogoffTime_years selected=$sambaLogoffTime_year}
    </select>
    <br>
-   <input id="kickoff_time_set" type=checkbox name="kickoff_time_set" value="1" {$flagsK} {$kickoff_time_setACL}>
+   
+   <input id="kickoff_time_set" type=checkbox name="kickoff_time_set" value="1" {$flagsK} {$sambaKickoffTimeACL}>
    <label for="kickoff_time_set">{t}Account expires after{/t}</label>
    <select name=sambaKickoffTime_day onChange="createResult_sambaKickoffTime(this.form,this.form.sambaKickoffTime);" {$sambaKickoffTimeACL}>
    {html_options values=$sambaKickoffTime_days output=$sambaKickoffTime_days selected=$sambaKickoffTime_day}