![[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 d08dce0ffd8a9affed7ded4da5655e6d32594c57..4f1820dda0384a8e5fd4321cae8794430d8007b3 100644 (file)
$this->fai_activated = TRUE;
}
- /* Creat dialog object */
- $this->DivListSystem = new divListSystem($this->config,$this);
-
/* Copy & Paste enabled ?*/
- if ($this->config->get_cfg_value("enablecopypaste") == "true"){
+ if ($this->config->get_cfg_value("copyPaste") == "true"){
$this->CopyPasteHandler = new CopyPasteHandler($this->config);
}
if(class_available("opsi")){
$this->opsi = new opsi($this->config);
}
+
+ /* Creat dialog object */
+ $this->DivListSystem = new divListSystem($this->config,$this);
}
$dsc = array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => array("pipe", "w"));
/* Get and check command */
- $command= $this->config->search("workgeneric", "ISOCMD",array('tabs'));
+ $command= $this->config->search("workgeneric", "SYSTEMISOHOOK",array('tabs'));
if (check_command($command)){
@DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
/* 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
********************/
/* Lock the current entry, so everyone will get the
above dialog */
- $tabs = array(
- "gosa_opsi_client"=> array("CLASS"=>"OPSITABS", "TABCLASS" =>"opsi_tabs", "ACL"=> "opsi"),
- "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){
$dialog = FALSE;
$hide_apply = $this->dn == "new";
- $hide_apply = ($this->dn == "new") || (preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->dn));
+ $hide_apply = ($this->dn == "new") || (preg_match("/".normalizePreg(get_ou("systemIncomingRDN"))."/",$this->dn));
if(is_object($this->systab) && !isset($this->systab->by_object)){
$dialog = TRUE;
$hide_apply = TRUE;
/* Check acls, if we are not allowed to create and write each plugin tab, skip this object */
$tabs = array(
- "terminal" => get_ou('terminalou'),
- "workstation" => get_ou('workstationou'),
- "incoming" => get_ou('incomingou'),
- "server" => get_ou('serverou'),
- "printer" => get_ou('printerou'),
- "phone" => get_ou('phoneou'),
+ "terminal" => get_ou('terminalRDN'),
+ "workstation" => get_ou('workstationRDN'),
+ "incoming" => get_ou('systemIncomingRDN'),
+ "server" => get_ou('serverRDN'),
+ "printer" => get_ou('printerRDN'),
+ "phone" => get_ou('phoneRDN'),
"winworkstation" => get_winstations_ou(),
- "component" => get_ou('componentou')
+ "component" => get_ou('componentRDN')
);
foreach($tabs as $acl_cat => $dn){
$res = array();
$this->terminals = array();
$userregex = "";
+ $opsi_clients = array();
/* Set base for all searches */
$base= $this->DivListSystem->selectedBase;
/* This array represents the combination between checkboxes and search filters */
$objs = array(
- "ShowServers" => array("TAB" => "servtabs", "CLASS" => "goServer" ,"TREE" => get_ou('serverou')),
- "ShowTerminals" => array("TAB" => "termtabs", "CLASS" => "gotoTerminal" ,"TREE" => get_ou('terminalou')),
- "ShowPrinters" => array("TAB" => "printtabs", "CLASS" => "gotoPrinter" ,"TREE" => get_ou('printerou')),
- "ShowDevices" => array("TAB" => "componenttabs", "CLASS" => "ieee802Device" ,"TREE" => get_ou('componentou')),
- "ShowPhones" => array("TAB" => "phonetabs", "CLASS" => "goFonHardware" ,"TREE" => get_ou('phoneou')),
- "ShowWorkstations" => array("TAB" => "worktabs", "CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationou')),
+ "ShowServers" => array("TAB" => "servtabs", "CLASS" => "goServer" ,"TREE" => get_ou('serverRDN')),
+ "ShowTerminals" => array("TAB" => "termtabs", "CLASS" => "gotoTerminal" ,"TREE" => get_ou('terminalRDN')),
+ "ShowPrinters" => array("TAB" => "printtabs", "CLASS" => "gotoPrinter" ,"TREE" => get_ou('printerRDN')),
+ "ShowDevices" => array("TAB" => "componenttabs", "CLASS" => "ieee802Device" ,"TREE" => get_ou('componentRDN')),
+ "ShowPhones" => array("TAB" => "phonetabs", "CLASS" => "goFonHardware" ,"TREE" => get_ou('phoneRDN')),
+ "ShowWorkstations" => array("TAB" => "worktabs", "CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationRDN')),
"ShowWinWorkstations"=> array("TAB" => "wintabs", "CLASS" => $samba ,"TREE" => get_winstations_ou() ));
/* Include the 'Display Systems of user' attribute */
/* Search for incoming objects */
$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));
+ $res = array_merge($res,get_list($filter,$sys_categories, get_ou('systemIncomingRDN').$base,$sys_attrs, GL_SIZELIMIT));
/* Append opsi systems, the opsi extension have to installed.
*/
- if($this->opsi != NULL){
- $res = array_merge($res,$this->opsi->get_hosts_for_system_management());
+ if($this->opsi instanceof opsi && $this->opsi->enabled() && $this->DivListSystem->ShowOpsiHosts){
+ $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'];
}
/* check if current object is a new one */
- if (preg_match ("/,".get_ou('incomingou')."/i", $tmp)){
+ if (preg_match ("/,".get_ou('systemIncomingRDN')."/i", $tmp)){
if (in_array_ics('gotoTerminal', $value['objectClass'])){
$add= "- "._("New terminal");
}elseif (in_array_ics('gotoWorkstation', $value['objectClass'])){
/* Detect type of object and create an entry for $this->terminals */
$terminal = array();
- if (in_array_ics('gosa_opsi_client', $value["objectClass"])){
+ if (0 && in_array_ics('gosa_opsi_client', $value["objectClass"])){
/* check acl */
$terminal = $value;
}
}
+ /* 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);
$type= "";
if (in_array_ics('gosa_opsi_client', $classes)){
- $type= "gosa_opsi_client";
+ $type= "opsi_client";
}elseif (in_array_ics('ieee802Device', $classes)){
$type= "component";
}elseif (in_array_ics('gotoTerminal', $classes)){
/* Add opsi client to system types */
if($this->opsi != NULL){
- $conv["O"] = array("plugins/systems/images/select_default.png",_("Opsi client"));
+ $conv["O"] = array("plugins/systems/images/select_winstation.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()