X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_workstationGeneric.inc;h=577ed196c8322c4b9606977e3c082a896d5d7dcf;hb=408dda1f13eaab930b68d47cca237d2c866d9aa1;hp=976d182ccf1d302242d0b562b152433d50aee5ae;hpb=eb70f566abfe6fd5178f4338c59563e3d7343dab;p=gosa.git diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc index 976d182cc..577ed196c 100644 --- a/plugins/admin/systems/class_workstationGeneric.inc +++ b/plugins/admin/systems/class_workstationGeneric.inc @@ -50,9 +50,26 @@ class workgeneric extends plugin "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l","FAIscript"); var $objectclasses= array("top", "gotoWorkstation", "GOhard","FAIobject"); - function workgeneric ($config, $dn= NULL) + var $mapActions = array("reboot" => "localboot", + "instant_update" => "softupdate", + "update" => "sceduledupdate", + "reinstall" => "install", + "rescan" => "", + "memcheck" => "memcheck", + "sysinfo" => "sysinfo"); + + + var $fai_activated = FALSE; + + function workgeneric ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); + /* Check if FAI is activated */ + $tmp = search_config($config->data,"faiManagement","CLASS"); + if(!empty($tmp)){ + $this->fai_activated = TRUE; + } + + plugin::plugin ($config, $dn, $parent); $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses); /* Read arrays */ @@ -91,8 +108,6 @@ class workgeneric extends plugin $this->modes["active"]= _("Activated"); $this->modes["locked"]= _("Locked"); - $this->modes["memcheck"]= _("Memory test"); - $this->modes["sysinfo"]= _("System analysis"); /* Set base */ if ($this->dn == "new"){ @@ -134,8 +149,40 @@ class workgeneric extends plugin exec ($cmd." ".$this->netConfigDNS->macAddress." ".escapeshellarg($_POST['saction']), $dummy, $retval); if ($retval != 0){ print_red(sprintf(_("Execution of '%s' failed!"), $cmd)); - } else { - $this->didAction= TRUE; + } elseif ($_POST['saction'] != "wake") { + + if($this->fai_activated && $this->dn != "new"){ + /* 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; + } } } } @@ -202,11 +249,15 @@ 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); @@ -225,7 +276,9 @@ class workgeneric extends plugin $smarty->assign("inheritTimeServer",$this->inheritTimeServer); /* Show main page */ + $this->netConfigDNS->cn= $this->cn; $smarty->assign("netconfig", $this->netConfigDNS->execute()); + $smarty->assign("fai_activated",$this->fai_activated); return($smarty->fetch (get_template_path('workstation.tpl', TRUE))); } @@ -278,7 +331,10 @@ class workgeneric extends plugin { /* Call common method to give check the hook */ $message= plugin::check(); - $message= array_merge($message, $this->netConfigDNS->check()); + + if($this->cn != "wdefault"){ + $message= array_merge($message, $this->netConfigDNS->check()); + } $ui= get_userinfo(); $this->dn= "cn=".$this->cn.",ou=workstations,ou=systems,".$this->base; @@ -295,7 +351,12 @@ 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.")(objectClass=gotoWorkstation))", array("cn")); + + if($this->cn == "wdefault"){ + $ldap->cat($this->dn); + }else{ + $ldap->search ("(&(cn=".$this->cn.")(objectClass=gotoWorkstation))", array("cn")); + } if ($ldap->count() != 0){ while ($attrs= $ldap->fetch()){ if (preg_match ("/,ou=incoming,/", $ldap->getDN())){ @@ -309,7 +370,8 @@ 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."); @@ -326,8 +388,7 @@ class workgeneric extends plugin /* Strip out 'default' values */ foreach (array("gotoSyslogServer") as $val){ - - if ($this->attrs[$val] == "default"){ + if (!isset($this->attrs[$val]) || $this->attrs[$val] == "default"){ $this->attrs[$val]= array(); } } @@ -353,7 +414,13 @@ class workgeneric extends plugin /* Update ntp server settings */ if($this->inheritTimeServer){ - $this->attrs['gotoNtpServer'] = array(); + if($this->new){ + if(isset($this->attrs['gotoNtpServer'])){ + unset($this->attrs['gotoNtpServer']); + } + }else{ + $this->attrs['gotoNtpServer'] = array(); + } }else{ /* Set ntpServers */ $this->attrs['gotoNtpServer'] = array(); @@ -362,6 +429,10 @@ class workgeneric extends plugin } } + 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'){ @@ -369,6 +440,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"); } @@ -378,13 +450,18 @@ class workgeneric extends plugin } $ldap->cd($this->dn); $this->cleanup(); - $this->attrs['gosaUnitTag']= array(); $ldap->modify ($this->attrs); if(!$this->didAction){ $this->handle_post_events("modify"); } } + + /* Set macAddress to '-' this indicates that this is a Workstation Template */ + if($this->cn == "wdefault"){ + $this->netConfigDNS->macAddress = "-"; + } + $this->netConfigDNS->cn = $this->cn; $this->netConfigDNS->save($this->dn); show_ldap_error($ldap->get_error(), _("Saving workstation failed"));