![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index 040ab5b43a20cac0f68ecb98984565e736a02a94..b85c44626bc3fad728d987d8b746ab082aa5e59b 100644 (file)
var $acl_module = array("incoming","terminal","workstation","server","printer","phone","winworkstation","component");
+ var $opsi = NULL;
+
function systems (&$config, $ui)
{
/* Save configuration for internal use */
$this->DivListSystem = new divListSystem($this->config,$this);
/* Copy & Paste enabled ?*/
- if((isset($this->config->data['MAIN']['ENABLECOPYPASTE']))&&(preg_match("/true/i",$this->config->data['MAIN']['ENABLECOPYPASTE']))){
+ if ($this->config->get_cfg_value("enablecopypaste") == "true"){
$this->CopyPasteHandler = new CopyPasteHandler($this->config);
}
$o = new gosaSupportDaemon();
$this->si_active = $o->connect() && class_available("DaemonEvent");
}
+
+ /* Check if we are able to communicate with the GOsa supprot daemon
+ */
+ if(class_available("opsi")){
+ $this->opsi = new opsi($this->config);
+ }
}
/* Possible destination system types
*/
- $tabs = array(
- "terminal" => array("CLASS"=>"TERMTABS", "TABNAME"=>"termgeneric",
- "TABCLASS" =>"termtabs", "ACL"=> "terminal"),
- "workstation" => array("CLASS"=>"WORKTABS", "TABNAME"=>"workgeneric",
- "TABCLASS" =>"worktabs", "ACL"=> "workstation"),
- "server" => array("CLASS"=>"SERVTABS", "TABNAME"=>"servgeneric",
- "TABCLASS" =>"servtabs", "ACL"=> "server"));
+ $tabs = $this->get_tab_defs();
/* Remember dialog selection.
*/
$class = $tabs[$selected_system]["CLASS"];
$tabname = $tabs[$selected_system]["TABNAME"];
$tabclass = $tabs[$selected_system]["TABCLASS"];
- $acl_cat = $tabs[$selected_system]["ACL"];
+ $acl_cat = $tabs[$selected_system]["ACLC"];
if(!class_available($tabclass)){
}
$this->dn= "new";
- $tabs = array(
- "terminal" => array("CLASS"=>"TERMTABS", "TABNAME"=>"termgeneric", "TABCLASS" =>"termtabs", "ACL"=> "terminal"),
- "workstation" => array("CLASS"=>"WORKTABS", "TABNAME"=>"workgeneric", "TABCLASS" =>"worktabs", "ACL"=> "workstation"),
- "server" => array("CLASS"=>"SERVTABS", "TABNAME"=>"servgeneric", "TABCLASS" =>"servtabs", "ACL"=> "server"),
- "printer" => array("CLASS"=>"PRINTTABS", "TABNAME"=>"printgeneric", "TABCLASS" =>"printtabs", "ACL"=> "printer"),
- "phone" => array("CLASS"=>"PHONETABS", "TABNAME"=>"phoneGeneric", "TABCLASS" =>"phonetabs", "ACL"=> "phone"),
- "component" => array("CLASS"=>"COMPONENTTABS","TABNAME"=>"componentGeneric","TABCLASS" =>"componenttabs", "ACL"=> "component"));
-
+ $tabs = $this->get_tab_defs();
+
if(isset($tabs[$sw])){
$class = $tabs[$sw]["CLASS"];
$tabname = $tabs[$sw]["TABNAME"];
$tabclass = $tabs[$sw]["TABCLASS"];
- $acl_cat = $tabs[$sw]["ACL"];
+ $acl_cat = $tabs[$sw]["ACLC"];
/* Load permissions for selected 'dn' and check if
we're allowed to remove this 'dn' */
}
}
-
/********************
System activation
********************/
}
/* Find out more about the object type */
- $ldap= $this->config->get_ldap_link();
- $ldap->cat($this->dn, array('objectClass','gotoMode'));
- $attrs= $ldap->fetch();
+ $attrs = $this->terminals[$s_entry];
$type= $this->get_system_type($attrs);
-
+
/* Lock the current entry, so everyone will get the
above dialog */
- $tabs = array(
- "terminal" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "terminal"),
- "workstation" => array("CLASS"=>"WORKTABS", "TABCLASS" =>"worktabs", "ACL"=> "workstation"),
- "server" => array("CLASS"=>"SERVTABS", "TABCLASS" =>"servtabs", "ACL"=> "server"),
- "printer" => array("CLASS"=>"PRINTTABS", "TABCLASS" =>"printtabs", "ACL"=> "printer"),
- "phone" => array("CLASS"=>"PHONETABS", "TABCLASS" =>"phonetabs", "ACL"=> "phone"),
- "winstation" => array("CLASS"=>"WINTABS", "TABCLASS" =>"wintabs", "ACL"=> "winworkstation"),
- "component" => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component"));
-
+ $tabs = $this->get_tab_defs();
if($type == "ArpNewDevice"){
if(!class_available("ArpNewDeviceTabs")){
}elseif(isset($tabs[$type])){
$class = $tabs[$type]["CLASS"];
- $acl_cat = $tabs[$type]["ACL"];
+ $acl_cat = $tabs[$type]["ACLC"];
$tabclass = $tabs[$type]["TABCLASS"];
if(!class_available($tabclass)){
/* Set terminals root password */
if ($s_action=="change_pw"){
- $tabs = array(
- "ArpNewDevice"=> array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "incoming/systems"),
- "NewDevice" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "incoming/systems"),
- "terminal" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "terminal/termgeneric"),
- "workstation" => array("CLASS"=>"WORKTABS", "TABCLASS" =>"worktabs", "ACL"=> "workstation/workgeneric"),
- "server" => array("CLASS"=>"SERVTABS", "TABCLASS" =>"servtabs", "ACL"=> "server/servgeneric"),
- "printer" => array("CLASS"=>"PRINTTABS", "TABCLASS" =>"printtabs", "ACL"=> "printer/printgeneric"),
- "phone" => array("CLASS"=>"PHONETABS", "TABCLASS" =>"phonetabs", "ACL"=> "phone/phoneGeneric"),
- "winstation" => array("CLASS"=>"WINTABS", "TABCLASS" =>"wintabs", "ACL"=> "winworkstation/wingeneric"),
- "component" => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
+ $tabs = $this->get_tab_defs();
$dn = $this->terminals[$s_entry]['dn'];
$type = $this->get_system_type($this->terminals[$s_entry]);
$_POST['new_password'] == $_POST['repeated_password']){
/* Check if user is allowed to set password */
- $tabs = array(
- "terminal" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "terminal/termgeneric" ,"PLUG"=>"termgeneric"),
- "workstation" => array("CLASS"=>"WORKTABS", "TABCLASS" =>"worktabs", "ACL"=> "workstation/workgeneric" ,"PLUG"=>"workgeneric"),
- "server" => array("CLASS"=>"SERVTABS", "TABCLASS" =>"servtabs", "ACL"=> "server/servgeneric" ,"PLUG"=>"servgeneric"),
- "component" => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric","PLUG"=>"componentGeneric"));
+ $tabs = $this->get_tab_defs();
- /* Detect object type */
$type = "";
foreach($this->terminals as $terminal){
if($terminal['dn'] == $this->dn){
}
$ui = get_userinfo();
- $tabs = array(
- "ArpNewDevice"=> array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "incoming/systems"),
- "NewDevice" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "incoming/systems"),
- "terminal" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "terminal/termgeneric"),
- "workstation" => array("CLASS"=>"WORKTABS", "TABCLASS" =>"worktabs", "ACL"=> "workstation/workgeneric"),
- "server" => array("CLASS"=>"SERVTABS", "TABCLASS" =>"servtabs", "ACL"=> "server/servgeneric"),
- "printer" => array("CLASS"=>"PRINTTABS", "TABCLASS" =>"printtabs", "ACL"=> "printer/printgeneric"),
- "phone" => array("CLASS"=>"PHONETABS", "TABCLASS" =>"phonetabs", "ACL"=> "phone/phoneGeneric"),
- "winstation" => array("CLASS"=>"WINTABS", "TABCLASS" =>"wintabs", "ACL"=> "winworkstation/wingeneric"),
- "component" => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
-
+ $tabs = $this->get_tab_defs();
if(count($ids)){
if (isset($_POST['delete_multiple_system_confirm'])){
$ui = get_userinfo();
- $tabs = array(
- "ArpNewDevice"=> array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "incoming/systems"),
- "NewDevice" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "incoming/systems"),
- "terminal" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "terminal/termgeneric"),
- "workstation" => array("CLASS"=>"WORKTABS", "TABCLASS" =>"worktabs", "ACL"=> "workstation/workgeneric"),
- "server" => array("CLASS"=>"SERVTABS", "TABCLASS" =>"servtabs", "ACL"=> "server/servgeneric"),
- "printer" => array("CLASS"=>"PRINTTABS", "TABCLASS" =>"printtabs", "ACL"=> "printer/printgeneric"),
- "phone" => array("CLASS"=>"PHONETABS", "TABCLASS" =>"phonetabs", "ACL"=> "phone/phoneGeneric"),
- "winstation" => array("CLASS"=>"WINTABS", "TABCLASS" =>"wintabs", "ACL"=> "winworkstation/wingeneric"),
- "component" => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
-
+ $tabs = $this->get_tab_defs();
/* Remove user by user and check acls before removeing them */
foreach($this->dns as $key => $dn){
/* Prepare samba class name */
$samba ="";
if ($this->DivListSystem->ShowWinWorkstations){
- if ($this->config->current['SAMBAVERSION'] == "3"){
+ if ($this->config->get_cfg_value("sambaversion") == "3"){
$samba= "sambaSamAccount";
} else {
$samba= "sambaAccount";
$filter = "(|(&".$userregex."(objectClass=goHard)(cn=".$this->DivListSystem->Regex.")))";
$res = array_merge($res,get_list($filter,$sys_categories, get_ou('incomingou').$base,$sys_attrs, GL_SIZELIMIT));
+ /* Append opsi systems, the opsi extension have to installed.
+ */
+ if($this->opsi != NULL){
+ $opsi_clients = $this->opsi->get_hosts_for_system_management();
+ if($this->opsi->is_error()){
+ msg_dialog::display(_("Error"),msgPool::siError($this->opsi->get_error()),ERROR_DIALOG);
+ }
+ }
+
/* Get all gotoTerminal's */
+ $t_id = 0;
+ $opsi_map = array();
foreach ($res as $value){
$tmp= $value['dn'];
/* Detect type of object and create an entry for $this->terminals */
$terminal = array();
- if (in_array_ics('gotoTerminal', $value["objectClass"])){
+
+ if (0 && in_array_ics('gosa_opsi_client', $value["objectClass"])){
+
+ /* check acl */
+ $terminal = $value;
+ $terminal['type'] = "O";
+
+ } elseif (in_array_ics('gotoTerminal', $value["objectClass"])){
/* check acl */
$acl = $ui->get_permissions($value['dn'],"terminal/termgeneric");
}
}
+ /* Append collected data to the host list.
+ */
if(count($terminal)){
- $this->terminals[]=$terminal;
+ $t_id ++ ;
+ $this->terminals[$t_id]=$terminal;
+ $opsi_map[preg_replace('/\$$/',"",$value['cn'][0])] = $t_id;
}
}
+
+ /* Merge real hosts with opsi hosts.
+ If there is a samba host, then merge it with the opsi host,
+ to avoid duplicate entries.
+ */
+ foreach($opsi_clients as $entry){
+ if(isset($opsi_map[$entry['cn'][0]])){
+ continue;
+ }
+ $terminal = $entry;
+ $terminal['type'] = "O";
+ $this->terminals[] = $terminal;
+ }
+
$tmp =array();
$tmp2 =array();
foreach($this->terminals as $tkey => $val ){
}
$ui = get_userinfo();
-
- $tabs = array(
- "terminal" => array( "CLASS" =>"TERMTABS", "TABNAME" =>"termgeneric",
- "TABCLASS" =>"termtabs", "ACL" =>"terminal"),
- "workstation" => array( "CLASS" =>"WORKTABS", "TABNAME" =>"workgeneric",
- "TABCLASS" =>"worktabs", "ACL" =>"workstation"),
- "server" => array( "CLASS" =>"SERVTABS", "TABNAME" =>"servgeneric",
- "TABCLASS" =>"servtabs", "ACL" =>"server"),
- "printer" => array( "CLASS" =>"PRINTTABS", "TABNAME" =>"printgeneric",
- "TABCLASS" =>"printtabs", "ACL" =>"printer"),
- "phone" => array( "CLASS" =>"PHONETABS", "TABNAME" =>"phoneGeneric",
- "TABCLASS" =>"phonetabs", "ACL" =>"phone"),
- "component" => array( "CLASS" =>"COMPONENTTABS","TABNAME" =>"componentGeneric",
- "TABCLASS" =>"componenttabs","ACL" =>"component"));
+
+ $tabs = $this->get_tab_defs();
/* Add a single entry to queue */
if($s_action == "cut" || $s_action == "copy"){
$tab_o = $tabs[$type]['CLASS'];
$tab_c = $tabs[$type]['TABCLASS'];
$acl_c = $tabs[$type]['TABNAME'];
- $acl = $tabs[$type]['ACL'];
+ $acl = $tabs[$type]['ACLC'];
if($s_action == "copy" && $ui->is_copyable($dn,$acl,$acl_c)){
$this->CopyPasteHandler->add_to_queue($dn,$s_action,$tab_c,$tab_o,$acl);
$tab_o = $tabs[$type]['CLASS'];
$tab_c = $tabs[$type]['TABCLASS'];
$acl_c = $tabs[$type]['TABNAME'];
- $acl = $tabs[$type]['ACL'];
+ $acl = $tabs[$type]['ACLC'];
if($s_action == "copy_multiple" && $ui->is_copyable($dn,$acl,$acl_c)){
$this->CopyPasteHandler->add_to_queue($dn,"copy",$tab_c,$tab_o,$acl);
$classes = $attrs['objectClass'];
$type= "";
- if (in_array_ics('ieee802Device', $classes)){
+ if (in_array_ics('gosa_opsi_client', $classes)){
+ $type= "opsi_client";
+ }elseif (in_array_ics('ieee802Device', $classes)){
$type= "component";
}elseif (in_array_ics('gotoTerminal', $classes)){
$type= "terminal";
"C" => array("plugins/systems/images/select_component.png",_("Network device")),
"P" => array("plugins/systems/images/select_printer.png",_("Printer")),
- "W" => array("images/select_winstation.png",_("Win workstation")),
+ "W" => array("plugins/systems/images/select_winstation.png",_("Win workstation")),
- "L" => array("images/select_workstation.png",_("Workstation")),
- "S" => array("images/select_server.png",_("Server")),
+ "L" => array("plugins/systems/images/select_workstation.png",_("Workstation")),
+ "S" => array("plugins/systems/images/select_server.png",_("Server")),
"T" => array("plugins/systems/images/select_terminal.png",_("Terminal")),
- "LX" => array("images/workstation_locked.png",_("Locked workstation")),
- "SX" => array("images/server_locked.png",_("Locked server")),
- "TX" => array("images/terminal_locked.png",_("Locked terminal")),
+ "LX" => array("plugins/systems/images/workstation_locked.png",_("Locked workstation")),
+ "SX" => array("plugins/systems/images/server_locked.png",_("Locked server")),
+ "TX" => array("plugins/systems/images/terminal_locked.png",_("Locked terminal")),
- "LE" => array("images/workstation_error.png",_("Workstation error")),
- "SE" => array("images/server_error.png",_("Server error")),
- "TE" => array("images/terminal_error.png",_("Terminal error")),
+ "LE" => array("plugins/systems/images/workstation_error.png",_("Workstation error")),
+ "SE" => array("plugins/systems/images/server_error.png",_("Server error")),
+ "TE" => array("plugins/systems/images/terminal_error.png",_("Terminal error")),
- "LB" => array("images/workstation_busy.png",_("Workstation busy")),
- "SB" => array("images/server_busy.png",_("Server busy")),
+ "LB" => array("plugins/systems/images/workstation_busy.png",_("Workstation busy")),
+ "SB" => array("plugins/systems/images/server_busy.png",_("Server busy")),
"NQ" => array("plugins/systems/images/select_newsystem.png",_("New system from incoming")),
- "NT"=> array("images/select_new_terminal.png",_("New terminal")),
- "NL"=> array("images/select_new_workstation.png",_("New workstation")));
+ "NT" => array("plugins/systems/images/select_new_terminal.png",_("New terminal")),
+ "NL" => array("plugins/systems/images/select_new_workstation.png",_("New workstation")));
+
+ /* Add opsi client to system types */
+ if($this->opsi != NULL){
+ $conv["O"] = array("plugins/systems/images/select_default.png",_("Opsi client"));
+ }
/* Use locked icons
*/
if(!preg_match("/".$key[$i]."/",$input['type'])){
$found = FALSE;
}
- }
+ }
if($found){
$tmp['img'] ="<img class='center' src='".$value[0]."' alt='".$key."' title='".$value['1']."'>";
}
+ public function get_tab_defs()
+ {
+ $tabs = array(
+ "incoming" => array(
+ "CLASS" => "",
+ "TABNAME" => "",
+ "TABCLASS" => "",
+ "ACLC" => "incoming",
+ "ACL" => "incoming/systems"),
+
+ "ArpNewDevice"=> array(
+ "CLASS" => "TERMTABS",
+ "TABNAME" => "termgeneric" ,
+ "TABCLASS" => "termtabs",
+ "ACLC" => "incoming",
+ "ACL" => "incoming/systems"),
+
+ "NewDevice" => array(
+ "CLASS" => "TERMTABS",
+ "TABNAME" => "termgeneric",
+ "TABCLASS" => "termtabs",
+ "ACLC" => "incoming",
+ "ACL" => "incoming/systems"),
+
+ "terminal" => array(
+ "CLASS" => "TERMTABS",
+ "TABNAME" => "termgeneric",
+ "TABCLASS" => "termtabs",
+ "ACLC" => "terminal",
+ "ACL" => "terminal/termgeneric"),
+
+ "workstation" => array(
+ "CLASS" => "WORKTABS",
+ "TABNAME" => "workgeneric",
+ "TABCLASS"=> "worktabs",
+ "ACLC" => "workstation",
+ "ACL" => "workstation/workgeneric" ),
+
+ "server" => array(
+ "CLASS" => "SERVTABS",
+ "TABNAME" => "servgeneric",
+ "TABCLASS"=> "servtabs",
+ "ACLC" => "server",
+ "ACL" => "server/servgeneric"),
+
+ "printer" => array(
+ "CLASS" => "PRINTTABS",
+ "TABNAME" => "printgeneric",
+ "TABCLASS"=> "printtabs",
+ "ACLC" => "printer",
+ "ACL" => "printer/printgeneric"),
+
+ "phone" => array(
+ "CLASS" => "PHONETABS",
+ "TABNAME" => "phoneGeneric",
+ "TABCLASS"=> "phonetabs",
+ "ACLC" => "phone",
+ "ACL" => "phone/phoneGeneric"),
+
+ "winstation" => array(
+ "CLASS" => "WINTABS",
+ "TABNAME" => "wingeneric",
+ "TABCLASS"=> "wintabs",
+ "ACLC" => "winworkstation",
+ "ACL" => "winworkstation/wingeneric"),
+
+ "component" => array(
+ "CLASS" => "COMPONENTTABS",
+ "TABNAME" => "componentGeneric",
+ "TABCLASS"=> "componenttabs",
+ "ACLC" => "component",
+ "ACL" => "component/componentGeneric"));
+
+ if($this->opsi != NULL){
+ $tabs["opsi_client"] = array(
+ "CLASS" => "OPSITABS",
+ "TABNAME" => "opsigeneric" ,
+ "TABCLASS"=> "opsi_tabs",
+ "ACLC" => "opsi" ,
+ "ACL" => "opsi/opsigeneric");
+ }
+
+ return($tabs);
+ }
+
+
+
/* !! Incoming dummy acls, required to defined acls for incoming objects
*/
static function plInfo()