From 2bb9df6143109bae8abf8b588f549a3198a2dc71 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 20 Jul 2006 09:15:32 +0000
Subject: [PATCH] Updated templates for posix

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4253 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/personal/posix/class_posixAccount.inc |  2 +-
 plugins/personal/posix/generic.tpl            | 29 +++++++++-
 plugins/personal/posix/posix_shadow.tpl       | 58 ++++++++++++++++---
 3 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 5fe42c89e..c56e30502 100644
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -401,7 +401,7 @@ class posixAccount extends plugin
       /* remove already assigned groups */
       $glist= array();
       foreach ($this->grouplist as $key => $value){
-        if (!isset($this->groupMembership[$key])){
+        if (!isset($this->groupMembership[$key]) && obj_is_writable($key,"group","memberUid")){
           $glist[$key]= $value;
         }
       }
diff --git a/plugins/personal/posix/generic.tpl b/plugins/personal/posix/generic.tpl
index 83b3083bc..54d00438f 100644
--- a/plugins/personal/posix/generic.tpl
+++ b/plugins/personal/posix/generic.tpl
@@ -6,23 +6,29 @@
     <tr>
      <td><label for="homeDirectory">{t}Home directory{/t}</label>{$must}</td>
      <td>
+	{render acl=$homeDirectoryACL}
       <input id="homeDirectory" name="homeDirectory" size=40 maxlength=120 {$homeDirectoryACL} value="{$homeDirectory}">
+	{/render}
      </td>
     </tr>
     <tr>
      <td><label for="loginShell">{t}Shell{/t}</label></td>
      <td>
+	{render acl=$loginShellACL}
       <select id="loginShell" size="1" name="loginShell" {$loginShellACL}>
        {html_options values=$shells output=$shells selected=$loginShell}
       </select> 
+	{/render}
      </td>
     </tr>
     <tr>
      <td><label for="">{t}Primary group{/t}</label></td>
      <td>
+	{render acl=$gidNumberACL}
       <select id="primaryGroup" size="1" name="primaryGroup" {$gidNumberACL}>
        {html_options options=$secondaryGroups selected=$primaryGroup}
       </select> 
+	{/render}
      </td>
     </tr>
     <tr>
@@ -33,7 +39,9 @@
    <table summary="">
     <tr>
      <td>
+	{render acl=$gidNumberACL}
       <input id="force_ids" type=checkbox name="force_ids" value="1" {$force_ids} {$force_idsACL} onclick="changeState('uidNumber'); changeState('gidNumber');">
+	{/render}
 					</td>
 					<td>
       <label for="force_ids">{t}Force UID/GID{/t}</label>
@@ -43,7 +51,9 @@
 						<label for="uidNumber">{t}UID{/t}</label>
 					</td>
 					<td>
+	{render acl=$gidNumberACL}
 						<input id="uidNumber" name="uidNumber" size=5 maxlength=5 {$forceMode} {$uidNumberACL} value="{$uidNumber}">
+	{/render}
 					</td>
 				</tr>
 				<tr>
@@ -52,7 +62,9 @@
 						<label for="gidNumber">{t}GID{/t}</label>
 					</td>
      <td>
+	{render acl=$gidNumberACL}
 						<input id="gidNumber" name="gidNumber" size=5 maxlength=5 {$forceMode} {$gidNumberACL} value="{$gidNumber}">
+	{/render}
 					</td>
 				</tr>
    </table>
@@ -66,12 +78,18 @@
     <b style="color:red">{t}(Warning: more than 16 groups are not supported by NFS!){/t}</b>
     <br>
    {/if}
+	{render acl=$gidNumberACL}
    <select style="width:100%; height:130px;" name="group_list[]" size=16 multiple {$groupMembershipACL}>
     {html_options options=$groupMembership}
    </select>
+	{/render}
    <br>
+	{render acl=$gidNumberACL}
    <input type=submit value="{t}Add{/t}" name="edit_groupmembership" {$groupMembershipACL}>&nbsp;
+	{/render}
+	{render acl=$gidNumberACL}
    <input type=submit value="{t}Delete{/t}" name="delete_groupmembership" {$groupMembershipACL}>
+	{/render}
   </td>
  </tr>
 </table>
@@ -89,20 +107,29 @@
   </td>
   <td style="vertical-align:top;">
    <h2><img alt="" class="center" align="middle" src="images/closedlock.png" /> {t}System trust{/t}</h2>
-    {t}Trust mode{/t}&nbsp;<select name="trustmode" id="trustmode" size=1 onchange="changeSelectState('trustmode', 'wslist'); changeSelectState('trustmode', 'add_ws'); changeSelectState('trustmode', 'del_ws');" {$trustmodeACL}>
+    {t}Trust mode{/t}&nbsp;
+	{render acl=$gidNumberACL}
+	<select name="trustmode" id="trustmode" size=1 onchange="changeSelectState('trustmode', 'wslist'); changeSelectState('trustmode', 'add_ws'); changeSelectState('trustmode', 'del_ws');" {$trustmodeACL}>
       {html_options options=$trustmodes selected=$trustmode}
     </select>
+	{/render}
+	{render acl=$gidNumberACL}
    <select style="width:100%" id="wslist" name="workstation_list[]" size=8 multiple {$trustmodeACL} {$trusthide}>
     {html_options values=$workstations output=$workstations}
 	{if $emptyArrAccess}
 		<option disabled>&nbsp;</option>
 	{/if}
    </select>
+	{/render}
    <br>
+	{render acl=$gidNumberACL}
    <input type="submit" id="add_ws" value="{t}Add{/t}" name="add_ws"
         {$trustmodeACL} {$trusthide}>&nbsp;
+	{/render}
+	{render acl=$gidNumberACL}
    <input type="submit" id="del_ws" value="{t}Delete{/t}" name="delete_ws"
         {$trustmodeACL} {$trusthide}>
+	{/render}
   </td>
  </tr>
 </table>
diff --git a/plugins/personal/posix/posix_shadow.tpl b/plugins/personal/posix/posix_shadow.tpl
index 2cf44ea82..c489d2116 100644
--- a/plugins/personal/posix/posix_shadow.tpl
+++ b/plugins/personal/posix/posix_shadow.tpl
@@ -1,33 +1,73 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
   <td style="width:50%; vertical-align:top;">
-   <input type=checkbox name="must_change_password" value="1" {$must_change_password} {$must_change_passwordACL}>
+
+<!-- must_change_password  -->
+{render acl=$must_change_passwordACL}
+   <input type=checkbox name="must_change_password" value="1" {$must_change_password}>
+{/render}
    {t}User must change password on first login{/t}
    <br>
-   <input type=checkbox name="use_shadowMin" value="1" {$use_shadowMin} {$shadowMinACL}>
+
+<!-- shadowMin -->
+{render acl=$shadowMinACL}
+   <input type=checkbox name="use_shadowMin" value="1" {$use_shadowMin}>
+{/render}
+{render acl=$shadowMinACL}
    {$shadowmins}
+{/render}
    <br>
-   <input type=checkbox name="use_shadowMax" value="1" {$use_shadowMax} {$shadowMaxACL}>
+
+<!-- use_shadowMax -->
+{render acl=$shadowMaxACL}
+   <input type=checkbox name="use_shadowMax" value="1" {$use_shadowMax}>
+{/render}
+{render acl=$shadowMaxACL}
    {$shadowmaxs}
+{/render}
    <br>
-   <input type=checkbox name="use_shadowExpire" value="1" {$use_shadowExpire} {$shadowExpireACL}>
+
+<!-- use_shadowExpire -->
+{render acl=$shadowExpireACL}
+   <input type=checkbox name="use_shadowExpire" value="1" {$use_shadowExpire}>
+{/render}
    {t}Password expires on{/t}
-   <select name=day onChange="createResult(this.form,this.form.shadowExpire);" {$shadowExpireACL}>
+{render acl=$shadowExpireACL}
+   <select name=day onChange="createResult(this.form,this.form.shadowExpire);">
     {html_options values=$days output=$days selected=$day}
    </select>
-   <select name=month onChange="populate(this.form,this.form.shadowExpire);" {$shadowExpireACL}>
+{/render}
+{render acl=$shadowExpireACL}
+   <select name=month onChange="populate(this.form,this.form.shadowExpire);">
     {html_options options=$months selected=$month}
    </select>
-   <select name=year onChange="populate(this.form,this.form.shadowExpire);" {$shadowExpireACL}>
+{/render}
+{render acl=$shadowExpireACL}
+   <select name=year onChange="populate(this.form,this.form.shadowExpire);">
     {html_options values=$years output=$years selected=$year}
    </select>
+{/render}
+{render acl=$must_change_passwordACL}
    <input type="hidden" name="shadowExpire" value="{$shadowExpire}">
+{/render}
    <br>
-   <input type=checkbox name="use_shadowInactive" value="1" {$use_shadowInactive} {$shadowInactiveACL}>
+
+<!-- shadowInactive -->
+{render acl=$shadowInactiveACL}
+   <input type=checkbox name="use_shadowInactive" value="1" {$use_shadowInactive}>
+{/render}
+{render acl=$shadowInactiveACL}
    {$shadowinactives}
+{/render}
    <br>
-   <input type=checkbox name="use_shadowWarning" value="1" {$use_shadowWarning} {$shadowWarningACL}>
+
+<!-- use_shadowWarning -->
+{render acl=$shadowWarningACL}
+   <input type=checkbox name="use_shadowWarning" value="1" {$use_shadowWarning}>
+{/render}
+{render acl=$shadowWarningACL}
    {$shadowwarnings}
+{/render}
   </td>
  </tr>
 </table>
-- 
2.30.2