From 8ece5cb9c14b1922d7e3750dd32f3c7309c897ea Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 19 Jan 2010 13:01:20 +0000 Subject: [PATCH] Hide system templates -We've ogroups now and do not need system templates of this type anymore. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15200 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/admin/systems/class_filterSYSTEMS.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc index 8a620e5a7..bb01370f9 100644 --- a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc +++ b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc @@ -38,7 +38,8 @@ class filterSYSTEMS { // Detect Workstation & templates }elseif(in_array('gotoWorkstation', $entry['objectClass'])){ if(!isset($entry['macAddress'][0]) || $entry['macAddress'][0] == "-"){ - $entries[$key]['objectClass'][] = 'FAKE_OC_WorkstationTemplate'; + 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)){ @@ -48,7 +49,8 @@ class filterSYSTEMS { // Detect Terminal & templates }elseif(in_array('gotoTerminal', $entry['objectClass'])){ if(!isset($entry['macAddress'][0]) || $entry['macAddress'][0] == "-"){ - $entries[$key]['objectClass'][] = 'FAKE_OC_TerminalTemplate'; + 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)){ @@ -58,7 +60,8 @@ class filterSYSTEMS { // Detect Server & templates }elseif(in_array('goServer', $entry['objectClass'])){ if(!isset($entry['macAddress'][0]) || $entry['macAddress'][0] == "-"){ - $entries[$key]['objectClass'][] = 'FAKE_OC_ServerTemplate'; + 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)){ -- 2.30.2