![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
index 0ea0d959a813a9bf8752572730e59dd37f323b67..875272ca1033e10a5f8250a6a2c39140223f845d 100644 (file)
var $ghSoundAdapter= "-";
var $gotoLastUser= "-";
var $FAIscript= "";
- var $FAIstate= "";
var $view_logged = FALSE;
/* Needed values and lists */
"ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l","FAIscript");
var $objectclasses= array("top", "gotoWorkstation", "GOhard");
- var $mapActions = array("reboot" => "",
- "localboot" => "localboot",
- "halt" => "",
- "update" => "softupdate",
- "reinstall" => "install",
- "rescan" => "",
- "wake" => "",
- "memcheck" => "memcheck",
- "sysinfo" => "sysinfo");
-
+ var $validActions = array("reboot" => "", "localboot" => "", "halt" => "", "update" => "", "reinstall" => "",
+ "rescan" => "", "wake" => "", "memcheck" => "", "sysinfo" => "");
var $fai_activated = FALSE;
var $member_of_ogroup = FALSE;
+ var $currently_installing = FALSE;
+ var $currently_installing_warned = FALSE;
+
function workgeneric (&$config, $dn= NULL, $parent= NULL)
{
$tmp= $config->search("faiManagement", "CLASS",array('menu','tabs'));
$this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
+ /* Check if this host is currently in installation process*/
+ if(class_available("gosaSupportDaemon") && class_available("DaemonEvent")){
+ $o = new gosaSupportDaemon();
+ $e_types = DaemonEvent::get_event_types(USER_EVENT | SYSTEM_EVENT | HIDDEN_EVENT);
+ $evts = $o->get_entries_by_mac(array($this->netConfigDNS->macAddress));
+ foreach($evts as $evt){
+ if(isset($e_types['QUEUED'][$evt['HEADERTAG']]) && $evt['STATUS'] == "processing" &&
+ $e_types['QUEUED'][$evt['HEADERTAG']] == "DaemonEvent_reinstall"){
+ $this->currently_installing =TRUE;
+ }
+ }
+ }
+
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
if (!isset($this->attrs[$val])){
}
}
- if ((isset($_POST['action'])) && ($this->acl_is_writeable("FAIstate")) && isset($this->mapActions[$_POST['saction']]) ){
+ if ((isset($_POST['action'])) && ($this->acl_is_writeable("FAIstate")) && isset($this->validActions[$_POST['saction']]) ){
+ $action= $_POST['saction'];
/* Check if we have an DaemonEvent for this action */
if(class_available("DaemonEvent")){
$tmp->set_type(TRIGGERED_EVENT);
$o_queue = new gosaSupportDaemon();
if(!$o_queue->append($tmp)){
- msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
- $o_queue->get_error()),ERROR_DIALOG);
+ msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
}
}
+ } else {
+ msg_dialog::display(_("Event error"),
+ sprintf(_("Event '%s' is not available!"),$action),ERROR_DIALOG);
}
+
}
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent === NULL){
$display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
- _("This 'dn' has no workstation features.")."</b>";
+ msgPool::noValidExtension(_("workstation"))."</b>";
return($display);
}
/* Check if workstation is online */
if (gosaSupportDaemon::ping($this->netConfigDNS->macAddress)){
$smarty->assign("actions", array("halt" => _("Switch off"), "reboot" => _("Reboot"),
- "instant_update" => _("Instant update"),
- "update" => _("Scheduled update"),
+ "update" => _("System update"),
"reinstall" => _("Reinstall"),
"rescan" => _("Rescan hardware"),
"memcheck" => _("Memory test"),
} else {
$smarty->assign("actions", array("wake" => _("Wake up"),
"reinstall" => _("Reinstall"),
- "update" => _("Scheduled update"),
+ "update" => _("System update"),
"memcheck" => _("Memory test"),
"localboot" => _("Force localboot"),
"sysinfo" => _("System analysis")));
$smarty->assign("netconfig", $str);
/* Show main page */
+ $smarty->assign("currently_installing", $this->currently_installing);
return($smarty->fetch (get_template_path('workstation.tpl', TRUE, dirname(__FILE__))));
}
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
new 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));
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_DEL, get_class()));
+ }
/* Optionally execute a command after we're done */
$this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
}
}
+ /* Clean queue form entries with this mac
+ */
+ if(class_available("gosaSupportDaemon") && tests::is_mac($this->netConfigDNS->orig_macAddress)){
+ $q = new gosaSupportDaemon();
+ $q->clean_queue_from_mac($this->netConfigDNS->orig_macAddress);
+ }
+
if(isset($_POST["inheritAll"])){
$this->set_everything_to_inherited();
}
$this->dn= "cn=".$this->cn.",".get_ou('workstationou').$this->base;
if ($this->cn == ""){
- $message[]= _("The required field 'Workstation name' is not set.");
+ $message[]= msgPool::required(_("Name"));
}
/* Check if given name is a valid host/dns name */
if(!tests::is_dns_name($this->cn)){
- $message[] = _("Please specify a valid name for this object.");
+ $message[] = msgPool::invalid(_("Name"));
}
if ($this->orig_dn != $this->dn){
continue;
} else {
if ($attrs['dn'] != $this->orig_dn){
- $message[]= sprintf (_("There is already an entry '%s' in the base choosen by you"), $this->cn);
+ $message[]= msgPool::duplicated(_("Name"));
break;
}
}
/* 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.");
+ $message[]= msgPool::required(_("NTP server"));
+ }
+
+ /* Warn the user, that this host is currently installing */
+ if($this->currently_installing && !$this->currently_installing_warned){
+ $this->currently_installing_warned = TRUE;
+ $message[] = _("This host is currently installing, if you really want to save it, save again.");
}
return ($message);
$this->gotoMode != $this->saved_attributes['gotoMode'] &&
$this->gotoMode == "active" &&
tests::is_ip($this->netConfigDNS->ipHostNumber));
-
plugin::save();
/* Strip out 'default' values */
}
}
- 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'){
$ldap->cd($this->dn);
$ldap->add($this->attrs);
new 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 (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
+ }
$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);
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
+ }
new log("modify","workstation/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
$this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
$this->netConfigDNS->cn = $this->cn;
$this->netConfigDNS->save();
- show_ldap_error($ldap->get_error(), sprintf(_("Saving of system workstation/generic with dn '%s' failed."),$this->dn));
if ($activate && class_available("DaemonEvent")){
$tmp->set_type(TRIGGERED_EVENT);
$tmp->add_targets(array($this->netConfigDNS->macAddress));
if(!$o_queue->append($tmp)){
- msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
- $o_queue->get_error()),ERROR_DIALOG);
+ msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
}
}
}