Updated event handling.

-Events are now only visible for a specific type.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9291 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/systems/admin/systems/class_divListSystem.inc b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
index 909cc65d8f2333494601224311a6b15ec904b811..5c5a9703f1d3645423ba58cc61dee0e0bdaadf64 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_divListSystem.inc
+++ b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
@@ -199,7 +199,7 @@ class divListSystem extends MultiSelectWindow
         " "._("Component")."|"."newsystem_component|\n";
     }
 
-    $events  = DaemonEvent::get_event_types();
+    $events  = DaemonEvent::get_event_types(SYSTEM_EVENT);
     $s.= "..|<img src='images/rocket.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Trigger action")."|\n";
     foreach($events['BY_CLASS'] as $name =>  $event){

diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index 8a2597b06a5eb35b816b274f59146781fe409395..4e75bb711a8fb1a885f45359e2c60bd8478f620c 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc
+++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
@@ -117,7 +117,7 @@ class servgeneric 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);
@@ -418,7 +418,7 @@ class servgeneric 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/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index b352c54fb03c1b0b4399c99fa3746ff3e894646e..066503860a7d851f91a14aa4e7df385db674887c 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -515,7 +515,7 @@ class systems extends plugin
             $mac[]= $attrs['macAddress'][0];
           }
         }
-        $events = DaemonEvent::get_event_types();
+        $events = DaemonEvent::get_event_types(SYSTEM_EVENT);
         $type = preg_replace("/^[a-z]*_event_/","",$s_action);
 
         /* Prepare event to be added 
@@ -879,7 +879,7 @@ class systems extends plugin
         /* Get macAddress to be able to an installation event 
          */ 
         if($this->systab instanceof ArpNewDeviceTabs || session::is_set('SelectedSystemType')){
-          $events = DaemonEvent::get_event_types();
+          $events = DaemonEvent::get_event_types(SYSTEM_EVENT);
          
           /* Get mac of currently edited entry */ 
           $mac = "";