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

Timestamp:

Apr 14, 2015, 10:20:16 PM (10 years ago)

Author:

chronos

Message:

• Removed: Spaces on end of line.
• Modified: Tabs converted to spaces.

File:

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

trunk/Modules/NetworkConfigRouterOS/Generators/Common.php

@@ -6 +6 @@
 {
   global $Database;
-  
+
   $DbResult = $Database->query('SELECT `Id` FROM `NetworkMark` WHERE `Comment`="'.$Comment.'"');
   if($DbResult->num_rows > 0)
@@ -16 +16 @@
     $DbResult = $Database->query('INSERT INTO `NetworkMark` (`Comment`) VALUES ("'.$Comment.'")');
     return($Database->insert_id);
-  } 
+  }
 }
 
@@ -22 +22 @@
 {
   global $Database;
-  
+
   $DbResult = $Database->query('SELECT `Id` FROM `NetworkMangleSubgroup` WHERE `AddressRange`="'.$AddressRange.'"');
   if($DbResult->num_rows > 0)
@@ -32 +32 @@
     $DbResult = $Database->query('INSERT INTO `NetworkMangleSubgroup` (`AddressRange`) VALUES ("'.$AddressRange.'")');
     return($Database->insert_id);
-  } 
+  }
 }
 
@@ -38 +38 @@
 {
   global $Config;
-  
+
   $Found = false;
   foreach($Tree['Items'] as $Index => $Node)
@@ -50 +50 @@
   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)))
     {
@@ -61 +61 @@
     } else
     {
-      
+
       $NewNode = array('Address' => $Address, 'Name' => $Name, 'Items' => array(), 'ForceMark' => $ForceMark);
-      
+
       // Should be existed items placed under new node?
       $Found = false;
       foreach($Tree['Items'] as $Index => $Node)
       {
-        if(($Node['Address']->Address == $NewNode['Address']->Address) and 
-        ($Node['Address']->Prefix == $NewNode['Address']->Prefix)) $Found = true;        
-        
+        if(($Node['Address']->Address == $NewNode['Address']->Address) and
+        ($Node['Address']->Prefix == $NewNode['Address']->Prefix)) $Found = true;
+
         //echo($Index.',');
         if($Address->Contain($Node['Address']))
@@ -78 +78 @@
         }
       }
-      if($Found == false) $Tree['Items'][] = $NewNode;      
+      if($Found == false) $Tree['Items'][] = $NewNode;
     }
   }
@@ -89 +89 @@
   {
     ShowSubnetNode($Item, $Indent + 1);
-  }  
+  }
 }