Changeset 738 for trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

Timestamp:

Apr 14, 2015, 10:20:16 PM (9 years ago)

Author:

chronos

Message:

• Removed: Spaces on end of line.
• Modified: Tabs converted to spaces.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php (modified) (6 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -34 +34 @@
 
 // Skip local subnet
-//$Items[] = array('chain' => 'inet-out', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');     
+//$Items[] = array('chain' => 'inet-out', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');
 //$Items[] = array('chain' => 'inet-in', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');
 
@@ -46 +46 @@
   $DbResult2 = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName`, `NetworkDevice`.`InboundNATPriority` FROM `NetworkInterface`'.
   ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE (`NetworkInterface`.`ExternalIP` <> "")'.
-  ' AND (`NetworkInterface`.`LocalIP` <> "")'.  
+  ' AND (`NetworkInterface`.`LocalIP` <> "")'.
   ' AND (`NetworkDevice`.`Member` = '.$Member['Id'].') AND (`NetworkInterface`.`LocalIP` != `NetworkInterface`.`ExternalIP`) ORDER BY `id` DESC');
   while($Interface = $DbResult2->fetch_assoc())
@@ -57 +57 @@
     {
       $Items[] = array('chain' => 'inet-out', 'src-address' => $Interface['LocalIP'], 'action' => 'src-nat',  'to-addresses' => $Interface['ExternalIP'], 'comment' => $Name.'-out');
-      if($Interface['InboundNATPriority'] > 0) 
+      if($Interface['InboundNATPriority'] > 0)
         $Items[] = array('chain' => 'inet-in', 'dst-address' => $Interface['ExternalIP'], 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name.'-in');
-    } else 
+    } else
     {
       $Items[] = array('chain' => 'dstnat', 'src-address' => $Interface['LocalIP'], 'protocol' => 'tcp', 'dst-port' => 80, 'action' => 'dst-nat',  'to-addresses' => $IPCentrala, 'to-ports' => 81, 'comment' => $Name.'-out');
@@ -68 +68 @@
   $DbResult2 = $System->Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
   while($Subnet = $DbResult2->fetch_assoc())
-  {   
+  {
     $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
     echo($Subnet['Name'].'('.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'), ');
@@ -82 +82 @@
         else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
       $Items[] = array('chain' => 'inet-out', 'src-address' => $Src, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-out');
-    
+
       $NewAddress = new NetworkAddressIPv4();
       $NewAddress->AddressFromString($Subnet['AddressRange']);
@@ -114 +114 @@
 
 // Accept free-access clients
-$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16', 
-        'src-address-list' => 'free-access', 'in-interface' => $LocalInterface, 
-        'action' => 'accept', 'comment' => 'Free_access');
+$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
+  'src-address-list' => 'free-access', 'in-interface' => $LocalInterface,
+  'action' => 'accept', 'comment' => 'Free_access');
 // Redirect unregistred clients to free access activation page
-$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16', 
-        'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface, 
-        'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 82, 'comment' => 'Redirect_unregistred');
+$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
+  'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface,
+  'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 82, 'comment' => 'Redirect_unregistred');
 
 /*