From 12b6f6ad872dd5239874e52feb2e9fdd0b5869c3 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 30 Nov 2005 12:16:55 +0000
Subject: [PATCH] Fixed acls for sambaa tab

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2153 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/admin/groups/acl_definition.inc       | 29 ++++++++++---
 plugins/personal/samba/class_sambaAccount.inc | 22 +++++-----
 plugins/personal/samba/samba3.tpl             | 41 ++++++++++++-------
 3 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index a0ccd2b97..3b2e9fabb 100644
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -166,27 +166,44 @@ $ACLD['samba']=      array("acctFlags",
 			"temporary_disable");
 
 $ACLD['samba'] = array (
+			 	        "sambaHomePath"		,//=> _("Home path"), 
+						"sambaHomeDrive"	,//=> _("Home drive"), 
+						"sambaDomainName"	,//=> _("Samba domain name"),
+						"sambaLogonScript"	,//=> _("Logon script"),
+				        "sambaProfilePath"	,//=> _("Profile path"),	 
+
 						"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")
+
+						"inherit",//				=> _("Inherit client config")
+						"tslogin",//				=> _("Inherit client config")
+		
+						"CtxWFHomeDir",
+						"CtxWFHomeDirDrive",
+						"CtxWFProfilePath",
+
+						"CtxMaxConnectionTime",
+						"CtxMaxDisconnectionTime",
+						"CtxMaxIdleTime",
+
+						"CtxInitialProgram",
+						"CtxWorkDirectory"
+				
 						) ;
 
 
diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index df2cba2e4..5237cc925 100644
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -565,17 +565,17 @@ class sambaAccount extends plugin
       $smarty->assign("flagsK", "");
     }
     
-    $smarty->assign("allow_pwchangeACL", chkacl($this->acl, "allow_pwchange"));
-    $smarty->assign("password_expiresACL", chkacl($this->acl, "password_expires"));
-    $smarty->assign("no_password_requiredACL", chkacl($this->acl, "no_password_required"));
-    $smarty->assign("temporary_disableACL", chkacl($this->acl, "temporary_disable"));
-    $smarty->assign("sambaDomainNameACL", chkacl($this->acl, "sambaDomainName"));
-    $smarty->assign("logon_time_setACL", chkacl($this->acl, "logon_time_set"));
-    $smarty->assign("logoff_time_setACL", chkacl($this->acl, "logoff_time_set"));
-    $smarty->assign("kickoff_time_setACL", chkacl($this->acl, "kickoff_time_set"));
-    $smarty->assign("sambaLogonTimeACL", chkacl($this->acl, "sambaLogonTime"));
-    $smarty->assign("sambaLogoffTimeACL", chkacl($this->acl, "sambaLogoffTime"));
-    $smarty->assign("sambaKickoffTimeACL", chkacl($this->acl, "sambaKickoffTime"));
+    $smarty->assign("allow_pwchangeACL",        chkacl($this->acl, "allow_pwchange"));
+    $smarty->assign("password_expiresACL",      chkacl($this->acl, "password_expires"));
+    $smarty->assign("no_password_requiredACL",  chkacl($this->acl, "no_password_required"));
+    $smarty->assign("temporary_disableACL",     chkacl($this->acl, "temporary_disable"));
+    $smarty->assign("sambaDomainNameACL",       chkacl($this->acl, "sambaDomainName"));
+    $smarty->assign("logon_time_setACL",        chkacl($this->acl, "logon_time_set"));
+    $smarty->assign("logoff_time_setACL",       chkacl($this->acl, "logoff_time_set"));
+    $smarty->assign("kickoff_time_setACL",      chkacl($this->acl, "kickoff_time_set"));
+    $smarty->assign("sambaLogonTimeACL",        chkacl($this->acl, "sambaLogonTime"));
+    $smarty->assign("sambaLogoffTimeACL",       chkacl($this->acl, "sambaLogoffTime"));
+    $smarty->assign("sambaKickoffTimeACL",      chkacl($this->acl, "sambaKickoffTime"));
 
 
     /* In case of javascript, disable some fields on demand */
diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl
index 6413570ff..485c6324b 100644
--- a/plugins/personal/samba/samba3.tpl
+++ b/plugins/personal/samba/samba3.tpl
@@ -60,24 +60,33 @@
   <td style="vertical-align:top;width:50%">
    <input type=checkbox name="tslogin" id="tslogin" value="1" {$tslogin} {$tsloginACL}
    	onclick="
-		changeState('CtxWFHomeDir');
-		changeState('CtxWFHomeDirDrive');
-		changeState('CtxWFProfilePath');
-		changeState('inherit');
+		
+		{if $connectclientdrivesACL==""}	changeState('CtxWFHomeDir');		{/if}
+		{if $CtxWFHomeDirDriveACL==""} 		changeState('CtxWFHomeDirDrive');	{/if}
+		{if $CtxWFProfilePathACL==""} 		changeState('CtxWFProfilePath'); 	{/if}
+
+		{if $inheritACL==""}				
+		changeState('inherit');				
 		changeTripleSelectState_2nd_neg('tslogin','inherit','CtxInitialProgram');
 		changeTripleSelectState_2nd_neg('tslogin','inherit','CtxWorkDirectory');
-		changeState('CtxMaxConnectionTimeF');
-		changeState('CtxMaxDisconnectionTimeF');
-		changeState('CtxMaxIdleTimeF');
+		{/if}
+		
+		{if $CtxMaxConnectionTimeACL==""}      	changeState('CtxMaxConnectionTimeF'); 	{/if}
+		{if $CtxMaxDisconnectionTimeACL==""}   	changeState('CtxMaxDisconnectionTimeF');{/if}
+		{if $CtxMaxIdleTimeACL==""}      		changeState('CtxMaxIdleTimeF');			{/if}
+	
+		
 		changeTripleSelectState('tslogin','CtxMaxConnectionTimeF','CtxMaxConnectionTime');
 		changeTripleSelectState('tslogin','CtxMaxDisconnectionTimeF','CtxMaxDisconnectionTime');
 		changeTripleSelectState('tslogin','CtxMaxIdleTimeF','CtxMaxIdleTime');
-		changeState('connectclientdrives');
-		changeState('connectclientprinters');
-		changeState('defaultprinter');
-		changeState('shadow');
-		changeState('brokenconn');
-		changeState('reconn');
+	
+		{if $connectclientdrivesACL==""}	changeState('connectclientdrives');		{/if}
+		{if $connectclientprintersACL==""}	changeState('connectclientprinters');	{/if}
+		{if $defaultprinterACL==""}			changeState('defaultprinter');			{/if}
+		
+		{if $shadowACL == "" }				changeState('shadow'); 				{/if}
+		{if $brokenconnACL == "" }          changeState('brokenconn');			{/if}
+		{if $reconnACL == "" }              changeState('reconn');				{/if}
 	">
    <i>{t}Allow login on terminal server{/t}</i>
    <table summary="">
@@ -103,13 +112,15 @@
    &nbsp;
   </td>
   <td style="vertical-align:top;">
-   <input type=checkbox id="inherit" name="inherit" {$inherit} {$inheritACL} onclick="changeState('CtxInitialProgram'); changeState('CtxWorkDirectory')" {$tsloginstate}>
+   <input type=checkbox id="inherit" name="inherit" {$inherit} {$inheritACL} 
+	onclick="{if $CtxInitialProgramACL ==""}changeState('CtxInitialProgram');{/if}
+			 {if $CtxWorkDirectoryACL ==""}changeState('CtxWorkDirectory');{/if}" {$tsloginstate}>
    <i>{t}Inherit client config{/t}</i>
    <table summary="">
     <tr>
      <td><label for="CtxInitialProgram">{t}Initial program{/t}</label></td>
      <td>
-      <input id="CtxInitialProgram" name="CtxInitialProgram" size=35 maxlength=60 {if $CtxInitialProgramACL==""}{$CtxInitialProgramMode}{/if} value="{$CtxInitialProgram}" {$CtxInitialProgramACL} {$tsloginstate} {$inheritstate}>
+      <input id="CtxInitialProgram" name="CtxInitialProgram" size=35 maxlength=60 {if $CtxInitialProgramACL==""}{$CtxInitialProgramMode}{/if} value="{$CtxInitialProgram}" {$CtxInitialProgramACL} .  {$tsloginstate} . {$inheritstate}>
      </td>
     </tr>
     <tr>
-- 
2.30.2