udpated posix acls

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

diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 018d6ec04d7c23ca4a19b68d167db777566b7f8d..30f32f375ec2dc05cb4447920e18c2d15a60e980 100644 (file)
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -299,7 +299,7 @@ class posixAccount extends plugin
     if (isset($_POST['add_groups_finish']) && isset($_POST['groups']) &&
         count($_POST['groups'])){
 
-      /* FIX ME  put the acl check into addGroup function*/
+      echo "FIXME, 302,  put the acl check into addGroup function ";
       #if (chk acl ($this->acl, "memberUid") == ""){
       #  $this->addGroup ($_POST['groups']);
       #  $this->is_modified= TRUE;
@@ -310,7 +310,7 @@ class posixAccount extends plugin
     if (isset($_POST['delete_groupmembership']) && 
         isset($_POST['group_list']) && count($_POST['group_list'])){
 
-      /* FIX ME  put the acl check into addGroup function*/
+      echo "FIXME, 302,  put the acl check into addGroup function ";
       #if (chk acl ($this->acl, "memberUid") == ""){
       #  $this->delGroup ($_POST['group_list']);
       #  $this->is_modified= TRUE;
@@ -596,7 +596,7 @@ class posixAccount extends plugin
   function remove_from_parent()
   {
     /* Cancel if there's nothing to do here */
-    if (!$this->initially_was_account){
+    if ((!$this->initially_was_account) || (!$this->acl_is_removeable())){
       return;
     }
 
@@ -645,17 +645,19 @@ class posixAccount extends plugin
       /* Save values to object */
       plugin::save_object();
 
+
       /* Save force GID checkbox */
-      if (isset ($_POST['force_ids'])){
-        $data= 1;
-      } else {
-        $data= 0;
-      }
-      if ($this->force_ids != $data){
-        $this->is_modified= TRUE;
+      if($this->acl_is_writeable("gidNumber") || $this->acl_is_writeable("uidNumber")){
+        if (isset ($_POST['force_ids'])){
+          $data= 1;
+        } else {
+          $data= 0;
+        }
+        if ($this->force_ids != $data){
+          $this->is_modified= TRUE;
+        }
+        $this->force_ids= $data;
       }
-      $this->force_ids= $data;
-
 
       /*Save primary group settings */
       if($this->acl_is_writeable("primaryGroup") && isset($_POST['primaryGroup'])){

diff --git a/plugins/personal/posix/main.inc b/plugins/personal/posix/main.inc
index 105ad7b9696afd67d659399708002a9894040431..1de7f0286b7b10cc089b4dca18283b5d8ef10104 100644 (file)
--- a/plugins/personal/posix/main.inc
+++ b/plugins/personal/posix/main.inc
@@ -91,7 +91,7 @@ if (!$remove_lock){
   }
 
   /* Show page footer depending on the mode */
-  if (!$posixAccount->group_dialog && $posixAccount->is_account){
+  if (!$posixAccount->group_dialog && !$posixAccount->show_ws_dialog && $posixAccount->is_account){
 
     $display.= "<p class=\"plugbottom\">";