Fixed problem with empty old_cn when creating a new entry. You always can overwrite...

[gosa.git] / plugins / personal / samba / samba3.tpl

diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl
index 7191386ee608131955ff77219561d68875bb78d6..ce9442dd8c3be813bb07e691ce462c9dd86dc7d6 100644 (file)
--- a/plugins/personal/samba/samba3.tpl
+++ b/plugins/personal/samba/samba3.tpl
@@ -3,7 +3,7 @@
  <!-- Headline container -->
  <tr>
   <td colspan="2" style="width:50%; vertical-align:top;">
-   <h2><p class="center"><img class="center" alt="" align="middle" src="images/rightarrow.png"/>&nbsp;{t}Generic{/t}</p></h2>
+   <h2><img class="center" alt="" align="middle" src="images/rightarrow.png"/>&nbsp;{t}Generic{/t}</h2>
   </td>
  </tr>
  <tr>
@@ -53,31 +53,40 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><p class="center"><img class="center" alt="" align="middle" src="images/display.png" />&nbsp;{t}Terminal Server{/t}</p></h2>
+<h2><img class="center" alt="" align="middle" src="images/display.png" />&nbsp;{t}Terminal Server{/t}</h2>
 
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
   <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,19 +112,32 @@
    &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}" 
+               {if ($CtxInitialProgramACL!="" || $tsloginstate!="" || $inheritstate!="") && $CtxInitialProgramACL!=""}
+                       disabled 
+               {/if}
+               >
      </td>
     </tr>
     <tr>
      <td><label for="CtxWorkDirectory">{t}Working directory{/t}</label></td>
      <td>
-      <input id="CtxWorkDirectory" name="CtxWorkDirectory" size=35 maxlength=60 {if $CtxWorkDirectoryACL==""}{$CtxInitialProgramMode}{/if} value="{$CtxWorkDirectory}" {$CtxInitialProgramACL} {$tsloginstate} {$inheritstate}>
+      <input id="CtxWorkDirectory" name="CtxWorkDirectory" size=35 maxlength=60 
+               {if $CtxWorkDirectoryACL==""}
+                       {$CtxInitialProgramMode}
+               {/if} value="{$CtxWorkDirectory}" 
+               {if ($CtxInitialProgramACL=="disabled" || $tsloginstate=="disabled" || $inheritstate=="disabled") && $CtxWorkDirectoryACL!=""}
+                       disabled 
+               {/if}
+               >
      </td>
     </tr>
    </table>
@@ -227,7 +249,7 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><p class="center"><img class="center" alt="" align="middle" src="images/certs.png" />&nbsp;{t}Access options{/t}</p></h2>
+<h2><img class="center" alt="" align="middle" src="images/certs.png" />&nbsp;{t}Access options{/t}</h2>
 
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
  <tr>
@@ -241,7 +263,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 +275,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 +287,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 +299,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}