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

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/FirewallMangle.php (modified) (13 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallMangle.php

@@ -7 +7 @@
     global $InetInterface, $ItemsFirewall;
 
-    foreach($Node['Items'] as $Index => $Item)
-    {
-      if(count($Item['Items']) == 0)
+    foreach ($Node['Items'] as $Index => $Item)
+    {
+      if (count($Item['Items']) == 0)
       {
         // Hosts
         $ParentSubnetId = GetSubgroupByRange($Node['Address']->AddressToString().'/'.$Node['Address']->Prefix);
         $Address = $Item['Address']->AddressToString();
-        if($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
+        if ($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
 
         $PacketMark = GetMarkByComment($Item['Name'].'-out');
@@ -28 +28 @@
 
         $Address = $Item['Address']->AddressToString();
-        if($Item['Address']->Prefix != 32) $Address .= '/'.$Item['Address']->Prefix;
+        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');
@@ -36 +36 @@
       }
     }
-    if($Node['ForceMark'] == true)
+    if ($Node['ForceMark'] == true)
     {
       // Mark member subnets
@@ -72 +72 @@
     // Divide rules by subnet number
     $DbResult = $this->System->Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet` WHERE `Member` IS NULL');
-    while($Subnet = $DbResult->fetch_assoc())
+    while ($Subnet = $DbResult->fetch_assoc())
     {
       $NewAddress = new NetworkAddressIPv4();
@@ -84 +84 @@
         'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
         'WHERE `Member`.`Blocked` = 0');
-    while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
     {
       $Member['Name'] = RouterOSIdent($Member['Name'].'-'.$Member['Id'] );
@@ -90 +90 @@
 
       $DbResult2 = $this->System->Database->select('NetworkDevice', '*', '`Used` = 1 AND `Member` = '.$Member['Id']);
-      while($Device = $DbResult2->fetch_assoc())
+      while ($Device = $DbResult2->fetch_assoc())
       {
         $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `LocalIP` != ""');
-        while($Interface = $DbResult3->fetch_assoc())
+        while ($Interface = $DbResult3->fetch_assoc())
         {
           $Name = $Device['Name'];
-          if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+          if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
           $Name = RouterOSIdent($Name);
           echo($Name.', ');
@@ -107 +107 @@
 
       $DbResult2 = $this->Database->select('NetworkSubnet', '*', '(`Member`='.$Member['Id'].') AND (AddressRange != "")');
-      while($Subnet = $DbResult2->fetch_assoc())
+      while ($Subnet = $DbResult2->fetch_assoc())
       {
         $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
@@ -114 +114 @@
         $NewAddress->AddressFromString($Subnet['AddressRange']);
         $NewAddress->Prefix = $Subnet['Mask'];
-        if($Subnet['Member'] != 0) $ForceMark = true;
+        if ($Subnet['Member'] != 0) $ForceMark = true;
         else $ForceMark = false;
         echo($ForceMark.', ');
@@ -169 +169 @@
     $DbResult = $this->System->Database->query('SELECT `Id`, `Name`, `AddressRangeIPv6`, `MaskIPv6` FROM `NetworkSubnet` '.
       'WHERE (`Member` IS NULL) AND (`AddressRangeIPv6` != "")');
-    while($Subnet = $DbResult->fetch_assoc())
+    while ($Subnet = $DbResult->fetch_assoc())
     {
       $NewAddress = new NetworkAddressIPv6();
@@ -181 +181 @@
         'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
         'WHERE `Member`.`Blocked` = 0');
-    while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
     {
       $Member['Name'] = RouterOSIdent($Member['Name'].'-'.$Member['Id'] );
@@ -187 +187 @@
 
       $DbResult2 = $this->System->Database->select('NetworkDevice', '*', '`Used` = 1 AND `Member` = '.$Member['Id']);
-      while($Device = $DbResult2->fetch_assoc())
+      while ($Device = $DbResult2->fetch_assoc())
       {
         $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `IPv6` != ""');
-        while($Interface = $DbResult3->fetch_assoc())
+        while ($Interface = $DbResult3->fetch_assoc())
         {
           $Name = $Device['Name'];
-          if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+          if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
           $Name = RouterOSIdent($Name);
           echo($Name.', ');
@@ -204 +204 @@
 
       $DbResult2 = $this->Database->select('NetworkSubnet', '*', '(`Member`='.$Member['Id'].') AND (AddressRangeIPv6 != "")');
-      while($Subnet = $DbResult2->fetch_assoc())
+      while ($Subnet = $DbResult2->fetch_assoc())
       {
         $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
@@ -211 +211 @@
         $NewAddress->AddressFromString($Subnet['AddressRangeIPv6']);
         $NewAddress->Prefix = $Subnet['MaskIPv6'];
-        if($Subnet['Member'] != 0) $ForceMark = true;
+        if ($Subnet['Member'] != 0) $ForceMark = true;
         else $ForceMark = false;
         echo($ForceMark.', ');