X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fusers%2Fclass_userManagement.inc;h=be15e04cdb2e1ea03ce37c7bcd84d950a7f875ee;hb=cfddd912c0b9af530fbac827c9b2714e884a0e2d;hp=729a273d8195bc1cdcdc6989c3ef3fc3e9e533fe;hpb=7cf22311ebfe2e8281aef10b5b8ea82e6c2f9657;p=gosa.git diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc index 729a273d8..be15e04cd 100644 --- a/gosa-core/plugins/admin/users/class_userManagement.inc +++ b/gosa-core/plugins/admin/users/class_userManagement.inc @@ -295,8 +295,19 @@ class userManagement extends management function saveChanges() { $str = management::saveChanges(); + if(!empty($str)) return($str); + if($this->last_tabObject instanceOf multi_plug){ + foreach($this->last_tabObject->a_handles as $user){ + if($user->password_change_needed()){ + $this->force_hash_type[$user->dn] = $user->by_object['user']->pw_storage; + $this->pwd_change_queue[] = $user->dn; + } + } + return($this->handlePasswordQueue()); + } + 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; $this->pwd_change_queue[] = $this->last_tabObject->dn; @@ -541,6 +552,7 @@ class userManagement extends management // Check entry locking foreach($target as $dn){ if (($user= get_lock($dn)) != ""){ + $this->dn = $dn; return(gen_locked_message ($user, $dn)); } $this->dns[] = $dn; @@ -589,6 +601,7 @@ class userManagement extends management */ function lockUsers($action,$target,$all) { + if(!count($target)) return; if($action == "lockUsers"){ $this->lockEntry($action,$target, $all, "lock"); }else{ @@ -773,11 +786,9 @@ class userManagement extends management // Walk thru map foreach ($map as $oc => $properties) { if (in_array_ics($oc, $classes)) { - $result.=""; + $result.= image($properties['image'], "listing_edit_".$properties['plugin']."_$row", $properties['title']); } else { - $result.=" "; + $result.= image('images/empty.png'); } } return $result;