From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 6 Sep 2010 06:43:40 +0000 (+0000)
Subject: Updated system activation, respect event accessability
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f8693a1810608bc9b88959f7aeb21ae107b90ee2;p=gosa.git

Updated system activation, respect event accessability


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

diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index 5ff6b3d65..b2fcb6131 100644
--- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc
+++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
@@ -164,7 +164,7 @@ class servgeneric extends plugin
       $action = $_POST['saction'];
       
       /* Check if we have an DaemonEvent for this action */
-      if(class_available("DaemonEvent")){
+      if(class_available("gosaSupportDaemon") && class_available("DaemonEvent")){
         $events = DaemonEvent::get_event_types(SYSTEM_EVENT | HIDDEN_EVENT);
         if(isset($events['TRIGGERED']["DaemonEvent_".$action])){
           $evt = $events['TRIGGERED']["DaemonEvent_".$action];
@@ -426,7 +426,7 @@ class servgeneric extends plugin
     /* Optionally execute a command after we're done */
     $this->handle_post_events($mode,array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
 
-    if ($activate){
+    if($activate && class_available("gosaSupportDaemon") && class_available("DaemonEvent")){
 
       /* Send installation activation 
        */