From 8116814836e857eb76cab1840ef863f566cb86ba Mon Sep 17 00:00:00 2001 From: cajus Date: Thu, 10 Jan 2008 15:19:24 +0000 Subject: [PATCH] Make opsi hosts beeing displayed git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8296 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../plugins/admin/ogroups/class_divListOGroup.inc | 2 ++ gosa-core/plugins/admin/ogroups/class_ogroup.inc | 11 ++++++++--- .../plugins/admin/ogroups/class_ogroupManagement.inc | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) mode change 100755 => 100644 gosa-core/plugins/admin/ogroups/class_divListOGroup.inc diff --git a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc old mode 100755 new mode 100644 index c0e96a7c9..6fb84643f --- a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc +++ b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc @@ -17,6 +17,7 @@ class divListOGroup extends MultiSelectWindow var $DepartmentGroups ; var $ServerGroups ; var $WorkstationGroups ; + var $WindowsGroups ; var $TerminalGroups ; var $PrinterGroups ; var $PhoneGroups ; @@ -71,6 +72,7 @@ class divListOGroup extends MultiSelectWindow $this->AddCheckBox("DepartmentGroups" , _("Select to see groups containing departments") , _("Show groups containing departments"), true); $this->AddCheckBox("ServerGroups" , _("Select to see groups containing servers") , _("Show groups containing servers"), true); $this->AddCheckBox("WorkstationGroups", _("Select to see groups containing workstations"), _("Show groups containing workstations"), true); + $this->AddCheckBox("WindowsGroups", _("Select to see groups containing windows workstations"), _("Show groups containing windows workstations"), true); $this->AddCheckBox("TerminalGroups" , _("Select to see groups containing terminals") , _("Show groups containing terminals"), true); $this->AddCheckBox("PrinterGroups" , _("Select to see groups containing printer") , _("Show groups containing printer"), true); $this->AddCheckBox("PhoneGroups" , _("Select to see groups containing phones") , _("Show groups containing phones"), true); diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc index 83d1efb7d..14b11c95c 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc @@ -71,6 +71,7 @@ class ogroup extends plugin "D" => "departments", "S" => "servers", "W" => "workstations", + "O" => "winstations", "T" => "terminals", "F" => "phones", "_" => "subtrees", @@ -246,7 +247,7 @@ class ogroup extends plugin } if (isset($_POST['dselect'])){ foreach( array("accounts", "groups", "applications", "departments", - "servers", "workstations", "terminals", "printers","subtrees", + "servers", "workstations", "winstations", "terminals", "printers","subtrees", "phones") as $type){ if (isset($_POST[$type])) { @@ -276,7 +277,7 @@ class ogroup extends plugin $smarty->assign("deplist", $this->config->idepartments); $smarty->assign("alphabet", generate_alphabet()); foreach( array("dselect", "regex", "accounts", "groups", "applications", - "departments", "servers", "workstations", "terminals","subtrees", + "departments", "servers", "workstations", "winstations", "terminals","subtrees", "printers", "phones") as $type){ $smarty->assign("$type", $ogfilter[$type]); } @@ -304,6 +305,7 @@ class ogroup extends plugin "D" => _("departments"), "S" => _("servers"), "W" => _("workstations"), + "O" => _("winstations"), "T" => _("terminals"), "F" => _("phones"), "P" => _("printers")); @@ -311,7 +313,7 @@ class ogroup extends plugin $type= preg_replace('/[\[\]]/', '', $this->gosaGroupObjects); $p1= $conv[$type[0]]; error_reporting(0); - if (isset($type[1]) && preg_match('/[UGADSFWTP]/', $type[1])){ + if (isset($type[1]) && preg_match('/[UGADSFOWTP]/', $type[1])){ $p2= $conv[$type[1]]; $smarty->assign("combinedObjects", "$p1 "._("and")." $p2"); } else { @@ -391,6 +393,7 @@ class ogroup extends plugin "departments" => array("CLASS"=>"gosaDepartment" ,"DN"=> "" ,"ACL" => "department"), "servers" => array("CLASS"=>"goServer" ,"DN"=> get_ou('serverou') ,"ACL" => "server"), "workstations" => array("CLASS"=>"gotoWorkstation","DN"=> get_ou('workstationou') ,"ACL" => "workstation"), + "winstations" => array("CLASS"=>"opsiClient", "DN"=> get_ou('WINSTATIONS') ,"ACL" => "winstation"), "terminals" => array("CLASS"=>"gotoTerminal" ,"DN"=> get_ou('terminalou') ,"ACL" => "terminal"), "printers" => array("CLASS"=>"gotoPrinter" ,"DN"=> get_ou('printerou') ,"ACL" => "printer"), "phones" => array("CLASS"=>"goFonHardware" ,"DN"=> get_ou('phoneou') ,"ACL" => "phone")); @@ -521,6 +524,7 @@ class ogroup extends plugin "D" => "select_department.png", "S" => "select_server.png", "W" => "select_workstation.png", + "O" => "select_winstation.png", "T" => "select_terminal.png", "F" => "select_phone.png", "I" => "flag.png", @@ -545,6 +549,7 @@ class ogroup extends plugin "D" => "gosaDepartment", "S" => "goServer", "W" => "gotoWorkstation", + "O" => "opsiClient", "T" => "gotoTerminal", "F" => "goFonHardware", "P" => "gotoPrinter") as $index => $class){ diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc index 0c529fd12..1515f9d29 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc @@ -454,6 +454,7 @@ class ogroupManagement extends plugin "S" => array("select_server.png" ,_("Server") , "ogroup"), "F" => array("select_phone.png" ,_("Phone") , "phonequeue"), "W" => array("select_workstation.png" ,_("Workstation") , "workstartup"), + "O" => array("select_winstation.png" ,_("Windows Install") , "ogroup"), "T" => array("select_terminal.png" ,_("Terminal") , "termgroup"), "P" => array("select_printer.png" ,_("Printer") , "ogroup")); @@ -511,6 +512,7 @@ class ogroupManagement extends plugin "DepartmentGroups" => "(gosaGroupObjects=*D*)" , "ServerGroups" => "(gosaGroupObjects=*S*)" , "WorkstationGroups" => "(gosaGroupObjects=*W*)" , + "WindowsGroups" => "(gosaGroupObjects=*O*)" , "TerminalGroups" => "(gosaGroupObjects=*T*)" , "PrinterGroups" => "(gosaGroupObjects=*P*)" , "PhoneGroups" => "(gosaGroupObjects=*F*)" ); -- 2.30.2