Updated system filter

-DO not exlude some machine due to a lack of macAddress settings.

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

diff --git a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
index 4c67c8bcda4c4d9cafe3dfa261fb8f2f46e8f033..35e0d0138b6377e0fe2e481808d997274ffe42ff 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
+++ b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
@@ -39,11 +39,6 @@ class filterSYSTEMS {
 
                 // Detect Workstation & templates
             }elseif(in_array('gotoWorkstation', $entry['objectClass'])){
-                if(!isset($entry['macAddress'][0]) || $entry['macAddress'][0] == "-"){
-                    unset($entries[$key]);
-                    continue; // We do not need templates anymore, we've ogroups now.
-                    //$entries[$key]['objectClass'][] = 'FAKE_OC_WorkstationTemplate';
-                }
                 $pwd_acl = $ui->get_permissions($entry['dn'],'workstation/workgeneric','userPassword');
                 if(preg_match("/w/",$pwd_acl)){
                     $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble';
@@ -51,11 +46,6 @@ class filterSYSTEMS {
 
                 // Detect Terminal & templates
             }elseif(in_array('gotoTerminal', $entry['objectClass'])){
-                if(!isset($entry['macAddress'][0]) || $entry['macAddress'][0] == "-"){
-                    unset($entries[$key]);
-                    continue; // We do not need templates anymore, we've ogroups now.
-                    //$entries[$key]['objectClass'][] = 'FAKE_OC_TerminalTemplate';
-                }
                 $pwd_acl = $ui->get_permissions($entry['dn'],'terminal/termgeneric','userPassword');
                 if(preg_match("/w/",$pwd_acl)){
                     $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble';
@@ -63,11 +53,6 @@ class filterSYSTEMS {
 
                 // Detect Server & templates
             }elseif(in_array('goServer', $entry['objectClass'])){
-                if(!isset($entry['macAddress'][0]) || $entry['macAddress'][0] == "-"){
-                    unset($entries[$key]);
-                    continue; // We do not need templates anymore, we've ogroups now.
-                    //$entries[$key]['objectClass'][] = 'FAKE_OC_ServerTemplate';
-                }
                 $pwd_acl = $ui->get_permissions($entry['dn'],'server/servgeneric','userPassword');
                 if(preg_match("/w/",$pwd_acl)){
                     $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble';
@@ -110,9 +95,6 @@ class filterSYSTEMS {
                 $entries[$key]['state']= $state;
                 $entries[$key]['count'] ++;
             }
-
-            
-
         }
         return($entries);
     }