Backport from trunk

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

diff --git a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
index c16558ed8755fca83d6536ce74bbebe78d90c424..a086d8cdb71b312144fcb1509a3a500493695c53 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
+++ b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
@@ -18,49 +18,49 @@ class filterSYSTEMS {
                 preg_match("/".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"),'/')."/i", $entry['dn'])){
 
                 // Detect incoming types
-                if(in_array('gotoWorkstation', $entry['objectClass'])){
+                if(in_array_strict('gotoWorkstation', $entry['objectClass'])){
                     $entries[$key]['objectClass'][] = 'FAKE_OC_NewWorkstation';
                     $entries[$key]['cn'][0].= " <i>("._("New workstation").")</i>";
-                }elseif(in_array('gotoTerminal', $entry['objectClass'])){
+                }elseif(in_array_strict('gotoTerminal', $entry['objectClass'])){
                     $entries[$key]['objectClass'][] = 'FAKE_OC_NewTerminal';
                     $entries[$key]['cn'][0].= " <i>("._("New terminal").")</i>";
                 }elseif($arp_handling_active && 
-                        in_array('GOhard', $entry['objectClass']) && 
+                        in_array_strict('GOhard', $entry['objectClass']) && 
                         !isset($entry['gotoMode'][0])){ 
                     $entries[$key]['objectClass'][] = 'FAKE_OC_ArpNewDevice';
                     $entries[$key]['cn'][0].= " <i>("._("New unknown device").")</i>";
-                }elseif(in_array('GOhard', $entry['objectClass'])){
+                }elseif(in_array_strict('GOhard', $entry['objectClass'])){
                     $entries[$key]['objectClass'][] = 'FAKE_OC_NewDevice';
                     $entries[$key]['cn'][0].= " <i>("._("New device").")</i>";
                 }
 
                 // Detect SAMBA machines
-            }elseif(in_array('sambaSamAccount', $entry['objectClass']) && preg_match("/\$$/", $entry['cn'][0])){
+            }elseif(in_array_strict('sambaSamAccount', $entry['objectClass']) && preg_match("/\$$/", $entry['cn'][0])){
                 $entries[$key]['objectClass'][] = 'FAKE_OC_winstation';
 
                 // Detect Workstation & templates
-            }elseif(in_array('gotoWorkstation', $entry['objectClass'])){
+            }elseif(in_array_strict('gotoWorkstation', $entry['objectClass'])){
                 $pwd_acl = $ui->get_permissions($entry['dn'],'workstation/workgeneric','userPassword');
                 if(preg_match("/w/",$pwd_acl)){
                     $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble';
                 }
 
                 // Detect Terminal & templates
-            }elseif(in_array('gotoTerminal', $entry['objectClass'])){
+            }elseif(in_array_strict('gotoTerminal', $entry['objectClass'])){
                 $pwd_acl = $ui->get_permissions($entry['dn'],'terminal/termgeneric','userPassword');
                 if(preg_match("/w/",$pwd_acl)){
                     $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble';
                 }
 
                 // Detect Server & templates
-            }elseif(in_array('goServer', $entry['objectClass'])){
+            }elseif(in_array_strict('goServer', $entry['objectClass'])){
                 $pwd_acl = $ui->get_permissions($entry['dn'],'server/servgeneric','userPassword');
                 if(preg_match("/w/",$pwd_acl)){
                     $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble';
                 }
 
                 // Detect ieee802Device
-            }elseif(in_array('ieee802Device', $entry['objectClass'])){
+            }elseif(in_array_strict('ieee802Device', $entry['objectClass'])){
                 $pwd_acl = $ui->get_permissions($entry['dn'],'component/componentGeneric','userPassword');
                 if(preg_match("/w/",$pwd_acl)){
                     $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble';
@@ -70,7 +70,7 @@ class filterSYSTEMS {
             // Detect object states
             $state = 'none';
             foreach(array('gotoWorkstation','gotoTerminal','goServer') as $type){
-                if(in_array($type, $entry['objectClass'])){
+                if(in_array_strict($type, $entry['objectClass'])){
 
                     if(isset($entry['FAIstate'][0])){
                         switch (preg_replace('/:.*$/', '', $entry['FAIstate'][0])) {