![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/systems/admin/systems/class_divListSystem.inc b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
index 32da5bbbc7c646b4c54cb497c2d721b3d6a02420..fa2466df448f29682468f5f8427020b7896290b3 100644 (file)
var $ShowPrinters;
var $ShowDevices;
var $ShowPhones;
+ var $ShowOpsiHosts;
/* Subsearch checkbox */
var $SubSearch;
function divListSystem (&$config,$parent)
{
- MultiSelectWindow::MultiSelectWindow($config, "System", array("server",
- "workstation",
- "terminal",
- "phone",
- "incoming",
- "printer"));
+ $classes = array("server","workstation","terminal","phone","incoming","winworkstation","printer","component");
+ if(class_available("opsiGeneric")){
+ $classes[] = "opsi";
+ }
+
+ MultiSelectWindow::MultiSelectWindow($config, "System", $classes);
$this->parent = $parent;
$this->ui = get_userinfo();
msgPool::selectToView( _("MicroSoft Windows based workstations")),
sprintf(_("Show %s"), _("windows based workstations")),true);
}
+ /* Add opsi checkboxes if opsi is enabled */
+ if($this->parent->opsi instanceof opsi && $this->parent->opsi->enabled()){
+ $this->AddCheckBox("ShowOpsiHosts" , sprintf(_("Display objects of type '%s'."),
+ _("OPSI installed client")),_("Show OPSI based clients") ,true);
+ }
+
if(class_available("printtabs")){
$this->AddCheckBox("ShowPrinters",
msgPool::selectToView( _("network printers")),
$s.= "...|<img src='plugins/systems/images/select_workstation.png' alt='' border='0' class='center'>".
" "._("Workstation")."|"."newsystem_workstation|\n";
}
- if(class_available("servtabs") && preg_match("/c/",$ui->get_permissions($this->selectedBase,"workstation/servgeneric"))){
+ if(class_available("servtabs") && preg_match("/c/",$ui->get_permissions($this->selectedBase,"server/servgeneric"))){
$s.= "...|<img src='plugins/systems/images/select_server.png' alt='' border='0' class='center'>".
" "._("Server")."|"."newsystem_server|\n";
}
$s.= "...|<img src='plugins/systems/images/select_component.png' alt='' border='0' class='center'>".
" "._("Component")."|"."newsystem_component|\n";
}
- if(class_available("opsiGeneric") && preg_match("/c/",$ui->get_permissions($this->selectedBase,"opsi/opsiGeneric"))){
- $s.= "...|<img src='plugins/systems/images/select_component.png' alt='' border='0' class='center'>".
- " "._("Opsi")."|"."newsystem_opsi_client|\n";
+
+ if($this->parent->opsi instanceof opsi &&
+ $this->parent->opsi->enabled() &&
+ preg_match("/c/",$ui->get_permissions($this->selectedBase,"opsi/opsiGeneric"))){
+ $s.= "...|<img src='plugins/systems/images/select_winstation.png' alt='' border='0' class='center'>".
+ " "._("Opsi client")."|"."newsystem_opsi_client|\n";
}
if($this->parent->si_active){
$ogroups = array();
if($this->parent->fai_activated){
$ogroups = get_sub_list("(&(objectClass=gosaGroupOfNames)(FAIclass=*)(member=*))",array("ogroups"),
- get_ou("ogroupou"),$this->config->current['BASE'],array("FAIclass","member","cn"),GL_NO_ACL_CHECK | GL_SUBSEARCH);
+ get_ou("ogroupRDN"),$this->config->current['BASE'],array("FAIclass","member","cn"),GL_NO_ACL_CHECK | GL_SUBSEARCH);
foreach($ogroups as $ogroup){
for($i = 0 ; $i < $ogroup['member']['count'] ; $i++){
if(preg_match("/:/",$ogroup['FAIclass'][0])) {
$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'],"userPassword");
if(preg_match("/w/",$pwd_acl) && in_array($type,$display_key_for)){
$action2 = $empty;
}
- if(in_array("gotoWorkstation",$val['objectClass'])){
+ /* Add create FAI CD icon
+ */
+ $acl_cd = preg_match("/w/",$ui->get_permissions($val['dn'],"workstation/workgeneric","createFAICD"));
+ if(in_array("gotoWorkstation",$val['objectClass']) && $acl_cd){
$action2= "<input class='center' type='image' src='plugins/systems/images/cdrom.png' alt='"._("Create CD")."'
name='gen_cd_%KEY%' title='"._("Create FAI CD")."'> ".$action2;
}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;'");
if($this->parent->fai_activated){
- $release =" ";
+ $release ="";
$release_attach = "";
if(isset($val['FAIclass'][0]) && preg_match("/:/",$val['FAIclass'][0])){
$release = preg_replace("/^.*:/","",$val['FAIclass'][0]);
title='".sprintf(_("Inherited from %s"),trim($ogs_release[$val['dn']]['CN'],", "))."'>";
$release_attach = "title='".sprintf(_("Inherited from %s"),trim($ogs_release[$val['dn']]['CN'],", "))."'";
}
- $field2a = array("string" => $release,"attach"=>$release_attach." style='width:100px;'");
+ $field2a = array("string" => $release." ","attach"=>$release_attach." style='width:100px;'");
$this->AddElement( array($field0,$field1,$field2,$field2a,$field3));
}else{
$this->AddElement( array($field0,$field1,$field2,$field3));
$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." ";