From 7cf22311ebfe2e8281aef10b5b8ea82e6c2f9657 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 28 Jan 2010 10:39:09 +0000 Subject: [PATCH] Fixed mangement handling; git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15405 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../plugins/admin/users/class_userManagement.inc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc index 97ba976c2..729a273d8 100644 --- a/gosa-core/plugins/admin/users/class_userManagement.inc +++ b/gosa-core/plugins/admin/users/class_userManagement.inc @@ -294,7 +294,8 @@ class userManagement extends management */ function saveChanges() { - management::saveChanges(); + $str = management::saveChanges(); + if(!empty($str)) return($str); if(isset($this->last_tabObject->by_object['user']) && $this->last_tabObject->by_object['user']->password_change_needed()){ $this->force_hash_type[$this->last_tabObject->dn] = $this->last_tabObject->by_object['user']->pw_storage; @@ -305,7 +306,8 @@ class userManagement extends management function cancelEdit() { - management::cancelEdit(); + $str = management::cancelEdit(); + if(!empty($str)) return($str); if(isset($this->last_tabObject->by_object['user']) && $this->last_tabObject->by_object['user']->dn != "new" && @@ -324,7 +326,8 @@ class userManagement extends management function newUserFromTemplate($action="",$target=array(),$all=array()) { // Call parent method, it knows whats to do, locking and so on ... - management::newEntry($action,$target,$all); + $str = management::newEntry($action,$target,$all); + if(!empty($str)) return($str); // Reset uid selection. $this->got_uid= ""; @@ -360,7 +363,8 @@ class userManagement extends management { // Call parent method, it manages everything, locking, object creation... - management::newEntry($action,$target,$all); + $str = management::newEntry($action,$target,$all); + if(!empty($str)) return($str); // If we've at least one template, then ask the user if he wants to use one? $templates = array(); -- 2.30.2