![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8c59f97)
raw | patch | inline | side by side (parent: 8c59f97)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 15 Mar 2010 16:28:21 +0000 (16:28 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 15 Mar 2010 16:28:21 +0000 (16:28 +0000) |
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 83e126b9c6a06a47b07dda553c66e8c7a8707c60..2d99d152f6e47e00e9a81315d60036295f403ef4 100644 (file)
$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 0238d71f77405139f3f51643ef2ba2f03469e89c..5a38c28189ab8ba4473bda30ad84250410b54d30 100644 (file)
$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
+++ /dev/null
@@ -1,72 +0,0 @@
-<div class="contentboxh">
- <p class="contentboxh">
- <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
- </p>
-</div>
-
-<div class="contentboxb">
- <div style="border-top:1px solid #AAAAAA"></div>
-
- {if $USE_goServer}
- {$SERVER} {t}Show servers{/t}<br>
- {/if}
- {if $USE_gotoWorkstation}
- {$WORKSTATION} {t}Show workstations{/t}<br>
- {/if}
- {if $USE_gotoTerminal}
- {$TERMINAL} {t}Show terminals{/t}<br>
- {/if}
- {if $USE_gotoPrinter}
- {$PRINTER} {t}Show network printer{/t}<br>
- {/if}
- {if $USE_goFonHardware}
- {$PHONE} {t}Show phones{/t}<br>
- {/if}
- {if $USE_FAKE_OC_winstation}
- {$WINSTATION} {t}Show windows based workstations{/t}<br>
- {/if}
- {if $USE_ieee802Device}
- {$COMPONENT} {t}Show network devices{/t}<br>
- {/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}<br>
- {/if}
- {if $USE_FAKE_OC_OpsiHost}
- {$OPSI} {t}Show OPSI based clients{/t}<br>
- {/if}
-
- <div style="border-top:1px solid #AAAAAA"></div>
-
- {$SCOPE}
-
- <table summary='{t}Filter options{/t}' style="width:100%;border-top:1px solid #B0B0B0;">
- <tr>
- <td>
- <label for="NAME">
- <img src="images/lists/search.png" align=middle> Name
- </label>
- </td>
- <td>
- {$NAME}
- </td>
- </tr>
- <tr>
- <td>
- <label for="NAME">
- <img src="plugins/users/images/select_user.png" align=middle> User
- </label>
- </td>
- <td>
- {$USER}
- </td>
- </tr>
- </table>
-
- <table summary='{t}Filter options{/t}' width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
- <tr>
- <td width="100%" align="right">
- {$APPLY}
- </td>
- </tr>
- </table>
-</div>
diff --git a/gosa-plugins/systems/admin/systems/system-filter.xml b/gosa-plugins/systems/admin/systems/system-filter.xml
index 4a452ccef7b10c859da0c69e0fac338095a3edc2..48fa847962d84cf18a7b3c9fc7eaa9ef64e0891c 100644 (file)
<filterdef>
<definition>
<category>server</category>
- <template>system-filter.tpl</template>
<initial>true</initial>
+ <scope>auto</scope>
+ <default>default</default>
+ <attribute>dn</attribute>
+ <attribute>objectClass</attribute>
+ <attribute>cn</attribute>
+ <attribute>description</attribute>
+ <attribute>gotoMode</attribute>
+ <attribute>FAIstate</attribute>
+ <attribute>FAIclass</attribute>
+ <attribute>macAddress</attribute>
+ <attribute>gotoLastUser</attribute>
</definition>
<search>
+ <tag>default</tag>
+ <label>Default filter</label>
<query>
<backend>SYSTEMS</backend>
- <filter>(&(|$SERVER$WORKSTATION$TERMINAL$PHONE$PRINTER$COMPONENT$WINSTATION$INCOMING$OPSI)$NAME$USER)</filter>
- <attribute>dn</attribute>
- <attribute>objectClass</attribute>
- <attribute>cn</attribute>
- <attribute>description</attribute>
- <attribute>gotoMode</attribute>
- <attribute>FAIstate</attribute>
- <attribute>FAIclass</attribute>
- <attribute>macAddress</attribute>
- <attribute>gotoLastUser</attribute>
+ <filter>(&(objectClass=goServer)(cn=$))</filter>
</query>
- <scope>auto</scope>
- </search>
-
- <element>
- <type>textfield</type>
- <tag>NAME</tag>
- <size>20</size>
- <maxlength>60</maxlength>
- <default></default>
- <unset></unset>
- <set>(cn=*$*)</set>
- <alphabet>false</alphabet>
<autocomplete>
- <backend>SYSTEMS</backend>
- <filter>(cn=*$NAME*)</filter>
<attribute>cn</attribute>
<frequency>0.5</frequency>
<characters>3</characters>
</autocomplete>
- </element>
+ </search>
- <element>
- <type>textfield</type>
- <tag>USER</tag>
- <size>20</size>
- <maxlength>60</maxlength>
- <default></default>
- <unset></unset>
- <set>(gotoLastUser=*$*)</set>
- <alphabet>false</alphabet>
- <autocomplete>
+ <search>
+ <tag>incoming</tag>
+ <label>Incoming objects</label>
+ <query>
<backend>SYSTEMS</backend>
- <filter>(gotoLastUser=*USER*)</filter>
+ <filter>(&(objectClass=goHard)(ou:dn:=%systemIncomingRDN)(cn=$))</filter>
+ </query>
+ <autocomplete>
<attribute>cn</attribute>
<frequency>0.5</frequency>
<characters>3</characters>
</autocomplete>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>SERVER</tag>
- <default>true</default>
- <unset></unset>
- <set>(objectClass=goServer)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>WORKSTATION</tag>
- <default>true</default>
- <unset></unset>
- <set>(objectClass=gotoWorkstation)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>TERMINAL</tag>
- <default>true</default>
- <unset></unset>
- <set>(objectClass=gotoTerminal)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>PRINTER</tag>
- <default>true</default>
- <unset></unset>
- <set>(objectClass=gotoPrinter)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>PHONE</tag>
- <default>true</default>
- <unset></unset>
- <set>(objectClass=goFonHardware)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>WINSTATION</tag>
- <default>true</default>
- <unset></unset>
- <set>(&(objectClass=sambaSamAccount)(cn=*\$))</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>COMPONENT</tag>
- <default>true</default>
- <unset></unset>
- <set>(objectClass=ieee802Device)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>INCOMING</tag>
- <default>true</default>
- <unset></unset>
- <set>(&(|(objectClass=goWorkstation)(objectClass=gotoTerminal)(objectClass=goHard))(ou:dn:=%systemIncomingRDN))</set>
- </element>
-
-
- <element>
- <type>checkbox</type>
- <tag>OPSI</tag>
- <default>true</default>
- <unset></unset>
- <set>(&(objectClass=FAIclass)(FAIstate=__NETBOOT__))</set>
- </element>
+ </search>
</filterdef>
diff --git a/gosa-plugins/systems/admin/systems/system-list.tpl b/gosa-plugins/systems/admin/systems/system-list.tpl
index d0747103b9ca62798d806ccc05c1eb8a480d933a..8e4e43f4bec049e39008cc35a7156540f15fa43f 100644 (file)
<input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
-<table summary="" style="width:100%;height:100%; vertical-align:top; text-align:left;" cellpadding=2>
- <tr>
- <td style="vertical-align:top; width:100%;">
- <div class="contentboxh">
- <p class="contentboxh"> {$HEADLINE} {$SIZELIMIT}</p>
- </div>
-
- <div class="contentboxb">
- <div style='background:white;padding:3px;'>
- <table><tr>
- <td>{$ROOT} </td><td>{$BACK} </td><td>{$HOME} </td><td>{$RELOAD} </td><td>{$SEPARATOR} </td><td>{t}Base{/t} {$BASE} </td><td>{$SEPARATOR} </td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
- </tr></table>
- </div>
- </div>
-
- <div style='height:4px;'>
- </div>
-
- {$LIST}
- </td>
- <td style='vertical-align:top;min-width:250px'>
- {$FILTER}
- </td>
- </tr>
-</table>
+<div id="mainlist">
+
+ <div class="mainlist-header">
+ <p>{$HEADLINE} {$SIZELIMIT}</p>
+ <div class="mainlist-nav">
+ <table>
+ <tr>
+ <td>{$ROOT}</td>
+ <td>{$BACK}</td>
+ <td>{$HOME}</td>
+ <td>{$RELOAD}</td>
+ <td class="left-border">{t}Base{/t} {$BASE}</td>
+ <td class="left-border">{$ACTIONS}</td>
+ <td class="left-border">{$FILTER}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+ {$LIST}
+</div>
+
+<div class="clear"></div>
<input type="hidden" name="ignore">
+