Fixed 'root' department name replacement

[gosa.git] / gosa-core / plugins / admin / users / class_userManagement.inc

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 03a72b4eeab1c69ec69565cbf55cf2a80036d9f8..ab0d224943c7e6a540a8078a42dca0db7b6d3275 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -23,7 +23,7 @@
 class userManagement extends management
 {
   var $plHeadline     = "Users";
-  var $plDescription  = "Manage users";
+  var $plDescription  = "Manage aspects of user accounts like generic, posix, samba and mail settings";
   var $plIcon  = "plugins/users/images/user.png";
 
   var $sn = "";
@@ -228,11 +228,12 @@ class userManagement extends management
 
   function handlePasswordQueue()
   {
+    $smarty = get_smarty();
+
     // Get next entry from queue.
     if(empty($this->dn) && count($this->pwd_change_queue)){
       $this->dn = array_pop($this->pwd_change_queue);
       set_object_info($this->dn);
-      $smarty = get_smarty();
       return ($smarty->fetch(get_template_path('password.tpl', TRUE)));
     }
 
@@ -253,7 +254,6 @@ class userManagement extends management
       // Display errors
       if (count($message) != 0){
         msg_dialog::displayChecks($message);
-        $smarty = get_smarty();
         return($smarty->fetch(get_template_path('password.tpl', TRUE)));
       }
 
@@ -738,7 +738,7 @@ class userManagement extends management
     $label= "";
     if(isset($userPassword[0]) && preg_match("/^\{[^\}]/",$userPassword[0])){
       if(preg_match("/^[^\}]*+\}!/",$userPassword[0])){
-        $label= _("Unlock account");
+        $label= _("Unlock account")."<rowClass:entry-locked/>";
       }else{
         $label= _("Lock account");
       }
@@ -786,7 +786,7 @@ class userManagement extends management
     // Walk thru map
     foreach ($map as $oc => $properties) {
       if (in_array_ics($oc, $classes)) {
-        $result.= image($properties['image'], null, "listing_edit_".$properties['plugin']."_$row", $properties['title']);
+        $result.= image($properties['image'], "listing_edit_".$properties['plugin']."_$row", $properties['title']);
       } else {
         $result.= image('images/empty.png');
       }