Some group acl fixes

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

diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 8ca3e3ded245c6bc8f7439827066fd9e84f393cb..143675cd1f258bafd63c09845c1ef881f5dc9fc4 100644 (file)
--- a/plugins/admin/groups/class_groupGeneric.inc
+++ b/plugins/admin/groups/class_groupGeneric.inc
@@ -27,7 +27,6 @@ class group extends plugin
   var $members= array();
   var $users= array();
   var $allusers= array();
-  var $department= "";
   var $saved_gidNumber= "";
   var $oldgroupType= "";
   var $orig_dn= "";
@@ -302,7 +301,6 @@ class group extends plugin
 
     $smarty->assign("bases", $this->config->idepartments);
     $smarty->assign("base_select", $this->base);
-    $smarty->assign("department", $this->department);
 
     if ($this->samba3){
       $domains= array();
@@ -516,9 +514,18 @@ class group extends plugin
       plugin::save_object();
 
       $this->force_gid= 0;
-      $this->smbgroup= 0;
-      foreach (array("force_gid", "department", "base", "smbgroup") as $val) {
-        if ($this->acl_is_writeable("$val")  && isset($_POST["$val"])){
+
+
+      /* Only reset sambagroup flag if we are able to write this flag */
+      if($this->acl_is_writeable("sambaGroupType")){
+        $this->smbgroup = 0;
+      }
+
+      foreach (array(
+            "force_gid"  => "gidNumber", 
+            "base"       => "base", 
+            "smbgroup"   => "sambaGroupType") as $val => $aclname) {
+        if ($this->acl_is_writeable($aclname)  && isset($_POST["$val"])){
           $this->$val= $_POST["$val"];
         }
       }
@@ -537,7 +544,7 @@ class group extends plugin
           $this->fon_group= FALSE;
         }
       }
-        if ($this->acl_is_writeable("nagios_group")){
+      if ($this->acl_is_writeable("nagios_group")){
         if (isset ($_POST['nagios_group'])){
           $this->nagios_group= TRUE;
         } else {

diff --git a/plugins/admin/groups/generic.tpl b/plugins/admin/groups/generic.tpl
index e01a561670e4487177fdceae1c8360d13dbe768b..141bcbf58533c502f6d71e7c5ebaed7694bf54a1 100644 (file)
--- a/plugins/admin/groups/generic.tpl
+++ b/plugins/admin/groups/generic.tpl
@@ -6,7 +6,7 @@
      <td><LABEL for="cn">{t}Group name{/t}</LABEL>{$must}</td>
      <td>
 {render acl=$cnACL}
-       <input id="cn" name="cn" size=25 maxlength=60 {$cnACL} value="{$cn}" title="{t}Posix name of the group{/t}">
+       <input id="cn" name="cn" size=25 maxlength=60 value="{$cn}" title="{t}Posix name of the group{/t}">
 {/render}
      </td>
     </tr>
@@ -16,8 +16,7 @@
      </td>
      <td>
 {render acl=$descriptionACL}
-      <input id="description" name="description" size=40 maxlength=80 {$descriptionACL} 
-        value="{$description}" title="{t}Descriptive text for this group{/t}">
+      <input id="description" name="description" size=40 maxlength=80 value="{$description}" title="{t}Descriptive text for this group{/t}">
 {/render}
      </td>
     </tr>
@@ -32,16 +31,14 @@
      </td>
      <td>
 {render acl=$baseACL}
-      <select id="base" size="1" name="base" {$baseACL} title="{t}Choose subtree to place group in{/t}">
+      <select id="base" size="1" name="base" title="{t}Choose subtree to place group in{/t}">
        {html_options options=$bases selected=$base_select}
       </select>
 {/render}
 
-{if $baseSelect}
-      <input type="image" name="chooseBase" src="images/folder.png" class="center" title="{t}Select a base{/t}">
-{else}
-      <img src="images/folder_gray.png" class="center" title="{t}Select a base{/t}" alt='&nbsp;'>
-{/if}
+{render acl=$baseACL disable_picture='images/folder_gray.png'}
+       <input type="image" name="chooseBase" src="images/folder.png" class="center" title="{t}Select a base{/t}">
+{/render}
      </td>
     </tr>
     <tr>
@@ -54,12 +51,12 @@
      <td colspan=2>
 {render acl=$gidNumberACL}
       <input type=checkbox name="force_gid" value="1" title="{t}Normally IDs are autogenerated, select to specify manually{/t}" 
-       {$force_gid} {$gidNumberACL} onclick="changeState('gidNumber')">
+       {$force_gid} onclick="changeState('gidNumber')">
 {/render}
        <LABEL for="gidNumber">{t}Force GID{/t}</LABEL>
       &nbsp;
 {render acl=$gidNumberACL}
-      <input name="gidNumber" size=5 maxlength=5 id="gidNumber" {$gidNumberACL} {$forceMode} value="{$gidNumber}" title="{t}Forced ID number{/t}">
+      <input name="gidNumber" size=5 maxlength=5 id="gidNumber" {$forceMode} value="{$gidNumber}" title="{t}Forced ID number{/t}">
 {/render}
      </td>
     </tr>
@@ -71,7 +68,7 @@
       <input type=checkbox name="smbgroup" value="1" {$smbgroup}  title="{t}Select to create a samba conform group{/t}">
 {/render}
 {render acl=$sambaGroupTypeACL}
-      <select size="1" name="groupType" {$sambaGroupTypeACL}>
+      <select size="1" name="groupType">
        {html_options options=$groupTypes selected=$groupType}
       </select>
 {/render}
@@ -79,7 +76,7 @@
       <LABEL for="">{t}in domain{/t}</LABEL>
       &nbsp;
 {render acl=$sambaDomainNameACL}
-      <select id="sambaDomainName" size="1" name="sambaDomainName" {$sambaDomainNameACL}>
+      <select id="sambaDomainName" size="1" name="sambaDomainName">
        {html_options values=$sambaDomains output=$sambaDomains selected=$sambaDomainName}
       </select>
 {/render}
@@ -96,7 +93,7 @@
     <tr>
      <td colspan=2>
 {render acl=$fonGroupACL}
-      <input type=checkbox name="fon_group" value="1" {$fon_group} {$fonGroupACL}>{t}Members are in a phone pickup group{/t}
+      <input type=checkbox name="fon_group" value="1" {$fon_group}>{t}Members are in a phone pickup group{/t}
 {/render}
      </td>
     </tr>
@@ -111,7 +108,7 @@
     <tr>
      <td colspan=2>
 {render acl=$nagiosGroupACL}
-      <input type=checkbox name="nagios_group" value="1" {$nagios_group} {$nagiosGroupACL}>{t}Members are in a nagios group{/t}
+      <input type=checkbox name="nagios_group" value="1" {$nagios_group}>{t}Members are in a nagios group{/t}
 {/render}
      </td>
     </tr>
@@ -137,9 +134,9 @@
       </select>
 {/render}
       <br>
-      <input type=submit name="edit_membership" value="{t}Add{/t}" {$memberUidACL}>
+      <input type=submit name="edit_membership" value="{t}Add{/t}">
       &nbsp;
-      <input type=submit name="del_users" value="{t}Delete{/t}" {$memberUidACL}>
+      <input type=submit name="del_users" value="{t}Delete{/t}">
      </td>
     </tr> 
    </table>