diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index 4b6c8d8c656309c3c592380071f5f1bcbaa603c2..716e6a0cec35c50f05d6f68445a0d9acfc523eca 100644 (file)
var $l= "";
var $description= "";
var $orig_dn= "";
- var $didAction= FALSE;
/* attribute list for save action */
var $attributes= array("cn", "description","gotoMode");
var $netConfigDNS;
var $modes = array();
var $ui ;
- var $mapActions = array("reboot" => "",
- "update" => "softupdate",
- "localboot" => "localboot",
- "reinstall" => "install",
- "rescan" => "",
- "wake" => "",
- "memcheck" => "memcheck",
- "sysinfo" => "sysinfo");
+ var $validActions = array("reboot" => "", "update" => "", "localboot" => "", "reinstall" => "", "rescan" => "",
+ "wake" => "", "memcheck" => "", "sysinfo" => "");
var $fai_activated =FALSE;
var $view_logged = FALSE;
if ((isset($_POST['action'])) && ($this->acl_is_writeable("FAIstate")) && isset($this->mapActions[$_POST['saction']]) ){
-
- /* Check given action */
- $mapEvent = array("wake" => "wakeup",
- "instant_update" => "update");
$action = $_POST['saction'];
- if(isset($mapEvent[$action])){
- $action = $mapEvent[$action];
- }
-
/* Check if we have an DaemonEvent for this action */
if(class_available("DaemonEvent")){
}
}
}else{
-
- msg_dialog::display(_("Missing Daemon Event"),
- sprintf(_("The requested action does not exists '%s' Sending event manually."),"DaemonEvent_".$action),ERROR_DIALOG);
-
- /* No event found, send action manually.
- */
- $method= "gosa";
- $action= $_POST['saction'];
- if ($action == "reinstall" || $action == "update" || $action == "instant_update"){
- $method= "job";
- }
-
- gosaSupportDaemon::send("${method}_trigger_action_".$action,
- $this->netConfigDNS->macAddress,
- array("macAddress" => $this->netConfigDNS->macAddress));
+ msg_dialog::display(_("Event error"),
+ sprintf(_("Event '%s' is not available!"),$action),ERROR_DIALOG);
}
- $this->didAction= TRUE;
-
- if ($_POST['saction'] != "wake") {
-
- /* Set FAIstate */
- 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];
- }
-
- 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(), sprintf(_("Saving of system server/generic (FAIstate) with dn '%s' failed."),$this->dn));
- }
}
/* Base select dialog */
/* Assign status */
if (gosaSupportDaemon::ping($this->netConfigDNS->macAddress)){
$smarty->assign("actions", array("halt" => _("Switch off"), "reboot" => _("Reboot"),
- "instant_update" => _("Instant update"),
- "update" => _("Scheduled update"),
+ "update" => _("Update"),
"reinstall" => _("Reinstall"),
"rescan" => _("Rescan hardware"),
"memcheck" => _("Memory test"),
} else {
$smarty->assign("actions", array("wake" => _("Wake up"),
"reinstall" => _("Reinstall"),
- "update" => _("Scheduled update"),
+ "update" => _("Update"),
"memcheck" => _("Memory test"),
"localboot" => _("Force localboot"),
"sysinfo" => _("System analysis")));
$this->netConfigDNS->save();
/* Optionally execute a command after we're done */
- if(!$this->didAction){
- $this->handle_post_events($mode,array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
- }
+ $this->handle_post_events($mode,array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
if ($activate){
/* Send installation activation
*/
- $events = DaemonEvent::get_event_types(SYSTEM_EVENT);
+ $events = DaemonEvent::get_event_types(SYSTEM_EVENT | HIDDEN_EVENT);
$o_queue = new gosaSupportDaemon();
if(isset($events['TRIGGERED']['DaemonEvent_installation_activation'])){
$evt = $events['TRIGGERED']['DaemonEvent_installation_activation'];