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

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
index cb7b2eafe04ccc98075c6130a22412ef96229010..ce0d12983b2b1e1de9559e75cf164e46ea2d0626 100644 (file)
--- 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 1c383ef24fb7fb96b29aa3e34082a9ca6bfb1a4f..7a08cea1bc2c79739a9b9d0fe9fe8f2428a1d5ad 100644 (file)
--- 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 0d8175d71e9c9e9c550ae9791180a2e52d2c159f..c1c81e29d43b3194032d19ffd3eb478fd19ea50b 100644 (file)
--- 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 0f2ce21641f9a3ff701ba61423131e88814f9d58..35aded41f68ba230ee514883d1b7881481ebacdf 100644 (file)
--- 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'];