From: hickert Date: Mon, 15 Mar 2010 16:28:21 +0000 (+0000) Subject: First shot of systems convert. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=31393155ece1c8af8fb768e06cb97594ce4a08c2;p=gosa.git First shot of systems convert. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16539 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 83e126b9c..2d99d152f 100644 --- a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc +++ b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc @@ -11,6 +11,8 @@ class filterSYSTEMS { $arp_handling_active = ($config->search("ArpNewDevice","CLASS",array('tabs')) != ""); $entries = filterLDAP::query($base, $scope, $filter, $attributes, $category, $objectStorage); + + foreach($entries as $key => $entry){ if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'),'/')."/i", $entry['dn'])){ diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc index 0238d71f7..5a38c2818 100644 --- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc +++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc @@ -86,19 +86,19 @@ class systemManagement extends management $this->storagePoints = array_unique($sP); // Build filter - if (session::global_is_set(get_class($this)."_filter")){ - $filter= session::global_get(get_class($this)."_filter"); - } else { +# if (session::global_is_set(get_class($this)."_filter")){ + # $filter= session::global_get(get_class($this)."_filter"); + # } else { $filter = new filter(get_template_path("system-filter.xml", true)); $filter->setObjectStorage($this->storagePoints); - } + # } $this->setFilter($filter); // Build headpage $headpage = new listing(get_template_path("system-list.xml", true)); $headpage->registerElementFilter("systemRelease", "systemManagement::systemRelease"); $headpage->setFilter($filter); - $filter->setConverter('INCOMING', 'systemManagement::incomingFilterConverter'); + $filter->setConverter('systemManagement::incomingFilterConverter'); // Register Daemon Events if(class_available("DaemonEvent") && class_available("gosaSupportDaemon")){ diff --git a/gosa-plugins/systems/admin/systems/system-filter.tpl b/gosa-plugins/systems/admin/systems/system-filter.tpl deleted file mode 100644 index 682da42c4..000000000 --- a/gosa-plugins/systems/admin/systems/system-filter.tpl +++ /dev/null @@ -1,72 +0,0 @@ -
-

- [F]{t}Filter{/t} -

-
- -
-
- - {if $USE_goServer} - {$SERVER} {t}Show servers{/t}
- {/if} - {if $USE_gotoWorkstation} - {$WORKSTATION} {t}Show workstations{/t}
- {/if} - {if $USE_gotoTerminal} - {$TERMINAL} {t}Show terminals{/t}
- {/if} - {if $USE_gotoPrinter} - {$PRINTER} {t}Show network printer{/t}
- {/if} - {if $USE_goFonHardware} - {$PHONE} {t}Show phones{/t}
- {/if} - {if $USE_FAKE_OC_winstation} - {$WINSTATION} {t}Show windows based workstations{/t}
- {/if} - {if $USE_ieee802Device} - {$COMPONENT} {t}Show network devices{/t}
- {/if} - {if $USE_FAKE_OC_NewWorkstation || $USE_FAKE_OC_NewTerminal || $USE_FAKE_OC_NewServer || $USE_FAKE_OC_NewDevice || $USE_FAKE_OC_ArpNewDevice} - {$INCOMING} {t}Show incoming devices{/t}
- {/if} - {if $USE_FAKE_OC_OpsiHost} - {$OPSI} {t}Show OPSI based clients{/t}
- {/if} - -
- - {$SCOPE} - - - - - - - - - - -
- - - {$NAME} -
- - - {$USER} -
- - - - - -
- {$APPLY} -
-
diff --git a/gosa-plugins/systems/admin/systems/system-filter.xml b/gosa-plugins/systems/admin/systems/system-filter.xml index 4a452ccef..48fa84796 100644 --- a/gosa-plugins/systems/admin/systems/system-filter.xml +++ b/gosa-plugins/systems/admin/systems/system-filter.xml @@ -3,134 +3,46 @@ server - true + auto + default + dn + objectClass + cn + description + gotoMode + FAIstate + FAIclass + macAddress + gotoLastUser + default + SYSTEMS - (&(|$SERVER$WORKSTATION$TERMINAL$PHONE$PRINTER$COMPONENT$WINSTATION$INCOMING$OPSI)$NAME$USER) - dn - objectClass - cn - description - gotoMode - FAIstate - FAIclass - macAddress - gotoLastUser + (&(objectClass=goServer)(cn=$)) - auto - - - - textfield - NAME - 20 - 60 - - - (cn=*$*) - false - SYSTEMS - (cn=*$NAME*) cn 0.5 3 - + - - textfield - USER - 20 - 60 - - - (gotoLastUser=*$*) - false - + + incoming + + SYSTEMS - (gotoLastUser=*USER*) + (&(objectClass=goHard)(ou:dn:=%systemIncomingRDN)(cn=$)) + + cn 0.5 3 - - - - checkbox - SERVER - true - - (objectClass=goServer) - - - - checkbox - WORKSTATION - true - - (objectClass=gotoWorkstation) - - - - checkbox - TERMINAL - true - - (objectClass=gotoTerminal) - - - - checkbox - PRINTER - true - - (objectClass=gotoPrinter) - - - - checkbox - PHONE - true - - (objectClass=goFonHardware) - - - - checkbox - WINSTATION - true - - (&(objectClass=sambaSamAccount)(cn=*\$)) - - - - checkbox - COMPONENT - true - - (objectClass=ieee802Device) - - - - checkbox - INCOMING - true - - (&(|(objectClass=goWorkstation)(objectClass=gotoTerminal)(objectClass=goHard))(ou:dn:=%systemIncomingRDN)) - - - - - checkbox - OPSI - true - - (&(objectClass=FAIclass)(FAIstate=__NETBOOT__)) - + diff --git a/gosa-plugins/systems/admin/systems/system-list.tpl b/gosa-plugins/systems/admin/systems/system-list.tpl index d0747103b..8e4e43f4b 100644 --- a/gosa-plugins/systems/admin/systems/system-list.tpl +++ b/gosa-plugins/systems/admin/systems/system-list.tpl @@ -1,29 +1,28 @@ - - - - - -
-
-

 {$HEADLINE} {$SIZELIMIT}

-
- -
-
- - -
{$ROOT} {$BACK} {$HOME} {$RELOAD} {$SEPARATOR} {t}Base{/t} {$BASE} {$SEPARATOR}  {$ACTIONS}
-
-
- -
-
- - {$LIST} - 		- {$FILTER} -
+
+ +
+

{$HEADLINE} {$SIZELIMIT}

+
+ + + + + + + + + + +
{$ROOT}{$BACK}{$HOME}{$RELOAD}{t}Base{/t} {$BASE}{$ACTIONS}{$FILTER}
+
+
+ + {$LIST} +
+ +
+