Made install -> reinstall

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9394 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 e95e36ef2926fb8a93b26de1617c2f1ea806a57f..5ae7ad3121bbf5e25d3f49f2d00237823820cf46 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc
+++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
@@ -123,7 +123,7 @@ class servgeneric extends plugin
           $evt = $events['TRIGGERED']["DaemonEvent_".$action];
           $tmp = new $evt['CLASS_NAME']($this->config);
           $tmp->add_targets(array($this->netConfigDNS->macAddress));
-          $tmp->set_type(($action == "reinstall" || $action == "update")?SCHEDULED_EVENT:TRIGGERED_EVENT);
+          $tmp->set_type(TRIGGERED_EVENT);
           $o_queue = new gosaSupportDaemon();
           if(!$o_queue->append($tmp)){
             msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index 33c04ec1c2d47e15b6ece8ed425e746fcf139b21..fdf0fe63b48d21ac358c9016a84aaec966c39b35 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -543,7 +543,7 @@ class systems extends plugin
        */
       if(isset($_POST['save_event_dialog']) || $this->systab->get_type() == TRIGGERED_EVENT){
         $o_queue = new gosaSupportDaemon();
-        $this->systab->set_type(($s_action == "trigger_event_DaemonEvent_reinstall" || $s_action == "trigger_event_DaemonEvent_update")?SCHEDULED_EVENT:TRIGGERED_EVENT);
+        $this->systab->set_type(TRIGGERED_EVENT);
         $o_queue->append($this->systab);
         if($o_queue->is_error()){
           msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
@@ -899,11 +899,11 @@ class systems extends plugin
 
           /* Add installation event
            */
-          if(!empty($mac) && isset($events['BY_CLASS']['DaemonEvent_install'])){
-            $evt = $events['BY_CLASS']['DaemonEvent_install'];
+          if(!empty($mac) && isset($events['BY_CLASS']['DaemonEvent_reinstall'])){
+            $evt = $events['BY_CLASS']['DaemonEvent_reinstall'];
             $tmp = new $evt['CLASS_NAME']($this->config);
             $tmp->add_targets(array($mac));
-            $tmp->set_type(TRIGGERED_EVENT);
+            $tmp->set_type(SCHEDULED_EVENT);
             $o_queue = new gosaSupportDaemon();
             $o_queue->append($tmp);
             if($o_queue->is_error()){