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

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

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

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -39 +39 @@
         'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
         'WHERE `Member`.`Blocked` = 0');
-    while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
     {
       echo($Member['Name'].': ');
@@ -47 +47 @@
           ' AND (`NetworkInterface`.`LocalIP` <> "")'.
           ' 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'].'), ');
-        if($Member['Blocked'] == 0)
+        if ($Member['Blocked'] == 0)
         {
           $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
@@ -66 +66 @@
       // 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']);
         echo($Subnet['Name'].'('.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'), ');
-        if($Member['Blocked'] == 0)
+        if ($Member['Blocked'] == 0)
         {
           $NewAddress = new NetworkAddressIPv4();
@@ -76 +76 @@
           $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' => 'inet-out', 'src-address' => $Src, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-out');
@@ -86 +86 @@
           $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' => 'inet-in', 'dst-address' => $Dest, 'action' => 'dst-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-in');
         } else
         {
-          if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
+          if ($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
           else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
           $Items[] = array('chain' => 'dstnat', 'src-address' => $Src, 'protocol' => 'tcp', 'dst-port' => 80, 'action' => 'dst-nat',  'to-addresses' => $IPCentrala, 'to-ports' => 81, 'comment' => $Subnet['Name'].'-out');
@@ -124 +124 @@
      // Route public addresses localy
      $DbResult = $this->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
-     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'].'), ');