X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_workstationGeneric.inc;h=56912e07816110dec029811869ca5c5fece4f49e;hb=f621bf6a9170ea3aacbf5ed1380350ee0ef74fb8;hp=6ee0d68f5712f2030eabdc3a0bd01cbc73ee9746;hpb=e46717a0c886f1f487978ecd516ec493404330e1;p=gosa.git diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc index 6ee0d68f5..56912e078 100644 --- a/plugins/admin/systems/class_workstationGeneric.inc +++ b/plugins/admin/systems/class_workstationGeneric.inc @@ -10,14 +10,14 @@ class workgeneric extends plugin /* Generic terminal attributes */ var $gotoMode= "locked"; var $gotoSyslogServer= ""; - var $gotoNtpServer= ""; + var $gotoSyslogServers= array(); + var $gotoNtpServer= array(); + var $gotoNtpServers= array(); var $gotoSndModule= ""; var $gotoFloppyEnable= ""; var $gotoCdromEnable= ""; var $ghCpuType= "-"; var $ghMemSize= "-"; - var $macAddress= ""; - var $ipHostNumber= ""; var $ghUsbSupport= "-"; var $ghNetNic= array(); var $ghIdeDev= array(); @@ -25,8 +25,9 @@ class workgeneric extends plugin var $ghGfxAdapter= "-"; var $ghSoundAdapter= "-"; var $gotoLastUser= "-"; - var $FAIscript=""; + var $FAIscript= ""; var $didAction= FALSE; + var $FAIstate= ""; /* Needed values and lists */ var $base= ""; @@ -37,25 +38,32 @@ class workgeneric extends plugin /* Plugin side filled */ var $modes= array(); + var $netConfigDNS; + + var $inheritTimeServer = true; + /* attribute list for save action */ var $ignore_account= TRUE; - var $attributes= array("gotoMode", "macAddress", "gotoSyslogServer", "gotoNtpServer", + var $attributes= array("gotoMode", "gotoSyslogServer", "gotoNtpServer", "gotoFloppyEnable", "gotoCdromEnable", "cn", "gotoSndModule", - "ghCpuType", "ghMemSize", "ghUsbSupport", "ipHostNumber", + "ghCpuType", "ghMemSize", "ghUsbSupport", "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l","FAIscript"); var $objectclasses= array("top", "gotoWorkstation", "GOhard","FAIobject"); + var $mapActions = array("reboot" => "", + "instant_update" => "softupdate", + "update" => "sceduledupdate", + "reinstall" => "install", + "rescan" => "", + "memcheck" => "memcheck", + "sysinfo" => "sysinfo"); + + + function workgeneric ($config, $dn= NULL) { plugin::plugin ($config, $dn); - - /* Load available modes */ - $ldap= $this->config->get_ldap_link(); - $ldap->cd ($this->config->current['BASE']); - $ldap->search ("(objectClass=gotoInstallProfile)"); - while ($attrs= $ldap->fetch()){ - $this->modes[]= $attrs["cn"][0]; - } + $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses); /* Read arrays */ foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){ @@ -67,10 +75,32 @@ class workgeneric extends plugin } } + /* Create used ntp server array */ + $this->gotoNtpServer= array(); + if(isset($this->attrs['gotoNtpServer'])){ + $this->inheritTimeServer = false; + unset($this->attrs['gotoNtpServer']['count']); + foreach($this->attrs['gotoNtpServer'] as $server){ + $this->gotoNtpServer[$server] = $server; + } + } + + /* Set inherit checkbox state */ + if((in_array("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer) == 0)){ + $this->inheritTimeServer = true; + $this->gotoNtpServer=array(); + } + + /* Create available ntp options */ + $tmp = $this->config->data['SERVERS']['NTP']; + $this->gotoNtpServers = array(); + foreach($tmp as $key => $server){ + if($server == "default") continue; + $this->gotoNtpServers[$server] = $server; + } + $this->modes["active"]= _("Activated"); $this->modes["locked"]= _("Locked"); - $this->modes["memcheck"]= _("Memory test"); - $this->modes["sysinfo"]= _("System analysis"); /* Set base */ if ($this->dn == "new"){ @@ -80,14 +110,24 @@ class workgeneric extends plugin $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn); } + /* Create an array of all Syslog servers */ + $tmp = $this->config->data['SERVERS']['SYSLOG']; + foreach($tmp as $server){ + $visible = $server; + if($server == "default") { + $visible = "["._("inherited")."]"; + } + $this->gotoSyslogServers[$server] = $visible; + } + /* Save 'dn' for later referal */ $this->orig_dn= $this->dn; } function execute() { - /* Call parent execute */ - plugin::execute(); + /* Call parent execute */ + plugin::execute(); /* Do we need to flip is_account state? */ if (isset($_POST['modify_state'])){ @@ -99,10 +139,40 @@ class workgeneric extends plugin if ($cmd == ""){ print_red(_("No ACTIONCMD definition found in your gosa.conf")); } else { - exec ($cmd." ".$this->macAddress." ".escapeshellarg($_POST['saction']), $dummy, $retval); + exec ($cmd." ".$this->netConfigDNS->macAddress." ".escapeshellarg($_POST['saction']), $dummy, $retval); if ($retval != 0){ print_red(sprintf(_("Execution of '%s' failed!"), $cmd)); } else { + + /* Set FAIstate */ + $ldap = $this->config->get_ldap_link(); + $ldap->cd($this->config->current['BASE']); + $ldap->cat($this->dn,array("objectClass")); + $res = $ldap->fetch(); + + $attrs = array(); + $attrs['FAIstate'] = ""; + if(isset($this->mapActions[$_POST['saction']])){ + $attrs['FAIstate'] = $this->mapActions[$_POST ['saction']]; + } + + for($i = 0; $i < $res['objectClass']['count'] ; $i ++){ + $attrs['objectClass'][] = $res['objectClass'][$i]; + } + + if(($attrs['FAIstate'] != "") && (!in_array("FAIobject",$attrs['objectClass']))){ + $attrs['objectClass'][] = "FAIobject"; + } + + if($attrs['FAIstate'] == ""){ + #FIXME we should check if FAIobject is used anymore + $attrs['FAIstate'] = array(); + } + + $ldap->cd($this->dn); + $ldap->modify($attrs); + show_ldap_error($ldap->get_error()); + $this->didAction= TRUE; } } @@ -115,12 +185,57 @@ class workgeneric extends plugin return($display); } + /* Base select dialog */ + $once = true; + foreach($_POST as $name => $value){ + if(preg_match("/^chooseBase/",$name) && $once){ + $once = false; + $this->dialog = new baseSelectDialog($this->config,$this); + $this->dialog->setCurrentBase($this->base); + } + } + + /* Dialog handling */ + if(is_object($this->dialog)){ + /* Must be called before save_object */ + $this->dialog->save_object(); + + if($this->dialog->isClosed()){ + $this->dialog = false; + }elseif($this->dialog->isSelected()){ + $this->base = $this->dialog->isSelected(); + $this->dialog= false; + }else{ + return($this->dialog->execute()); + } + } + + /* Add new ntp Server to our list */ + if((isset($_POST['addNtpServer'])) && (isset($_POST['gotoNtpServers']))){ + $this->gotoNtpServer[$_POST['gotoNtpServers']] = $_POST['gotoNtpServers']; + } + + /* Delete selected NtpServer for list of used servers */ + if((isset($_POST['delNtpServer'])) && (isset($_POST['gotoNtpServerSelected']))){ + foreach($_POST['gotoNtpServerSelected'] as $name){ + unset($this->gotoNtpServer[$name]); + } + } + /* Fill templating stuff */ $smarty= get_smarty(); $smarty->assign("cn", $this->cn); $smarty->assign("l", $this->l); $smarty->assign("bases", $this->config->idepartments); $smarty->assign("staticAddress", ""); + + $tmp = array(); + foreach($this->gotoNtpServers as $server){ + if(!in_array($server,$this->gotoNtpServer)){ + $tmp[$server] = $server; + } + } + $smarty->assign("gotoNtpServers",$tmp); /* Check if workstation is online */ $query= "fping -q -r 1 -t 500 ".$this->cn; @@ -132,40 +247,53 @@ class workgeneric extends plugin "instant_update" => _("Instant update"), "update" => _("Scheduled update"), "reinstall" => _("Reinstall"), - "rescan" => _("Rescan hardware"))); + "rescan" => _("Rescan hardware"), + "memcheck" => _("Memory test"), + "sysinfo" => _("System analysis"))); } else { $smarty->assign("actions", array("wake" => _("Wake up"), "reinstall" => _("Reinstall"), - "update" => _("Scheduled update"))); + "update" => _("Scheduled update"), + "memcheck" => _("Memory test"), + "sysinfo" => _("System analysis"))); } /* Arrays */ $smarty->assign("modes", $this->modes); $smarty->assign("nfsservers", $this->config->data['SERVERS']['NFS']); - $smarty->assign("syslogservers", $this->config->data['SERVERS']['SYSLOG']); - $smarty->assign("ntpservers", $this->config->data['SERVERS']['NTP']); + $smarty->assign("syslogservers", $this->gotoSyslogServers); + + $ntpser = array(); + foreach($this->gotoNtpServers as $server){ + if(!in_array($server,$this->gotoNtpServer)){ + $ntpser[$server] = $server; + } + } + $smarty->assign("gotoNtpServers", $ntpser); /* Variables */ foreach(array("base", "gotoMode", "gotoSyslogServer", "gotoNtpServer") as $val){ $smarty->assign($val."_select", $this->$val); $smarty->assign($val."ACL", chkacl($this->acl, $val)); } - $smarty->assign("ipHostNumber", $this->ipHostNumber); - $smarty->assign("macAddress", $this->macAddress); $smarty->assign("actionACL", chkacl($this->acl, 'action')); + /* tell smarty the inherit checkbox state */ + $smarty->assign("inheritTimeServer",$this->inheritTimeServer); + /* Show main page */ - $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl"); + $smarty->assign("netconfig", $this->netConfigDNS->execute()); return($smarty->fetch (get_template_path('workstation.tpl', TRUE))); } function remove_from_parent() { + $this->netConfigDNS->remove_from_parent(); $ldap= $this->config->get_ldap_link(); $ldap->rmdir($this->dn); - show_ldap_error($ldap->get_error()); + show_ldap_error($ldap->get_error(), _("Removing workstation failed")); /* Optionally execute a command after we're done */ - $this->handle_post_events("remove"); + $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress)); /* Delete references to object groups */ $ldap->cd ($this->config->current['BASE']); @@ -175,7 +303,6 @@ class workgeneric extends plugin unset($og->member[$this->dn]); $og->save (); } - } @@ -188,13 +315,26 @@ class workgeneric extends plugin if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){ $this->base= $_POST['base']; } + $this->netConfigDNS->save_object(); + + /* Set inherit mode */ + if(isset($_POST['workgeneric_posted'])){ + if(isset($_POST["inheritTimeServer"])){ + $this->inheritTimeServer = true; + }else{ + $this->inheritTimeServer = false; + } + } + } /* Check supplied data */ function check() { - $message= array(); + /* Call common method to give check the hook */ + $message= plugin::check(); + $message= array_merge($message, $this->netConfigDNS->check()); $ui= get_userinfo(); $this->dn= "cn=".$this->cn.",ou=workstations,ou=systems,".$this->base; @@ -211,7 +351,7 @@ class workgeneric extends plugin if ($this->orig_dn != $this->dn){ $ldap= $this->config->get_ldap_link(); $ldap->cd ($this->base); - $ldap->search ("(cn=".$this->cn.")", array("cn")); + $ldap->search ("(&(cn=".$this->cn.")(objectClass=gotoWorkstation))", array("cn")); if ($ldap->count() != 0){ while ($attrs= $ldap->fetch()){ if (preg_match ("/,ou=incoming,/", $ldap->getDN())){ @@ -225,6 +365,11 @@ class workgeneric extends plugin } } } + + /* Check for valid ntpServer selection */ + if((!$this->inheritTimeServer) && (!count($this->gotoNtpServer))){ + $message[]= _("There must be at least one NTP server selected, or the inherit mode activated."); + } return ($message); } @@ -262,6 +407,27 @@ class workgeneric extends plugin $this->attrs= $attrs; } + /* Update ntp server settings */ + if($this->inheritTimeServer){ + if($this->new){ + if(isset($this->attrs['gotoNtpServer'])){ + unset($this->attrs['gotoNtpServer']); + } + }else{ + $this->attrs['gotoNtpServer'] = array(); + } + }else{ + /* Set ntpServers */ + $this->attrs['gotoNtpServer'] = array(); + foreach($this->gotoNtpServer as $server){ + $this->attrs['gotoNtpServer'][] = $server; + } + } + + if(($this->gosaUnitTag) && (!in_array_ics("gosaAdministrativeUnitTag",$this->attrs['objectClass']))){ + $this->attrs['objectClass'][] = "gosaAdministrativeUnitTag"; + } + /* Write back to ldap */ $ldap= $this->config->get_ldap_link(); if ($this->orig_dn == 'new'){ @@ -269,6 +435,7 @@ class workgeneric extends plugin $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn)); $ldap->cd($this->dn); $ldap->add($this->attrs); + show_ldap_error($ldap->get_error(), _("Saving workstation failed")); if(!$this->didAction){ $this->handle_post_events("add"); } @@ -277,15 +444,16 @@ class workgeneric extends plugin $this->move($this->orig_dn, $this->dn); } $ldap->cd($this->dn); - $ldap->modify($this->attrs); + $this->cleanup(); + $ldap->modify ($this->attrs); + if(!$this->didAction){ $this->handle_post_events("modify"); } } - show_ldap_error($ldap->get_error()); - - /* Optionally execute a command after we're done */ - $this->postcreate(); + $this->netConfigDNS->cn = $this->cn; + $this->netConfigDNS->save($this->dn); + show_ldap_error($ldap->get_error(), _("Saving workstation failed")); } }