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

Timestamp:

Apr 6, 2020, 11:17:40 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php (modified) (4 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php

@@ -42 +42 @@
     // Insert blocked addresses
     $DbResult = $this->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id WHERE Member.Blocked=1');
-    while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
     {
       echo($Member['Name'].': ');
       // Hosts
       $DbResult2 = $this->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())
+      while ($Interface = $DbResult2->fetch_assoc())
       {
         $Name = $Interface['DeviceName'];
-        if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+        if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
         $Name = RouterOSIdent($Name);
         echo($Name.'('.$Interface['LocalIP'].'), ');
@@ -59 +59 @@
       // Subnets
       $DbResult2 = $this->Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
-      while($Subnet = $DbResult2->fetch_assoc())
+      while ($Subnet = $DbResult2->fetch_assoc())
       {
         $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
@@ -67 +67 @@
         $NewAddress->Prefix = $Subnet['ExtMask'];
         $Range = $NewAddress->GetRange();
-        if($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+        if ($Subnet['ExtMask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
         else $Range = $Range['From']->AddressToString();
-        if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
+        if ($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
         else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
         $Items[] = array('chain' => 'forward', 'out-interface' => $InetInterface, 'src-address' => $Src, 'action' => 'drop','comment' => $Subnet['Name'].'-out-drop');
@@ -77 +77 @@
         $NewAddress->Prefix = $Subnet['Mask'];
         $Range = $NewAddress->GetRange();
-        if($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
+        if ($Subnet['Mask'] != 32) $Range = $Range['From']->AddressToString().'-'.$Range['To']->AddressToString();
         else $Range = $Range['From']->AddressToString();
-        if($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
+        if ($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
         else $Dest = $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'];
         $Items[] = array('chain' => 'forward', 'in-interface' => $InetInterface, 'dst-address' => $Dest, 'action' => 'drop', 'comment' => $Subnet['Name'].'-in-drop');