Changeset 738 for trunk/Modules/NetworkConfigRouterOS/Generators/FirewallMangle.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/FirewallMangle.php (modified) (6 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallMangle.php

@@ -30 +30 @@
   $NewAddress->AddressFromString($Subnet['AddressRange']);
   $NewAddress->Prefix = $Subnet['Mask'];
-  InsertToAddressTree($AddressTree, $NewAddress, 'subnet-'.RouterOSIdent($Subnet['Name'])); 
+  InsertToAddressTree($AddressTree, $NewAddress, 'subnet-'.RouterOSIdent($Subnet['Name']));
 }
 
@@ -58 +58 @@
     }
   }
-  
+
   $DbResult2 = $System->Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
   while($Subnet = $DbResult2->fetch_assoc())
@@ -80 +80 @@
 {
   global $InetInterface, $ItemsFirewall;
-  
+
   foreach($Node['Items'] as $Index => $Item)
   {
@@ -89 +89 @@
       $Address = $Item['Address']->AddressToString();
       if($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
-      
+
       $PacketMark = GetMarkByComment($Item['Name'].'-out');
       $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => $Address, 'out-interface' =>  $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'passthrough' => 'no', 'comment' => $Item['Name'].'-out');
@@ -100 +100 @@
       $SubnetId = GetSubgroupByRange($Item['Address']->AddressToString().'/'.$Item['Address']->Prefix);
       $PacketMark = GetMarkByComment($Item['Name'].'-out');
-      
+
       $Address = $Item['Address']->AddressToString();
       if($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
-      
-      $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => $Address, 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-'.$SubnetId.'-out', 'comment' => $Item['Name'].'-out');    
-      $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-in', 'dst-address' => $Address, 'in-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-'.$SubnetId.'-in', 'comment' => $Item['Name'].'-in');   
-      
-      ProcessNode($Item);      
-    }    
+
+      $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-out', 'src-address' => $Address, 'out-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-'.$SubnetId.'-out', 'comment' => $Item['Name'].'-out');
+      $ItemsFirewall[] = array('chain' => 'inet-'.$ParentSubnetId.'-in', 'dst-address' => $Address, 'in-interface' => $InetInterface, 'action' => 'jump', 'jump-target' => 'inet-'.$SubnetId.'-in', 'comment' => $Item['Name'].'-in');
+
+      ProcessNode($Item);
+    }
   }
   if($Node['ForceMark'] == true)
@@ -133 +133 @@
 // Slow free internet
 $PacketMark = GetMarkByComment('free-out');
-$ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface, 
+$ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface,
   'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-out', 'passthrough' => 'yes');
 $PacketMark = GetMarkByComment('free-in');
-$ItemsFirewall[] = array('chain' => 'inet-1-in', 'in-interface' => $InetInterface, 
-        'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-in', 'passthrough' => 'no');
+$ItemsFirewall[] = array('chain' => 'inet-1-in', 'in-interface' => $InetInterface,
+  'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-in', 'passthrough' => 'no');
 // Unregistred clients add to address list
-$ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface, 'src-address' => '10.145.0.0/16', 
-        'action' => 'add-src-to-address-list', 'address-list' => 'unregistred', 'timeout' => '1d', 
-        'comment' => 'unregistred-clients');
+$ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface, 'src-address' => '10.145.0.0/16',
+  'action' => 'add-src-to-address-list', 'address-list' => 'unregistred', 'timeout' => '1d',
+  'comment' => 'unregistred-clients');
 
 //print_r($ItemsFirewall);