From 0b6ea738191e58dfc0ce1cd9ae6118200a631f76 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 4 Mar 2008 13:23:31 +0000 Subject: [PATCH] Fixed server event handling git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9313 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/admin/systems/class_servGeneric.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc index c42b16683..4b6c8d8c6 100644 --- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc +++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc @@ -130,11 +130,12 @@ class servgeneric extends plugin $action = $mapEvent[$action]; } + /* Check if we have an DaemonEvent for this action */ - if(class_available("DaemonEvent_".$action)){ - $events = DaemonEvent::get_event_types(SYSTEM_EVENT); - if(isset($events['BY_CLASS']["DaemonEvent_".$action])){ - $evt = $events['BY_CLASS']["DaemonEvent_".$action]; + if(class_available("DaemonEvent")){ + $events = DaemonEvent::get_event_types(SYSTEM_EVENT | HIDDEN_EVENT); + if(isset($events['TRIGGERED']["DaemonEvent_".$action])){ + $evt = $events['TRIGGERED']["DaemonEvent_".$action]; $tmp = new $evt['CLASS_NAME']($this->config); $tmp->add_targets(array($this->netConfigDNS->macAddress)); $tmp->set_type(TRIGGERED_EVENT); @@ -435,8 +436,8 @@ class servgeneric extends plugin */ $events = DaemonEvent::get_event_types(SYSTEM_EVENT); $o_queue = new gosaSupportDaemon(); - if(isset($events['BY_CLASS']['DaemonEvent_installation_activation'])){ - $evt = $events['BY_CLASS']['DaemonEvent_installation_activation']; + if(isset($events['TRIGGERED']['DaemonEvent_installation_activation'])){ + $evt = $events['TRIGGERED']['DaemonEvent_installation_activation']; $tmp = new $evt['CLASS_NAME']($this->config); $tmp->set_type(TRIGGERED_EVENT); $tmp->add_targets(array($this->netConfigDNS->macAddress)); -- 2.30.2