diff --git a/gosa-plugins/systems/admin/systems/class_divListSystem.inc b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
index 68f4fd26ed45fb7ec3b801afa9cb4e45bb0408f7..fa2466df448f29682468f5f8427020b7896290b3 100644 (file)
$display= $val["cn"][0].$dsc;
}
- /* Check if this is a terminal/workstation && if we are allowed to change the gotoRootPasswd */
+ /* Check if this is a terminal/workstation && if we are allowed to change the userPassword */
$display_key_for = array("terminal","workstation","server","component");
- $pwd_acl = $ui->get_permissions($val['dn'],$tabs[$type]['ACL'],"gotoRootPasswd");
+ $pwd_acl = $ui->get_permissions($val['dn'],$tabs[$type]['ACL'],"userPassword");
if(preg_match("/w/",$pwd_acl) && in_array($type,$display_key_for)){
$action2 = "<input class='center' type='image' src='images/lists/key.png' alt='"._("Password")."' name='system_setpwd_%KEY%' title='"._("Set password")."'>";
}else{
$field1 = array("string" => sprintf($img['img'],$val['dn']),
"attach" => "style='text-align:center;width:20px;'");
$field2 = array("string" => sprintf($editlink,$key,$display),
- "attach" => "style='' title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'");
+ "attach" => "style='' title='".preg_replace('/ /', ' ', LDAP::fix($val['dn']))."'");
$field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action),
"attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'");
$str.= "<img class='center' src='plugins/systems/images/select_newsystem.png'
title='".$num_new_str."' alt='".$num_new_str."'> ".$cnts['NewDevice']." ";
$str.= "<img class='center' src='plugins/systems/images/select_winstation.png'
- title='".$num_wws_str."' alt='".$num_wws_str."'> ".$cnts['winstation']." ";
+ title='".$num_wws_str."' alt='".$num_wws_str."'> ".($cnts['winstation'] + $cnts['opsi_client'])." ";
$str.= "<img class='center' src='images/lists/folder.png'
title='".$num_dep_str."' alt='".$num_dep_str."'> ".$num_deps." ";