Changeset 126

Timestamp:

Dec 11, 2008, 9:19:49 AM (16 years ago)

Author:

george

Message:

• Přidáno: Filtrování seznamů podle zadaných podmínek.

File:

• system/generators/routerboard.php (modified) (3 diffs)

system/generators/routerboard.php

@@ -41 +41 @@
   }
 
-  function GetList($Command, $Properties)
+  function GetList($Command, $Properties, $Conditions = '')
   {
     $PropertyList = '"';
@@ -49 +49 @@
     }
     $PropertyList = substr($PropertyList, 0, -3);
-    $Result = $this->Execute($Command.' {:foreach i in=[find] do={:put ('.$PropertyList.')}}');
+    if(is_array($Conditions))
+    {
+      $ConditionList = '';
+      foreach($Conditions as $Name => $Value)
+        $ConditionList .= $Name.'='.$Value.' ';
+    } else $ConditionList = $Conditions;
+    $Result = $this->Execute($Command.' {:foreach i in=[find '.$ConditionList.'] do={:put ('.$PropertyList.')}}');
     $List = array();
     foreach($Result as $ResultLine)
@@ -70 +76 @@
   }
 
-  function GetFirewallFilterList()
+  function GetFirewallFilterList($Conditions = '')
   {
-    return($this->GetList('/ip firewall filter', array('src-address', 'dst-address', 'bytes')));
+    return($this->GetList('/ip firewall nat', array('src-address', 'dst-address', 'bytes'), $Conditions));
   }
 
-  function GetDHCPServerLeasesList()
+  function GetDHCPServerLeasesList($Conditions = '')
   {
-    return($this->GetList('/ip dhcp-server lease', array('address', 'active-address', 'comment', 'lease-time', 'status', 'host-name'))); 
+    return($this->GetList('/ip dhcp-server lease', array('address', 'active-address', 'comment', 'lease-time', 'status', 'host-name'), $Conditions));
   }
 }