Updated System management trigger event

[gosa.git] / gosa-plugins / systems / admin / systems / class_systemManagement.inc

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index 21f1032075e89b22e177d762bcf91b760c1e9b47..eacdf888f528bfd15eda7e12de7fa4ffcd0dd5bd 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -722,12 +722,19 @@ class systems extends plugin
       if(count($ids) && class_available("DaemonEvent")){
         $mac= array();
 
+        /* Collect target mac addresses */
         $ldap = $this->config->get_ldap_link();
         foreach($ids as $id){
-          $ldap->cat ($this->terminals[$id]['dn'], array("macAddress"));
-          $attrs= $ldap->fetch();
-          if (isset($attrs['macAddress'][0])){
-            $mac[]= $attrs['macAddress'][0];
+          $type = $this->get_system_type($this->terminals[$id]);
+          if(!in_array($type,array("terminal","server","workstation","opsi_client","winstation "))) continue;
+          if(isset($this->terminals[$id]['macAddress'][0])){
+            $mac[] = $this->terminals[$id]['macAddress'][0];
+          }else{
+            $ldap->cat ($this->terminals[$id]['dn'], array("macAddress"));
+            $attrs= $ldap->fetch();
+            if (isset($attrs['macAddress'][0])){
+              $mac[]= $attrs['macAddress'][0];
+            }
           }
         }
         $events = DaemonEvent::get_event_types(SYSTEM_EVENT);
@@ -1169,7 +1176,7 @@ class systems extends plugin
 
     /* Attributes to fetch */
     $sys_attrs        = array("cn", "description", "macAddress", "objectClass", "sambaDomainName","gotoMode","FAIclass");
-    $sys_categories   = array("terminal", "workstation", "server", "phone" ,"printer","incoming");
+    $sys_categories   = array("terminal", "workstation", "server", "phone" ,"printer","incoming","winworkstation");
 
     /* Add FAIstate to attributes if FAI is activated */
     $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs'));
@@ -1326,8 +1333,9 @@ class systems extends plugin
           $terminal['type']   = "Q";
           $terminal['is_new'] = $add;
         }
-      } elseif (in_array_ics('ieee802Device', $value["objectClass"])){
-
+      } elseif (in_array_ics('ieee802Device', $value["objectClass"]) && 
+        !( in_array_ics('sambaAccount', $value["objectClass"]) || in_array_ics('sambaSamAccount', $value["objectClass"]))){
+        $type= "winstation";
         $acl = $ui->get_permissions($value['dn'],"component/componentGeneric");
         if($add != "" || preg_match("/r/",$acl)) {
 
@@ -1495,6 +1503,9 @@ class systems extends plugin
     $type= "";
     if (in_array_ics('gosa_opsi_client', $classes)){
       $type= "opsi_client";
+    }elseif (in_array_ics('sambaAccount', $classes) ||
+        in_array_ics('sambaSamAccount', $classes)){
+      $type= "winstation";
     }elseif (in_array_ics('ieee802Device', $classes)){
       $type= "component";
     }elseif (in_array_ics('gotoTerminal', $classes)){
@@ -1511,9 +1522,6 @@ class systems extends plugin
       $type= "ArpNewDevice";
     }elseif (in_array_ics('GOhard', $classes)){
       $type= "NewDevice";
-    }elseif (in_array_ics('sambaAccount', $classes) ||
-        in_array_ics('sambaSamAccount', $classes)){
-      $type= "winstation";
     }
     return ($type);
   }