Updated terminal / Workstation

If a ws/term is removed, all entries in the gosa-si (gosaDaemonQueue) will be removed too.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9397 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 d71ad919692f70c82c77c2bf569960e1929ea666..5d1f47366207fbafeee63989a5c06f3167e34046 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
@@ -330,6 +330,13 @@ class termgeneric extends plugin
           $og->save ();
         }
       }
+
+      /* Clean queue form entries with this mac 
+       */
+      if(class_available("gosaSupportDaemon") && tests::is_mac($this->netConfigDNS->orig_macAddress)){
+        $q = new gosaSupportDaemon();
+        $q->clean_queue_from_mac($this->netConfigDNS->orig_macAddress);
+      }
     }
   }
 

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
index 7cad284b479e3e012c6175ffc065df79521aed57..a103b807b0789f7a8dc0da76f7ca2bcbf4388be4 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
@@ -337,6 +337,13 @@ class workgeneric extends plugin
       }
     }
 
+    /* Clean queue form entries with this mac 
+     */
+    if(class_available("gosaSupportDaemon") && tests::is_mac($this->netConfigDNS->orig_macAddress)){
+      $q = new gosaSupportDaemon();
+      $q->clean_queue_from_mac($this->netConfigDNS->orig_macAddress);
+    }
+
     if(isset($_POST["inheritAll"])){
       $this->set_everything_to_inherited();
     }