From 17ae0672d306892d7f48f2fc59b75ae80a02b115 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 26 Aug 2005 14:04:55 +0000 Subject: [PATCH] Some fixes, with posix tab git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1235 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/personal/environment/class_environment.inc | 4 ++++ plugins/personal/posix/class_posixAccount.inc | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc index d3e8a69c1..879f2bc69 100644 --- a/plugins/personal/environment/class_environment.inc +++ b/plugins/personal/environment/class_environment.inc @@ -569,6 +569,10 @@ class environment extends plugin $message[]=_("Please set a valid profile quota size."); } + if(!((in_array("posixAccount",$this->attrs['objectClass']))||($this->parent->by_object['posixAccount']->is_account==true))){ + $message[]=(_("You need to setup a valid posix extension in order to enable evironment features.")); + } + return ($message); } diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc index f49106f4a..4cf648013 100644 --- a/plugins/personal/posix/class_posixAccount.inc +++ b/plugins/personal/posix/class_posixAccount.inc @@ -230,14 +230,15 @@ class posixAccount extends plugin $obj= $this->parent->by_object['sambaAccount']; } if (isset($obj) && $obj->is_account == TRUE && - isset($this->parent->by_object['sambaAccount'])){ + ((isset($this->parent->by_object['sambaAccount']))&&($this->parent->by_object['sambaAccount']->is_account)) + ||(isset($this->parent->by_object['environment'] ))&&($this->parent->by_object['environment'] ->is_account)){ /* Samba3 dependency on posix accounts are enabled in the moment, because I need to rely on unique uidNumbers. There'll be a better solution later on. */ $display= $this->show_header(_("Remove posix account"), - _("This account has unix features enabled. To disable them, you'll need to remove the samba account first."), TRUE); + _("This account has unix features enabled. To disable them, you'll need to remove the samba / environment account first."), TRUE); } else { $display= $this->show_header(_("Remove posix account"), _("This account has posix features enabled. You can disable them by clicking below.")); -- 2.30.2