Changeset 522 for trunk/Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php

Timestamp:

Apr 15, 2013, 11:08:49 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Skritpy generátorů nastavení routerů přetvořeny na aplikační moduly NetworkConfig.

Location:

trunk/Modules/NetworkConfigRouterOS

Files:

• . (added)
• Generators (added)
• Generators/FirewallFilter.php (copied) (copied from trunk/system/generators/firewall_filter.php ) (3 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../Common/Global.php');
-include('../routerboard.php');
-include('common.php');
+include_once(dirname(__FILE__).'/../../../Common/Global.php');
+include_once(dirname(__FILE__).'/../Routerboard.php');
+include_once('Common.php');
 $Path = array('ip', 'firewall', 'filter');
-$Database = &$System->Database;
 
 $Routerboard = new Routerboard($Config['MainRouter']['HostName']);
@@ -44 +43 @@
 
 // Insert blocked addresses
-$DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id WHERE Member.Blocked=1');
+$DbResult = $System->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id WHERE Member.Blocked=1');
 while($Member = $DbResult->fetch_assoc())
 {
   echo($Member['Name'].': ');
   // Hosts
-  $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
+  $DbResult2 = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
   while($Interface = $DbResult2->fetch_assoc())
   {
@@ -61 +60 @@
 
   // Subnets
-  $DbResult2 = $Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
+  $DbResult2 = $System->Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
   while($Subnet = $DbResult2->fetch_assoc())
   {