From 7b877b7434007d2fc3872e8a9ef309695c70f939 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 4 Mar 2008 09:20:45 +0000 Subject: [PATCH] Updated event handling. -Event are now only visible for a specific type. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9292 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/admin/systems/goto/class_terminalGeneric.inc | 4 ++-- .../goto/admin/systems/goto/class_terminalStartup.inc | 2 +- .../goto/admin/systems/goto/class_workstationGeneric.inc | 4 ++-- .../goto/admin/systems/goto/class_workstationStartup.inc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc index cb7b2eafe..ce0d12983 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc @@ -182,7 +182,7 @@ class termgeneric extends plugin /* Check if we have an DaemonEvent for this action */ if(class_available("DaemonEvent_".$action)){ - $events = DaemonEvent::get_event_types(); + $events = DaemonEvent::get_event_types(SYSTEM_EVENT); if(isset($events['BY_CLASS']["DaemonEvent_".$action])){ $evt = $events['BY_CLASS']["DaemonEvent_".$action]; $tmp = new $evt['CLASS_NAME']($this->config); @@ -550,7 +550,7 @@ class termgeneric extends plugin /* Send installation activation */ if ($activate){ - $events = DaemonEvent::get_event_types(); + $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']; diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc index 1c383ef24..7a08cea1b 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc @@ -451,7 +451,7 @@ class termstartup extends plugin /* Send ldap configuration update */ if ($ldap_changed){ - $events = DaemonEvent::get_event_types(); + $events = DaemonEvent::get_event_types(SYSTEM_EVENT); $o_queue = new gosaSupportDaemon(); if(isset($events['BY_CLASS']['DaemonEvent_reload_ldap_config'])){ $evt = $events['BY_CLASS']['DaemonEvent_reload_ldap_config']; diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc index 0d8175d71..c1c81e29d 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc @@ -193,7 +193,7 @@ class workgeneric extends plugin /* Check if we have an DaemonEvent for this action */ if(class_available("DaemonEvent_".$action)){ - $events = DaemonEvent::get_event_types(); + $events = DaemonEvent::get_event_types(SYSTEM_EVENT); if(isset($events['BY_CLASS']["DaemonEvent_".$action])){ $evt = $events['BY_CLASS']["DaemonEvent_".$action]; $tmp = new $evt['CLASS_NAME']($this->config); @@ -602,7 +602,7 @@ class workgeneric extends plugin /* Send installation activation */ - $events = DaemonEvent::get_event_types(); + $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']; diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc index 0f2ce2164..35aded41f 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc @@ -903,7 +903,7 @@ class workstartup extends plugin /* Check if LDAP server has changed */ if ($ldap_changed){ - $events = DaemonEvent::get_event_types(); + $events = DaemonEvent::get_event_types(SYSETEM_EVENT); $o_queue = new gosaSupportDaemon(); if(isset($events['BY_CLASS']['DaemonEvent_reload_ldap_config'])){ $evt = $events['BY_CLASS']['DaemonEvent_reload_ldap_config']; -- 2.30.2