From 9967d8cb29278dd535a303db5ac5b6943f7bb7c9 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 5 Sep 2006 07:07:07 +0000 Subject: [PATCH] Fixed saving of posix account. Group membership wasn't initiated with category type. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4591 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_printGeneric.inc | 6 +++--- plugins/personal/generic/class_user.inc | 2 +- plugins/personal/posix/class_posixAccount.inc | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index ee40925c0..dc4480d6d 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -817,12 +817,12 @@ class printgeneric extends plugin $id = $key; } } - - if(!$this->acl_is_writeable($type)){ + + if(!$this->acl_is_writeable("gotoUserPrinter")){ print_red(sprintf(_("You are not allowed to remove the given object '%s' from the list of members of printer '%s'."),$id,$this->dn)); return(FALSE); } - + if(isset($this->member[$type][$id])){ unset($this->member[$type][$id]); return(TRUE); diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index b4b709248..17c92f0a4 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -825,7 +825,7 @@ class user extends plugin } } elseif(!$this->is_new) { - echo "I think this is not currect, but can't test it right now. "; + // # FIXME User picture saveing ... seams to work. // This should be set to array in all cases ... else we write *removed* into this attribute ... $this->attrs["jpegPhoto"] = array(); } diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc index ea92f8544..5defa47bb 100644 --- a/plugins/personal/posix/class_posixAccount.inc +++ b/plugins/personal/posix/class_posixAccount.inc @@ -875,7 +875,8 @@ class posixAccount extends plugin /* Take care about groupMembership values: add to groups */ foreach ($this->groupMembership as $key => $value){ - $g= new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], $key); + $g= new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], $key,"groups"); + $g->set_acl_base($key); $g->by_object['group']->addUser($this->uid); $g->save(); } @@ -883,7 +884,8 @@ class posixAccount extends plugin /* Remove from groups not listed in groupMembership */ foreach ($this->savedGroupMembership as $key => $value){ if (!isset($this->groupMembership[$key])){ - $g= new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], $key); + $g= new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], $key,"groups"); + $g->set_acl_base($key); $g->by_object['group']->removeUser ($this->uid); $g->save(); } -- 2.30.2