From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 7 Aug 2006 10:51:09 +0000 (+0000)
Subject: Updated samba3 template
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=484ca4cfba0d50fe50b9760f228e0c3ac0a799e5;p=gosa.git

Updated samba3 template


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

diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index 2d851a2cc..151607111 100644
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -480,7 +480,14 @@ class sambaAccount extends plugin
       if($_SESSION['js']){
         /* Set form elements to disabled/enable state */
         $smarty->assign("tsloginstate", $this->mungedObject->getTsLogin()?"":"disabled");
-        $smarty->assign("inheritstate", $this->mungedObject->getInheritMode()?"disabled":"");
+
+        $smarty->assign("inheritstate", "");
+        if($this->acl_is_writeable("AllowLoginOnTerminalServer")){
+          $smarty->assign("inheritstate", $this->mungedObject->getInheritMode()?"disabled":"");
+        }
+  
+
+  
       }else{
         $smarty->assign("tsloginstate", "");
         $smarty->assign("inheritstate", "");
diff --git a/plugins/personal/samba/main.inc b/plugins/personal/samba/main.inc
index 915ede705..564dc3cd6 100644
--- a/plugins/personal/samba/main.inc
+++ b/plugins/personal/samba/main.inc
@@ -55,16 +55,6 @@ if (!$remove_lock){
     $_SESSION['edit']= TRUE;
   }
 
-  /* Adjust acl's to mode */
-  if (isset($_SESSION['edit'])){
-    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-    $sambaAccount->acl= get_module_permission($acl, "samba", $ui->dn);
-  } else {
-    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-    $editacl= get_module_permission($acl, "samba", $ui->dn);
-    $sambaAccount->acl= "#none#";
-  }
-
   /* save changes to LDAP and disable edit mode */
   if (isset($_POST['edit_finish'])){
 
diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl
index 99f2f1b4b..3e305f01a 100644
--- a/plugins/personal/samba/samba3.tpl
+++ b/plugins/personal/samba/samba3.tpl
@@ -122,7 +122,7 @@
   </td>
   <td style="vertical-align:top;">
 {render acl=$AllowLoginOnTerminalServerACL}
-   <input type=checkbox id="inherit" name="inherit"} {if $inheritstate} checked {/if}
+   <input type=checkbox id="inherit" name="inherit" {if $inheritstate} checked {/if}
 	onClick="changeState('CtxInitialProgram');
  		 changeState('CtxWorkDirectory');"
 	
@@ -350,7 +350,7 @@
 {/render}
    <label for="logoff_time_set">{t}Limit Logoff Time{/t}</label>
 {render acl=$sambaLogoffTimeACL}
-   <select name=sambaLogoffTime_day onChange="createResult_sambaLogoffTime(this.form,this.form.sambaLogoffTime);>"
+   <select name=sambaLogoffTime_day onChange="createResult_sambaLogoffTime(this.form,this.form.sambaLogoffTime);">
    {html_options values=$sambaLogoffTime_days output=$sambaLogoffTime_days selected=$sambaLogoffTime_day}
    </select>
 {/render}