![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 94d08ba4e865028db4063be339f180086db4ef1e..4604c98a77c16c7965795458e083127982d3c129 100644 (file)
"gotoFloppyEnable", "gotoCdromEnable", "cn", "gotoSndModule",
"ghCpuType", "ghMemSize", "ghUsbSupport",
"ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l","FAIscript");
- var $objectclasses= array("top", "gotoWorkstation", "GOhard","FAIobject");
+ var $objectclasses= array("top", "gotoWorkstation", "GOhard");
var $mapActions = array("reboot" => "localboot",
+ "localboot" => "localboot",
"instant_update" => "softupdate",
"update" => "sceduledupdate",
"reinstall" => "install",
"memcheck" => "memcheck",
"sysinfo" => "sysinfo");
-
+
+ var $fai_activated = FALSE;
function workgeneric ($config, $dn= NULL, $parent= NULL)
{
+ $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);
$this->gotoSyslogServers[$server] = $visible;
}
+ if($this->is_account){
+ @log::log("view","workstation/".get_class($this),$this->dn);
+ }
+
/* Save 'dn' for later referal */
$this->orig_dn= $this->dn;
}
exec ($cmd." ".$this->netConfigDNS->macAddress." ".escapeshellarg($_POST['saction']), $dummy, $retval);
if ($retval != 0){
print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
- } else {
+ } elseif ($_POST['saction'] != "wake") {
/* 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']];
- }
+ if($this->fai_activated && $this->dn != "new"){
+ $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];
- }
+ 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'] != "") && (!in_array("FAIobject",$attrs['objectClass']))){
+ $attrs['objectClass'][] = "FAIobject";
+ }
- if($attrs['FAIstate'] == ""){
- #FIXME we should check if FAIobject is used anymore
- $attrs['FAIstate'] = array();
- }
+ if($attrs['FAIstate'] == ""){
+#FIXME we should check if FAIobject is not used anymore
+ $attrs['FAIstate'] = array();
+ }
+
+ $ldap->cd($this->dn);
+ $ldap->modify($attrs);
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of system workstation/generic (FAIstate) with dn '%s' failed."),$this->dn));
- $ldap->cd($this->dn);
- $ldap->modify($attrs);
- show_ldap_error($ldap->get_error(), sprintf(_("Saving of system workstation/generic (FAIstate) with dn '%s' failed."),$this->dn));
-
+ }
$this->didAction= TRUE;
}
}
if($this->dialog->isClosed()){
$this->dialog = false;
}elseif($this->dialog->isSelected()){
- $this->base = $this->dialog->isSelected();
+
+ /* A new base was selected, check if it is a valid one */
+ $tmp = $this->get_allowed_bases();
+ if(isset($tmp[$this->dialog->isSelected()])){
+ $this->base = $this->dialog->isSelected();
+ }
+
$this->dialog= false;
}else{
return($this->dialog->execute());
/* Fill templating stuff */
$smarty= get_smarty();
- /* Create base acls */
- $baseACL = $this->getacl("base");
- if(!$this->acl_is_moveable()) {
- $baseACL = preg_replace("/w/","",$baseACL);
- }
- $smarty->assign("baseACL", $baseACL);
-
/* Set acls */
$tmp = $this->plInfo();
foreach($tmp['plProvidedAcls'] as $name => $translation){
"reinstall" => _("Reinstall"),
"rescan" => _("Rescan hardware"),
"memcheck" => _("Memory test"),
+ "localboot" => _("Force localboot"),
"sysinfo" => _("System analysis")));
} else {
$smarty->assign("actions", array("wake" => _("Wake up"),
"reinstall" => _("Reinstall"),
"update" => _("Scheduled update"),
"memcheck" => _("Memory test"),
+ "localboot" => _("Force localboot"),
"sysinfo" => _("System analysis")));
}
/* Arrays */
$smarty->assign("modes", $this->modes);
$smarty->assign("nfsservers", $this->config->data['SERVERS']['NFS']);
$smarty->assign("syslogservers", $this->gotoSyslogServers);
+ $smarty->assign("fai_activated",$this->fai_activated);
$ntpser = array();
foreach($this->gotoNtpServers as $server){
$this->netConfigDNS->remove_from_parent();
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
+ @log::log("remove","workstation/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
show_ldap_error($ldap->get_error(), sprintf(_("Removing of system workstation/generic with dn '%s' failed."),$this->dn));
/* Optionally execute a command after we're done */
- $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
+ $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS-ipHostNumber));
/* Delete references to object groups */
$ldap->cd ($this->config->current['BASE']);
/* Save data to object */
function save_object()
{
+
+ /* Create a base backup and reset the
+ base directly after calling plugin::save_object();
+ Base will be set seperatly a few lines below */
+ $base_tmp = $this->base;
plugin::save_object();
+ $this->base = $base_tmp;
/* Save base, since this is no LDAP attribute */
- if((isset($_POST['base'])) && ($this->acl_is_moveable())){
- $this->set_acl_base('dummy,'.$_POST['base']);
- if($this->acl_is_moveable()){
-
- if(isset($this->config->idepartments[$_POST['base']])){
- $this->base = $_POST['base'];
- if ($_POST['base'] != $this->base){
- $this->is_modified= TRUE;
- }
- }
+ $tmp = $this->get_allowed_bases();
+ if(isset($_POST['base'])){
+ if(isset($tmp[$_POST['base']])){
+ $this->base= $_POST['base'];
}
}
+
$this->netConfigDNS->save_object();
/* Set inherit mode */
{
/* Call common method to give check the hook */
$message= plugin::check();
- $message= array_merge($message, $this->netConfigDNS->check());
-
- $this->dn= "cn=".$this->cn.",ou=workstations,ou=systems,".$this->base;
- if ($this->orig_dn == "new" && !$this->acl_is_createable()){
- $message[]= _("You have no permissions to create a workstation on this 'Base'.");
+
+ /* Skip IP & Mac checks if this is a template */
+ if($this->cn != "wdefault"){
+ $message= array_merge($message, $this->netConfigDNS->check());
}
+ $this->dn= "cn=".$this->cn.",ou=workstations,ou=systems,".$this->base;
if ($this->cn == ""){
$message[]= _("The required field 'Workstation name' is not set.");
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())){
}
}
}
-
+
/* 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.");
/* 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();
}
}
$ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
$ldap->cd($this->dn);
$ldap->add($this->attrs);
+ @log::log("create","workstation/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
show_ldap_error($ldap->get_error(), sprintf(_("Saving of system workstation/generic with dn '%s' failed."),$this->dn));
if(!$this->didAction){
- $this->handle_post_events("add");
+ $this->handle_post_events("add",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
}
} else {
if ($this->orig_dn != $this->dn){
$ldap->cd($this->dn);
$this->cleanup();
$ldap->modify ($this->attrs);
+ @log::log("modify","workstation/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
if(!$this->didAction){
- $this->handle_post_events("modify");
+ $this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
}
}
+
+ /* cn=default and macAddress=- indicates that this is a template */
+ if($this->cn == "wdefault"){
+ $this->netConfigDNS->macAddress = "-";
+ }
+
$this->netConfigDNS->cn = $this->cn;
$this->netConfigDNS->save($this->dn);
show_ldap_error($ldap->get_error(), sprintf(_("Saving of system workstation/generic with dn '%s' failed."),$this->dn));
"gotoMode" => _("Goto mode"),
"gotoSyslogServer" => _("Syslog server"),
"gotoNtpServer" => _("Ntp server"),
+ "gotoRootPasswd" => _("Root password"),
"FAIstate" => _("Action flag"))
));
}