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

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/Common.php (modified) (11 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/Common.php

@@ -6 +6 @@
 
   $DbResult = $Database->query('SELECT `Id` FROM `NetworkMark` WHERE `Comment`="'.$Comment.'"');
-  if($DbResult->num_rows > 0)
+  if ($DbResult->num_rows > 0)
   {
     $DbRow = $DbResult->fetch_assoc();
-    return($DbRow['Id']);
+    return ($DbRow['Id']);
   } else
   {
     $DbResult = $Database->query('INSERT INTO `NetworkMark` (`Comment`) VALUES ("'.$Comment.'")');
-    return($Database->insert_id);
+    return ($Database->insert_id);
   }
 }
@@ -22 +22 @@
 
   $DbResult = $Database->query('SELECT `Id` FROM `NetworkMangleSubgroup` WHERE `AddressRange`="'.$AddressRange.'"');
-  if($DbResult->num_rows > 0)
+  if ($DbResult->num_rows > 0)
   {
     $DbRow = $DbResult->fetch_assoc();
-    return($DbRow['Id']);
+    return ($DbRow['Id']);
   } else
   {
     $DbResult = $Database->query('INSERT INTO `NetworkMangleSubgroup` (`AddressRange`) VALUES ("'.$AddressRange.'")');
-    return($Database->insert_id);
+    return ($Database->insert_id);
   }
 }
@@ -38 +38 @@
 
   $Found = false;
-  foreach($Tree['Items'] as $Index => $Node)
+  foreach ($Tree['Items'] as $Index => $Node)
   {
-    if($Node['Address']->Contain($Address))
+    if ($Node['Address']->Contain($Address))
     {
       InsertToAddressTreeIPv4($Tree['Items'][$Index], $Address, $Name, true);
@@ -46 +46 @@
     }
   }
-  if($Found == false)
+  if ($Found == false)
   {
-    if($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and
+    if ($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and
     ($Address->Prefix > ($Tree['Address']->Prefix + 1)))
     {
@@ -62 +62 @@
       // Should be existed items placed under new node?
       $Found = false;
-      foreach($Tree['Items'] as $Index => $Node)
+      foreach ($Tree['Items'] as $Index => $Node)
       {
-        if(($Node['Address']->Address == $NewNode['Address']->Address) and
+        if (($Node['Address']->Address == $NewNode['Address']->Address) and
         ($Node['Address']->Prefix == $NewNode['Address']->Prefix)) $Found = true;
 
-        if($Address->Contain($Node['Address']))
+        if ($Address->Contain($Node['Address']))
         {
           $NewNode['Items'][] = $Node;
@@ -73 +73 @@
         }
       }
-      if($Found == false) $Tree['Items'][] = $NewNode;
+      if ($Found == false) $Tree['Items'][] = $NewNode;
     }
   }
@@ -83 +83 @@
 
   $Found = false;
-  foreach($Tree['Items'] as $Index => $Node)
+  foreach ($Tree['Items'] as $Index => $Node)
   {
-    if($Node['Address']->Contain($Address))
+    if ($Node['Address']->Contain($Address))
     {
       InsertToAddressTreeIPv6($Tree['Items'][$Index], $Address, $Name, true);
@@ -91 +91 @@
     }
   }
-  if($Found == false)
+  if ($Found == false)
   {
-    if($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and
+    if ($InterSubnets and ($Tree['Address']->Prefix < $Config['MainRouter']['MangleRuleSubgroupMinPrefix']) and
     ($Address->Prefix > ($Tree['Address']->Prefix + 1)))
     {
@@ -107 +107 @@
       // Should be existed items placed under new node?
       $Found = false;
-      foreach($Tree['Items'] as $Index => $Node)
+      foreach ($Tree['Items'] as $Index => $Node)
       {
-        if(($Node['Address']->Address == $NewNode['Address']->Address) and
+        if (($Node['Address']->Address == $NewNode['Address']->Address) and
         ($Node['Address']->Prefix == $NewNode['Address']->Prefix)) $Found = true;
 
-        if($Address->Contain($Node['Address']))
+        if ($Address->Contain($Node['Address']))
         {
           $NewNode['Items'][] = $Node;
@@ -118 +118 @@
         }
       }
-      if($Found == false) $Tree['Items'][] = $NewNode;
+      if ($Found == false) $Tree['Items'][] = $NewNode;
     }
   }
@@ -126 +126 @@
 {
   echo(str_repeat('  ', $Indent).$Node['Address']->AddressToString().'/'.$Node['Address']->Prefix.' '.$Node['Name']."\n");
-  foreach($Node['Items'] as $Index => $Item)
+  foreach ($Node['Items'] as $Index => $Item)
   {
     ShowSubnetNode($Item, $Indent + 1);