Added macAddress to the attributes to be replaced

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

diff --git a/TODO b/TODO
index 8e1b3eccc72f2b47cfb45af83a24de966edf8bba..f55504667a2a6de28413d2995a83114ac9cf53de 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,11 +5,9 @@ Target for 2.4.1:
 
 * saveFilter added, please use!
 
-* Added functions normalizePreg and normalizeLdap. Please use where needed!
-
 * generatePasteIcon added, please use!
 
-* Create a status-bar/-display for FAI installations 
+* Added functions normalizePreg and normalizeLdap. Please use where needed!
 
 * Add online help (english/german)
   Document how to generate it, generate it and check it in
@@ -28,9 +26,10 @@ Target for 2.4.1:
 
 * Auto-Resize for subdialogs
 
-* Fix fai objects to generate tags if needed (sub objects)
 
-* Add macAddress replacement for tc's and servers, too
+* Create a status-bar/-display for FAI installations 
+
+* Fix fai objects to generate tags if needed (sub objects)
 
 * What about unitTag's when moving objects?
 

diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc
index ad47160ae20dd94661829b64007c72ecead3fe0e..a969b4440bdbd61e73daa70b1b4c498536c65525 100644 (file)
--- a/plugins/admin/systems/class_servGeneric.inc
+++ b/plugins/admin/systems/class_servGeneric.inc
@@ -178,7 +178,7 @@ class servgeneric extends plugin
       unset($og->member[$this->dn]);
       $og->save ();
     }
-    $this->handle_post_events("remove");
+    $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
   }
 
 

diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index b3092231775095d5c48a952212ec0599b20656b5..c3a227a3297eb0725f571e1540a3ffe1dfaad21a 100644 (file)
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -266,7 +266,7 @@ class termgeneric extends plugin
       show_ldap_error($ldap->get_error());
 
       /* Optionally execute a command after we're done */
-      $this->handle_post_events("remove");
+      $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
 
       /* Delete references to object groups */
       $ldap->cd ($this->config->current['BASE']);