Added Filter by p

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

diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.tpl b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.tpl
index 2f09c5868fdde0b2d8cb2146dcd3bd3a43e9f155..b3c1158822efad0992e5e47d5e9be8c5faff35a4 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.tpl
+++ b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.tpl
@@ -11,6 +11,7 @@
   {$SERVER}&nbsp;<LABEL for='SERVER'>{t}Show servers{/t}</LABEL><br>
   {$WORKSTATION}&nbsp;<LABEL for='WORKSTATION'>{t}Show workstations{/t}</LABEL><br>
   {$TERMINAL}&nbsp;<LABEL for='TERMINAL'>{t}Show terminals{/t}</LABEL><br>
+  {$BYIP}&nbsp;<LABEL for='TERMINAL'>{t}Filter by IP address range{/t}</LABEL><br>
 
  <div style="border-top:1px solid #AAAAAA"></div>
  {$SCOPE}
@@ -26,6 +27,26 @@
     {$NAME}
    </td>
   </tr>
+  <tr>
+   <td>
+    <label for="IPSTART">
+     <img src="images/lists/search.png" align=middle>&nbsp;IP Start
+    </label>
+   </td>
+   <td>
+    {$IPSTART}
+   </td>
+  </tr>
+  <tr>
+   <td>
+    <label for="IPSTOP">
+     <img src="images/lists/search.png" align=middle>&nbsp;IP Stop
+    </label>
+   </td>
+   <td>
+    {$IPSTOP}
+   </td>
+  </tr>
  </table>
 
  <table summary=""  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">

diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.xml b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.xml
index 2c635a4fbf71a7563532eb141d28c2e572e57a2a..609dde5d0f95f8dd792c744569a21f73ac1c942e 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.xml
+++ b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.xml
@@ -9,12 +9,14 @@
 
   <search>
     <query>
-      <backend>LDAP</backend>
-      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL ) $NAME)</filter>
+      <backend>SystemByIp</backend>
+      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL ) $NAME) $IPSTART $IPSTOP $BYIP</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
       <attribute>description</attribute>
+      <attribute>macAddress</attribute>
+      <attribute>ipHostNumber</attribute>
     </query>
     <scope>auto</scope>
   </search>
@@ -29,7 +31,7 @@
     <set>(cn=*$*)</set>
     <alphabet>true</alphabet>
     <autocomplete>
-      <backend>LDAP</backend>
+      <backend>SystemByIp</backend>
       <filter>(cn=*$NAME*)</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
@@ -37,6 +39,42 @@
     </autocomplete>
   </element>
 
+  <element>
+    <type>textfield</type>
+    <tag>IPSTART</tag>
+    <size>20</size>
+    <maxlength>60</maxlength>
+    <default>0.0.0.0</default>
+    <unset></unset>
+    <set>__IPSTART__=*$*__</set>
+    <alphabet>true</alphabet>
+    <autocomplete>
+      <backend>LDAP</backend>
+      <filter>__IPSTART__=*$IPSTART*__</filter>
+      <attribute>cn</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
+  </element>
+
+  <element>
+    <type>textfield</type>
+    <tag>IPSTOP</tag>
+    <size>20</size>
+    <maxlength>60</maxlength>
+    <default>255.255.255.255</default>
+    <unset></unset>
+    <set>__IPSTOP__=*$*__</set>
+    <alphabet>true</alphabet>
+    <autocomplete>
+      <backend>LDAP</backend>
+      <filter>__IPSTOP__=*$IPSTOP*__</filter>
+      <attribute>cn</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
+  </element>
+
   <element>
     <type>checkbox</type>
     <tag>SERVER</tag>
@@ -61,4 +99,12 @@
     <set>(objectClass=gotoTerminal)</set>
   </element>
 
+  <element>
+    <type>checkbox</type>
+    <tag>BYIP</tag>
+    <default>false</default>
+    <set>__FilterByIP__</set>
+    <unset></unset>
+  </element>
+
 </filterdef>