Changeset 873 for trunk/Modules/NetworkConfigRouterOS

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

Location:

trunk/Modules/NetworkConfigRouterOS

Files:

• Generators/AddressPortability.php (modified) (5 diffs)
• Generators/Common.php (modified) (11 diffs)
• Generators/DHCP.php (modified) (2 diffs)
• Generators/DNS.php (modified) (4 diffs)
• Generators/FirewallFilter.php (modified) (4 diffs)
• Generators/FirewallMangle.php (modified) (13 diffs)
• Generators/FirewallNAT.php (modified) (6 diffs)
• Generators/Netwatch.php (modified) (3 diffs)
• Generators/NetwatchImport.php (modified) (7 diffs)
• Generators/Queue.php (modified) (16 diffs)
• Generators/Signal.php (modified) (6 diffs)
• NetworkConfigRouterOS.php (modified) (6 diffs)
• Routerboard.php (modified) (14 diffs)
• Routerboard2.php (modified) (5 diffs)
• RouterboardAPI.php (modified) (7 diffs)
• SSH.php (modified) (3 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/AddressPortability.php

@@ -1 +1 @@
 <?php
 
-if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 include_once(dirname(__FILE__).'/../../../Common/Global.php');
 include_once(dirname(__FILE__).'/../Routerboard.php');
@@ -11 +11 @@
 {
   $TimeParts = explode(':', $Time);
-  return($TimeParts[0] * 3600 + $TimeParts[1] * 60 + $TimeParts[2]);
+  return ($TimeParts[0] * 3600 + $TimeParts[1] * 60 + $TimeParts[2]);
 }
 
@@ -19 +19 @@
 
 $DbResult3 = $System->Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0 GROUP BY `DHCP`');
-while($Subnet = $DbResult3->fetch_assoc())
+while ($Subnet = $DbResult3->fetch_assoc())
 {
   echo($Subnet['AddressRange'].'/'.$Subnet['Mask'].' on router '.$Subnet['DHCP']."\n");
   $Routerboard->HostName = $Subnet['DHCP'];
   $List = $Routerboard->ListGet($Path, array('address', 'active-mac-address', 'active-address', 'expires-after', 'server', 'dynamic'));
-  foreach($List as $Properties)
+  foreach ($List as $Properties)
   {
-    if($Properties['dynamic'] == 'true')
+    if ($Properties['dynamic'] == 'true')
     //and ($Properties['address'] != $Properties['active-address']))
     {
@@ -32 +32 @@
       echo('MAC: '.$Properties['active-mac-address']."\n");
       $DbRows2 = $System->Database->query('SELECT `Id` FROM `NetworkInterface` WHERE `MAC`="'.$Properties['active-mac-address'].'"');
-      if($DbRows2->num_rows > 0)
+      if ($DbRows2->num_rows > 0)
       {
         $Interface = $DbRows2->fetch_assoc();
         $InterfaceId = $Interface['Id'];
         $DbRows2 = $System->Database->query('SELECT `Id` FROM `NetworkInterfacePortable` WHERE `NetworkInterface`='.$InterfaceId);
-        if($DbRows2->num_rows > 0)
+        if ($DbRows2->num_rows > 0)
         {
           $System->Database->update('NetworkInterfacePortable', '`Time` < "'.TimeToMysqlDateTime($Properties['expires-after']).'" AND `NetworkInterface`='.$InterfaceId, array('DynamicIP' => $Properties['active-address'], 'Update' => 1));
@@ -53 +53 @@
 $NATRule = array();
 $DbRows = $System->Database->query('SELECT NetworkDevice.Name AS DeviceName, NetworkInterface.Name AS InterfaceName, DynamicIP FROM `NetworkInterfacePortable` JOIN NetworkInterface ON NetworkInterface.Id=NetworkInterfacePortable.NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE `Update`=1');
-while($Portable = $DbRows->fetch_assoc())
+while ($Portable = $DbRows->fetch_assoc())
 {
   $Name = $Portable['DeviceName'];
-  if($Portable['InterfaceName'] != '') $Name .= '-'.$Portable['InterfaceName'];
+  if ($Portable['InterfaceName'] != '') $Name .= '-'.$Portable['InterfaceName'];
   array_push($NATRule, implode(' ', $PathNAT).' set [find comment="'.$Name.'-in"] to-addresses='.$Portable['DynamicIP']);
   array_push($NATRule, implode(' ', $PathNAT).' set [find comment="'.$Name.'-out"] src-address='.$Portable['DynamicIP']);

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);

trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

@@ -14 +14 @@
 
     $DbResult = $this->Database->query('SELECT * FROM `NetworkSubnet` WHERE `Configure`=1');
-    while($Subnet = $DbResult->fetch_assoc())
+    while ($Subnet = $DbResult->fetch_assoc())
     {
       echo($Subnet['DHCP']);
@@ -24 +24 @@
         'WHERE CompareNetworkPrefix(INET_ATON(`LocalIP`), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') '.
         'AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
-      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'];
         $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => $Server, 'comment' => $Name, 'lease-time' => '1d');
       }

trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php

@@ -13 +13 @@
 
     $DbResult = $this->Database->query('SELECT * FROM `NetworkDomain`');
-    while($Domain = $DbResult->fetch_assoc())
+    while ($Domain = $DbResult->fetch_assoc())
     {
       $DomainName = $Domain['Name'];
@@ -19 +19 @@
       // Get full domain name from parent items
       $CurrentDomain = $Domain;
-      while($CurrentDomain['Parent'] > 0)
+      while ($CurrentDomain['Parent'] > 0)
       {
         $DbResult2 = $this->Database->query('SELECT * FROM `NetworkDomain` WHERE `Id`='.$CurrentDomain['Parent']);
@@ -32 +32 @@
           'JOIN `NetworkDevice` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
           'WHERE (`NetworkDevice`.`Used`=1)');
-      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'];
         $NameFull = $Name.'.'.$DomainName;
         $NameExtFull = $Name.'-ext.'.$DomainName;
-        if($Interface['LocalIP'] != '')
+        if ($Interface['LocalIP'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Interface['LocalIP']);
-        if($Interface['IPv6'] != '')
+        if ($Interface['IPv6'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Interface['IPv6']);
-        if($Interface['ExternalIP'] != '')
+        if ($Interface['ExternalIP'] != '')
           $Items[] = array('name' => $NameExtFull, 'address' => $Interface['ExternalIP']);
       }
@@ -53 +53 @@
           'WHERE (`NetworkDevice`.`Used`=1) AND '.
           '(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) = `NetworkDomainAlias`.`Target`)');
-      while($Alias = $DbResult2->fetch_assoc())
+      while ($Alias = $DbResult2->fetch_assoc())
       {
         $Name = $Alias['Name'];
         $NameFull = $Name.'.'.$DomainName;
         $NameExtFull = $Name.'-ext.'.$DomainName;
-        if($Alias['LocalIP'] != '')
+        if ($Alias['LocalIP'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Alias['LocalIP']);
-        if($Alias['IPv6'] != '')
+        if ($Alias['IPv6'] != '')
           $Items[] = array('name' => $NameFull, 'address' => $Alias['IPv6']);
-        if($Alias['ExternalIP'] != '')
+        if ($Alias['ExternalIP'] != '')
           $Items[] = array('name' => $NameExtFull, 'address' => $Alias['ExternalIP']);
       }
 
       $DbResult2 = $this->Database->query('SELECT * FROM `NetworkDomainServer` WHERE `Domain`='.$Domain['Id']);
-      while($Server = $DbResult2->fetch_assoc())
+      while ($Server = $DbResult2->fetch_assoc())
       {
         $Routerboard->HostName = $Server['Address'];

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');

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.', ');

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'].'), ');

trunk/Modules/NetworkConfigRouterOS/Generators/Netwatch.php

@@ -13 +13 @@
 
     $DbResult3 = $this->Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Configure` = 1'); // WHERE `Member` = 0');
-    while($Router = $DbResult3->fetch_assoc())
+    while ($Router = $DbResult3->fetch_assoc())
     {
       echo($Router['DHCP']."\n");
@@ -19 +19 @@
       $Items = array();
       $DbResult = $this->Database->query('SELECT * FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`DHCP`="'.$Router['DHCP'].'")');
-      while($Subnet = $DbResult->fetch_assoc())
+      while ($Subnet = $DbResult->fetch_assoc())
       {
         $I = explode('.', $Subnet['AddressRange']);
@@ -26 +26 @@
             ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE CompareNetworkPrefix(INET_ATON(`LocalIP`), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].')'.
             ' AND (`NetworkDevice`.`Used` = 1) ORDER BY `NetworkInterface`.`LocalIP`');
-        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'];
           echo($Name.', ');
           $Items[] = array('host' => $Interface['LocalIP'], 'interval' => '00:00:10', 'comment' => $Name);

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -10 +10 @@
     $Interfaces = array();
     $DbResult = $this->Database->select('NetworkInterface', '`Id`, `LocalIP` AS `IP`, `Online`, 0 AS `NewOnline`');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
       $Interfaces[$DbRow['IP']] = $DbRow;
 
@@ -16 +16 @@
     $DbResult3 = $this->Database->query('SELECT `DHCP` FROM `NetworkSubnet` '.
       'WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY `DHCP`');
-    while($Subnet = $DbResult3->fetch_assoc())
+    while ($Subnet = $DbResult3->fetch_assoc())
     {
       echo('router '.$Subnet['DHCP']."\n");
@@ -22 +22 @@
       $Routerboard->Connect($Subnet['DHCP'], $this->System->Config['API']['UserName'],
         $this->System->Config['API']['Password']);
-      if(!$Routerboard->Connected) continue;
+      if (!$Routerboard->Connected) continue;
       $Routerboard->Write('/tool/netwatch/getall', false);
       $Routerboard->Write('=.proplist=host,status');
       $Read = $Routerboard->Read(false);
       $List = $Routerboard->ParseResponse($Read);
-      foreach($List as $Properties)
+      foreach ($List as $Properties)
       {
         $IP = $Properties['host'];
-        if($Properties['status'] == 'up') $Online = 1;
+        if ($Properties['status'] == 'up') $Online = 1;
           else $Online = 0;
 
-        if($Online)
+        if ($Online)
         {
-          if(array_key_exists($IP, $Interfaces))
+          if (array_key_exists($IP, $Interfaces))
             $Interfaces[$IP]['NewOnline'] = 1;
             else echo('IP '.$IP.' not found.'."\n");
@@ -44 +44 @@
     $Queries = array();
     $QueriesInsert = array();
-    foreach($Interfaces as $Index => $Interface)
+    foreach ($Interfaces as $Index => $Interface)
     {
       // Update last online time if still online
-      if($Interface['NewOnline'])
+      if ($Interface['NewOnline'])
         $Queries[] = $this->Database->GetUpdate('NetworkInterface', '`Id` = '.$Interface['Id'],
           array('LastOnline' => TimeToMysqlDateTime($StartTime)));
 
-      if($Interface['Online'] != $Interface['NewOnline'])
+      if ($Interface['Online'] != $Interface['NewOnline'])
       {
         // Online state changed
@@ -78 +78 @@
     $DbResult = $this->Database->select('NetworkInterface', '*', '(`Online` = 1) AND '.
       '(`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'")');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       echo('IP '.$DbRow['LocalIP'].' online but time not updated.'."\n");
@@ -84 +84 @@
     $DbResult = $this->Database->select('NetworkInterface', '*', '(`Online` = 0) AND '.
       '(`LastOnline` >= "'.TimeToMysqlDateTime($StartTime).'")');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       echo('IP '.$DbRow['LocalIP'].' not online but time updated.'."\n");
@@ -92 +92 @@
     // Update device online state
     $DbResult = $this->Database->select('NetworkInterface', '`Device`, SUM(`Online`) AS `SumOnline`', '`Online` = 1 GROUP BY `Device`');
-    while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
     {
-      if($Device['SumOnline'] > 0)
+      if ($Device['SumOnline'] > 0)
         $Queries[] = $this->Database->GetUpdate('NetworkDevice', 'Id='.$Device['Device'], array('LastOnline' => TimeToMysqlDateTime($StartTime), 'Online' => 1));
     }

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -48 +48 @@
   function CheckName($Name, &$UsedNames)
   {
-    if(in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
+    if (in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
       else $UsedNames[] = $Name;
   }
@@ -189 +189 @@
     $DbResult = $this->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
       'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` WHERE `Member`.`Blocked`=0');
-    while($Member = $DbResult->fetch_assoc())
+    while ($Member = $DbResult->fetch_assoc())
     {
       $ServiceIndex = 1;
@@ -198 +198 @@
         'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) '.
         'AND (`Service`.`InternetSpeedMax` > 0) AND (`Service`.`InternetSpeedMin` > 0)');
-      while($Service = $DbResult4->fetch_assoc())
+      while ($Service = $DbResult4->fetch_assoc())
       {
         echo('Služba '.$Service['Name'].': ');
@@ -231 +231 @@
         $Row = $DbResult2->fetch_row();
         $HostCount = $Row[0];
-        if($HostCount > 0)
+        if ($HostCount > 0)
         {
           $HostSpeedIn = round($SpeedIn / $HostCount);
@@ -242 +242 @@
 
         $DbResult2 = $this->Database->select('NetworkDevice', '*', $Filter);
-        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())
           {
             $DeviceName = $Device['Name'];
-            if($Interface['Name'] != '') $DeviceName .= '-'.$Interface['Name'];
+            if ($Interface['Name'] != '') $DeviceName .= '-'.$Interface['Name'];
             $DeviceName = RouterOSIdent($DeviceName);
             echo($DeviceName.', ');
@@ -258 +258 @@
 
         $DbResult2 = $this->Database->select('NetworkSubnet', '*', '`Service`='.$Service['RelId']);
-        while($Subnet = $DbResult2->fetch_assoc())
+        while ($Subnet = $DbResult2->fetch_assoc())
         {
           $SubnetName = RouterOSIdent('subnet-'.$Subnet['Name']);
@@ -329 +329 @@
   {
     $MinSpeed = 0;
-    foreach($this->Devices[$DeviceId]['Childs'] as $DeviceChild)
+    foreach ($this->Devices[$DeviceId]['Childs'] as $DeviceChild)
     {
       $this->UpdateMinSpeed($DeviceChild);
@@ -335 +335 @@
     }
     $this->Devices[$DeviceId]['MinSpeed'] = $MinSpeed;
-    if($this->Devices[$DeviceId]['DeviceCount'] > 0)
+    if ($this->Devices[$DeviceId]['DeviceCount'] > 0)
       $this->Devices[$DeviceId]['MinSpeed'] += round($this->Devices[$DeviceId]['InternetSpeedMin'] / $this->Devices[$DeviceId]['DeviceCount']);
   }
@@ -349 +349 @@
       'LEFT JOIN `ServiceCustomerRel` ON `ServiceCustomerRel`.`Id`=`NetworkDevice`.`Service` '.
       'LEFT JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service`');
-    while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
     {
       $Device['Interfaces'] = array();
@@ -364 +364 @@
     $Interfaces = array();
     $DbResult = $this->Database->query('SELECT `Device`,`Name`,`Id` FROM `NetworkInterface`');
-    while($Interface = $DbResult->fetch_assoc())
+    while ($Interface = $DbResult->fetch_assoc())
     {
       $Interface['Links'] = array();
@@ -376 +376 @@
       '`NetworkLink`.`Interface2`,`NetworkLinkType`.`MaxRealSpeed` FROM `NetworkLink` '.
       'LEFT JOIN `NetworkLinkType` ON `NetworkLinkType`.`Id`=`NetworkLink`.`Type`');
-    while($Link = $DbResult->fetch_assoc())
+    while ($Link = $DbResult->fetch_assoc())
     {
       $Links[$Link['Id']] = $Link;
@@ -388 +388 @@
     $this->Devices[$RootDeviceId]['Calculated'] = true;
 
-    while(count($DevicesToCheck) > 0)
+    while (count($DevicesToCheck) > 0)
     {
       //echo('Pass'."\n");
       $NewDevicesToCheck = array();
-      foreach($DevicesToCheck as $DeviceId)
+      foreach ($DevicesToCheck as $DeviceId)
       {
         //echo($this->Devices[$DeviceId]['Name'].': ');
-        foreach($this->Devices[$DeviceId]['Interfaces'] as $InterfaceId)
+        foreach ($this->Devices[$DeviceId]['Interfaces'] as $InterfaceId)
         {
-          foreach($Interfaces[$InterfaceId]['Links'] as $LinkId)
+          foreach ($Interfaces[$InterfaceId]['Links'] as $LinkId)
           {
             $Link = $Links[$LinkId];
             $Interface2Id = $Link['Interface1'];
-            if($Interface2Id == $InterfaceId) $Interface2Id = $Links[$LinkId]['Interface2'];
+            if ($Interface2Id == $InterfaceId) $Interface2Id = $Links[$LinkId]['Interface2'];
 
             $Device2Id = $Interfaces[$Interface2Id]['Device'];
-            if($this->Devices[$Device2Id]['Calculated'] == false)
+            if ($this->Devices[$Device2Id]['Calculated'] == false)
             {
               $this->Devices[$Device2Id]['Calculated'] = true;
               $NewMaxSpeed = $this->Devices[$DeviceId]['MaxSpeed'];
-              if($NewMaxSpeed > $Link['MaxRealSpeed'])
+              if ($NewMaxSpeed > $Link['MaxRealSpeed'])
                 $NewMaxSpeed = $Link['MaxRealSpeed'];
               //echo($this->Devices[$Device2Id]['Name'].' '.$Device2Id.', ');
@@ -431 +431 @@
 
     echo('Not linked network devices: ');
-    foreach($this->Devices as $Device)
-    {
-      if($Device['MaxSpeed'] == 0) echo($Device['Name'].', ');
+    foreach ($this->Devices as $Device)
+    {
+      if ($Device['MaxSpeed'] == 0) echo($Device['Name'].', ');
     }
     echo("\n");
@@ -455 +455 @@
     $DbResult3 = $this->Database->select('NetworkInterface', '*', '`Device` = '.$DeviceId.' AND `LocalIP` != ""');
     $IntCount = $DbResult3->num_rows;
-    while($Interface = $DbResult3->fetch_assoc())
+    while ($Interface = $DbResult3->fetch_assoc())
     {
       $InterfaceName = $Device['Name'];
-      if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
+      if ($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
         else $InterfaceName .= '-';
       $InterfaceName = RouterOSIdent($InterfaceName);
@@ -469 +469 @@
 
     // Process childs
-    foreach($Device['Childs'] as $DeviceChild)
+    foreach ($Device['Childs'] as $DeviceChild)
     {
       $this->BuildQueueItems($DeviceChild, $LimitDevice);
@@ -505 +505 @@
 
     $DbResult = $this->Database->select('Service', '*', '(`ChangeAction` IS NULL) AND (`Id`='.TARIFF_FREE.')');
-    if($DbResult->num_rows == 1)
+    if ($DbResult->num_rows == 1)
     {
       $Service = $DbResult->fetch_array();

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -12 +12 @@
         '(SELECT `LocalIP` FROM `NetworkInterface` WHERE `NetworkInterface`.`Device` = `NetworkDevice`.`Id` LIMIT 1) AS `LocalIP` '.
         'FROM `NetworkDevice` WHERE (`API` = 1) AND (`Used` = 1)');
-    while($Device = $DbResult3->fetch_assoc())
+    while ($Device = $DbResult3->fetch_assoc())
     {
       echo($Device['LocalIP']."\n");
@@ -19 +19 @@
       //$Routerboard->Port = 8729;
       $Routerboard->Connect($Device['LocalIP'], $this->System->Config['API']['UserName'], $this->System->Config['API']['Password']);
-      if(!$Routerboard->Connected) continue;
+      if (!$Routerboard->Connected) continue;
       $Routerboard->Write('/interface/wireless/registration-table/getall', false);
       $Routerboard->Write('=.proplist=signal-strength,mac-address,rx-rate,tx-rate', false);
@@ -25 +25 @@
       $Read = $Routerboard->Read(false);
       $Array = $Routerboard->ParseResponse($Read);
-      foreach($Array as $Properties)
+      foreach ($Array as $Properties)
       {
         $DbResult = $this->Database->select('NetworkInterface', 'Id', 'MAC="'.$Properties['mac-address'].'"');
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           $DbRow = $DbResult->fetch_assoc();
@@ -34 +34 @@
         } else $Interface = 'NULL';
 
-        if(strpos($Properties['signal-strength'], '@') === false)
+        if (strpos($Properties['signal-strength'], '@') === false)
         {
           $Strength = $Properties['signal-strength'];
         } else {
           $Parts = explode('@', $Properties['signal-strength']);
-          if(substr($Parts[0], -3) == 'dBm')
+          if (substr($Parts[0], -3) == 'dBm')
             $Strength = substr($Parts[0], 0, -3); // without dBm
             else $Strength = $Parts[0];
@@ -50 +50 @@
         /*
          $DbResult = $this->Database->select('Measure', 'Id', '`Name` = "'.$Properties['mac-address'].'"');
-         if($DbResult->num_rows > 0)
+         if ($DbResult->num_rows > 0)
          {
          $this->Database->insert('Measure', array('Name' => $Properties['mac-address']));
@@ -74 +74 @@
     if (substr($Value, -3, 3) == "Mbp") $Value = substr($Value, 0, -3); // without Mbp unit    
     if (substr($Value, -1, 1) == "M") $Value = substr($Value, 0, -1); // without M unit
-    return($Value);
+    return ($Value);
   }
 

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -70 +70 @@
     $IPAddress = GetRemoteAddress();
     $Output = 'Vaše IP adresa je: '.$IPAddress.'<br/>';
-    if(IsInternetAddr($IPAddress)) {
+    if (IsInternetAddr($IPAddress)) {
       $Output .= '<p>Internet zdarma je dostupný pouze z vnitřní sítě.</p>';
-      return($Output);
+      return ($Output);
     }
     $Time = time();
@@ -78 +78 @@
     $DbResult = $this->Database->select('NetworkFreeAccess', '*', '(IPAddress="'.$IPAddress.
       '") ORDER BY Time DESC LIMIT 1');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
       $ActivationTime = MysqlDateTimeToTime($DbRow['Time']);
-      if(($ActivationTime + $this->Timeout) < $Time)
+      if (($ActivationTime + $this->Timeout) < $Time)
       {
         $Activated = false;
@@ -88 +88 @@
     } else $Activated = false;
 
-    if(array_key_exists('a', $_GET))
+    if (array_key_exists('a', $_GET))
     {
-      if($_GET['a'] == 'activate')
+      if ($_GET['a'] == 'activate')
       {
-        if($Activated == false)
+        if ($Activated == false)
         {
           $DbResult = $this->Database->insert('NetworkFreeAccess',
@@ -108 +108 @@
 
     $PrefixMultiplier = new PrefixMultiplier();
-    if($Activated) $Output .= 'Aktivováno. Vyprší za '.$PrefixMultiplier->Add($ActivationTime + $this->Timeout - $Time, '', 4, 'Time');
+    if ($Activated) $Output .= 'Aktivováno. Vyprší za '.$PrefixMultiplier->Add($ActivationTime + $this->Timeout - $Time, '', 4, 'Time');
       else $Output .= '<a href="?a=activate">Aktivovat</a>';
 
-    return($Output);
+    return ($Output);
   }
 }
@@ -122 +122 @@
     $Commands = array();
     $DbResult = $this->Database->select('NetworkFreeAccess', '`Id`, `IPAddress`', '(`Configured`=0)');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       $Commands[] = '/ip firewall address-list add address='.$DbRow['IPAddress'].
@@ -135 +135 @@
     $Routerboard->ExecuteBatch(implode(';', $Commands));
 
-    return($Output);
+    return ($Output);
   }
 }

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

@@ -22 +22 @@
   {
     $Output = array();
-    if(is_array($Commands))
+    if (is_array($Commands))
     {
       $I = 0;
       $Batch = array();
-      while($I < count($Commands))
-      {
-        if(($I % $this->MaxBurstLineCount) == 0)
-        {
-          if(count($Batch) > 0)
+      while ($I < count($Commands))
+      {
+        if (($I % $this->MaxBurstLineCount) == 0)
+        {
+          if (count($Batch) > 0)
             $Output = array_merge($Output, $this->ExecuteBatch(implode(';', $Batch)));
           $Batch = array();
@@ -37 +37 @@
         $I++;
       }
-      if(count($Batch) > 0)
+      if (count($Batch) > 0)
        $Output = array_merge($Output, $this->ExecuteBatch(implode(';', $Batch)));
     } else
       $Output = array_merge($Output, $this->ExecuteBatch($Commands));
-    return($Output);
+    return ($Output);
   }
 
@@ -47 +47 @@
   {
     $Commands = trim($Commands);
-    if($Commands != '')
+    if ($Commands != '')
     {
       $Commands = addslashes($Commands);
@@ -57 +57 @@
       $Command = $this->SSHPath.' -oBatchMode=no -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.
         $PrivKey.' '.$this->HostName.' "'.$Commands.'"';
-      if($this->Debug) echo($Command);
+      if ($this->Debug) echo($Command);
       $Output = array();
       exec($Command, $Output);
     } else $Output = '';
-    if($this->Debug) print_r($Output);
-    return($Output);
+    if ($this->Debug) print_r($Output);
+    return ($Output);
   }
 
@@ -70 +70 @@
     array_pop($Result);
     $List = array();
-    foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
     {
       $ResultLineParts = explode(' ', trim($ResultLine));
-      if(count($ResultLineParts) > 1)
-      {
-        if($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
+      if (count($ResultLineParts) > 1)
+      {
+        if ($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
         $List[substr($ResultLineParts[0], 0, -1)] = $ResultLineParts[1];
       } else $List[substr($ResultLineParts[0], 0, -1)] = '';
     }
-    return($List);
+    return ($List);
   }
 
@@ -85 +85 @@
   {
     $PropertyList = '"';
-    foreach($Properties as $Index => $Property)
+    foreach ($Properties as $Index => $Property)
     {
       $PropertyList .= $Index.'=".[get $i '.$Property.']." ';
@@ -92 +92 @@
 
     $ConditionList = '';
-    foreach($Conditions as $Index => $Item)
-    {
-      if($Item == 'no') $ConditionList .= $Index.'='.$Item.' ';
+    foreach ($Conditions as $Index => $Item)
+    {
+      if ($Item == 'no') $ConditionList .= $Index.'='.$Item.' ';
       else $ConditionList .= $Index.'="'.$Item.'" ';
     }
@@ -101 +101 @@
     $Result = $this->Execute(implode(' ', $Path).' {:foreach i in=[find '.$ConditionList.'] do={:put ('.$PropertyList.')}}');
     $List = array();
-    foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
     {
       $ResultLineParts = explode(' ', $ResultLine);
       $ListItem = array();
-      foreach($ResultLineParts as $ResultLinePart)
+      foreach ($ResultLineParts as $ResultLinePart)
       {
         $Value = explode('=', $ResultLinePart);
-        if(count($Value) > 1) $ListItem[$Properties[$Value[0]]] = $Value[1];
+        if (count($Value) > 1) $ListItem[$Properties[$Value[0]]] = $Value[1];
           else $ListItem[$Properties[$Value[0]]] = '';
       }
       $List[] = $ListItem;
     }
-    return($List);
+    return ($List);
   }
 
@@ -119 +119 @@
   {
     $ConditionList = '';
-    foreach($Conditions as $Index => $Item)
+    foreach ($Conditions as $Index => $Item)
     {
       $ConditionList .= $Index.'="'.$Item.'" ';
     }
     $ConditionList = substr($ConditionList, 0, -1);
-    if(trim($ConditionList) != '')
+    if (trim($ConditionList) != '')
       $ConditionList = ' where '.$ConditionList;
 
     $Result = $this->Execute(implode(' ', $Path).' print terse'.$ConditionList);
     $List = array();
-    foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
     {
       $ResultLineParts = explode(' ', $ResultLine);
       $ListItem = array();
-      foreach($ResultLineParts as $ResultLinePart)
+      foreach ($ResultLineParts as $ResultLinePart)
       {
         $Value = explode('=', $ResultLinePart);
-        if(in_array($Value[0], $Properties))
-        {
-          if(count($Value) > 1)
+        if (in_array($Value[0], $Properties))
+        {
+          if (count($Value) > 1)
           {
-            if($Value[1]{0} == '"') $Value[1] = substr($Value[1], 1, -1);
-            //if(strlen($Value[1]) > 0)
+            if ($Value[1]{0} == '"') $Value[1] = substr($Value[1], 1, -1);
+            //if (strlen($Value[1]) > 0)
             $ListItem[$Value[0]] = $Value[1];
           } else $ListItem[$Value[0]] = '';
         }
       }
-      if(count($ListItem) > 0) $List[] = $ListItem;
-    }
-    return($List);
+      if (count($ListItem) > 0) $List[] = $ListItem;
+    }
+    return ($List);
   }
 
@@ -159 +159 @@
   {
     // Get current list from routerboard
-    if($UsePrint == 0)
+    if ($UsePrint == 0)
     {
       $List = $this->ListGet($Path, $Properties, $Condition);
       // Change boolean values yes/no to true/false
-      foreach($List as $Index => $ListItem)
-      {
-        foreach($ListItem as $Index2 => $Item2)
-        {
-          if($Item2 == 'true') $List[$Index][$Index2] = 'yes';
-          if($Item2 == 'false') $List[$Index][$Index2] = 'no';
+      foreach ($List as $Index => $ListItem)
+      {
+        foreach ($ListItem as $Index2 => $Item2)
+        {
+          if ($Item2 == 'true') $List[$Index][$Index2] = 'yes';
+          if ($Item2 == 'false') $List[$Index][$Index2] = 'no';
         }
       }
@@ -178 +178 @@
 
     // Add empty properties to values
-    foreach($Values as $Index => $Item)
-    {
-      foreach($Properties as $Property)
-      {
-        if(!array_key_exists($Property, $Item))
+    foreach ($Values as $Index => $Item)
+    {
+      foreach ($Properties as $Property)
+      {
+        if (!array_key_exists($Property, $Item))
            $Item[$Property] = '';
       }
       $Values[$Index] = $Item;
     }
-    foreach($List as $Index => $Item)
-    {
-      foreach($Properties as $Property)
-      {
-        if(!array_key_exists($Property, $Item))
+    foreach ($List as $Index => $Item)
+    {
+      foreach ($Properties as $Property)
+      {
+        if (!array_key_exists($Property, $Item))
            $Item[$Property] = '';
       }
@@ -198 +198 @@
 
     // Sort properties
-    foreach($Values as $Index => $Item)
+    foreach ($Values as $Index => $Item)
     {
       ksort($Values[$Index]);
     }
-    foreach($List as $Index => $Item)
+    foreach ($List as $Index => $Item)
     {
       ksort($List[$Index]);
     }
-    if($this->Debug) print_r($List);
-    if($this->Debug) print_r($Values);
+    if ($this->Debug) print_r($List);
+    if ($this->Debug) print_r($Values);
 
     // Erase all items not existed in $Values
-    foreach($List as $Index => $ListItem)
-    {
-      if(!in_array($ListItem, $Values))
+    foreach ($List as $Index => $ListItem)
+    {
+      if (!in_array($ListItem, $Values))
       {
         $Prop = '';
-        foreach($ListItem as $Index => $Property)
-        {
-          if($Property != '')
+        foreach ($ListItem as $Index => $Property)
+        {
+          if ($Property != '')
           {
-            if(($Property == 'yes') or ($Property == 'no')) $Prop .= $Index.'='.$Property.' ';
+            if (($Property == 'yes') or ($Property == 'no')) $Prop .= $Index.'='.$Property.' ';
               else $Prop .= $Index.'="'.$Property.'" ';
           }
         }
         $Prop = substr($Prop, 0, -1);
-        if(trim($Prop) != '')
+        if (trim($Prop) != '')
           $Commands[] = implode(' ', $Path).' remove [find '.$Prop.']';
       }
@@ -230 +230 @@
 
     // Add new items
-    foreach($Values as $ListItem)
-    {
-      if(!in_array($ListItem, $List))
+    foreach ($Values as $ListItem)
+    {
+      if (!in_array($ListItem, $List))
       {
         $Prop = '';
-        foreach($ListItem as $Index => $Property)
-        {
-          if($Property != '') $Prop .= $Index.'="'.$Property.'" ';
+        foreach ($ListItem as $Index => $Property)
+        {
+          if ($Property != '') $Prop .= $Index.'="'.$Property.'" ';
         }
         $Prop = substr($Prop, 0, -1);
@@ -243 +243 @@
       }
     }
-    if($this->Debug) print_r($Commands);
-    return($this->Execute($Commands));
+    if ($this->Debug) print_r($Commands);
+    return ($this->Execute($Commands));
   }
 }

trunk/Modules/NetworkConfigRouterOS/Routerboard2.php

@@ -13 +13 @@
   function Execute($Commands)
   {
-    if(is_array($Commands)) $Commands = implode(';', $Commands);
-    return(parent::Execute($Commands));
+    if (is_array($Commands)) $Commands = implode(';', $Commands);
+    return (parent::Execute($Commands));
   }
 
@@ -22 +22 @@
     array_pop($Result);
     $List = array();
-    foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
     {
       $ResultLineParts = explode(' ', trim($ResultLine));
-      if($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
+      if ($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
       $List[substr($ResultLineParts[0], 0, -1)] = $ResultLineParts[1];
     }
-    return($List);
+    return ($List);
   }
 
@@ -34 +34 @@
   {
     $PropertyList = '"';
-    foreach($Properties as $Property)
+    foreach ($Properties as $Property)
     {
       $PropertyList .= $Property.'=".[get $i '.$Property.']." ';
@@ -41 +41 @@
     $Result = $this->Execute($Command.' {:foreach i in=[find] do={:put ('.$PropertyList.')}}');
     $List = array();
-    foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
     {
       $ResultLineParts = explode(' ', $ResultLine);
       $ListItem = array();
-      foreach($ResultLineParts as $ResultLinePart)
+      foreach ($ResultLineParts as $ResultLinePart)
       {
         $Value = explode('=', $ResultLinePart);
@@ -52 +52 @@
       $List[] = $ListItem;
     }
-    return($List);
+    return ($List);
   }
 
   function GetSystemResource()
   {
-    return($this->GetItem('/system resource print'));
+    return ($this->GetItem('/system resource print'));
   }
 
   function GetFirewallFilterList()
   {
-    return($this->GetList('/ip firewall nat', array('src-address', 'dst-address', 'bytes')));
+    return ($this->GetList('/ip firewall nat', array('src-address', 'dst-address', 'bytes')));
   }
 
   function GetDHCPServerLeasesList()
   {
-    return($this->GetList('/ip dhcp-server lease', array('address', 'active-address', 'comment', 'lease-time', 'status', 'host-name')));
+    return ($this->GetList('/ip dhcp-server lease', array('address', 'active-address', 'comment', 'lease-time', 'status', 'host-name')));
   }
 }

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -40 +40 @@
     } else if ($Length >= 0x10000000)
       $Length = chr(0xF0).chr(($Length >> 24) & 0xFF).chr(($Length >> 16) & 0xFF).chr(($Length >> 8) & 0xFF).chr($Length & 0xFF);
-    return($Length);
+    return ($Length);
   }
 
   function ConnectOnce($IP, $Login, $Password)
   {
-    if($this->Connected) $this->Disconnect();
-    if($this->SSL)
+    if ($this->Connected) $this->Disconnect();
+    if ($this->SSL)
     {
       $IP = 'ssl://'.$IP;
     }
     $this->Socket = @fsockopen($IP, $this->Port, $this->ErrorNo, $this->ErrorStr, $this->Timeout);
-    if($this->Socket)
+    if ($this->Socket)
     {
       socket_set_timeout($this->Socket, $this->Timeout);
@@ -58 +58 @@
       $this->Write('=password='.$Password);
       $Response = $this->Read(false);
-      if((count($Response) > 0) and ($Response[0] == '!done')) $this->Connected = true;
-      if(!$this->Connected) fclose($this->Socket);
+      if ((count($Response) > 0) and ($Response[0] == '!done')) $this->Connected = true;
+      if (!$this->Connected) fclose($this->Socket);
     }
   }
@@ -65 +65 @@
   function Connect($IP, $Login, $Password)
   {
-    for($Attempt = 1; $Attempt <= $this->Attempts; $Attempt++)
+    for ($Attempt = 1; $Attempt <= $this->Attempts; $Attempt++)
     {
       $this->ConnectOnce($IP, $Login, $Password);
-      if($this->Connected) break;
+      if ($this->Connected) break;
       sleep($this->Delay);
     }
-    return($this->Connected);
+    return ($this->Connected);
   }
 
   function Disconnect()
   {
-    if($this->Connected)
+    if ($this->Connected)
     {
       fclose($this->Socket);
@@ -183 +183 @@
         $Response[] = $Line;
       }
-      if($this->Debug) echo($Line);
+      if ($this->Debug) echo($Line);
       // If we get a !done, make a note of it.
       if ($Line == "!done") $ReceivedDone = true;
@@ -192 +192 @@
         break;
     }
-    if($Parse) $Response = $this->ParseResponse($Response);
+    if ($Parse) $Response = $this->ParseResponse($Response);
     return $Response;
   }
@@ -198 +198 @@
   function Write($Command, $Param2 = true)
   {
-    if($Command)
+    if ($Command)
     {
       $Data = explode("\n", $Command);
@@ -234 +234 @@
       $this->Write($el, $Last);
     }
-    return($this->Read());
+    return ($this->Read());
   }
 }

trunk/Modules/NetworkConfigRouterOS/SSH.php

@@ -18 +18 @@
   {
     echo($Commands);
-    if(!function_exists("ssh2_connect")) die("Function ssh2_connect doesn't exist");
-    if(!($this->Session = ssh2_connect($this->HostName, 22, $this->Methods))) echo("Fail: Unable to establish connection to host\n");
+    if (!function_exists("ssh2_connect")) die("Function ssh2_connect doesn't exist");
+    if (!($this->Session = ssh2_connect($this->HostName, 22, $this->Methods))) echo("Fail: Unable to establish connection to host\n");
     else
     {
-      if(!ssh2_auth_password($this->Session, $this->UserName, $this->Password)) echo("Fail: unable to authenticate\n");
+      if (!ssh2_auth_password($this->Session, $this->UserName, $this->Password)) echo("Fail: unable to authenticate\n");
       else
       {
-        //if(!($Stream = ssh2_shell($this->Session, 'xterm', null, 80, 40, SSH2_TERM_UNIT_CHARS))) echo("Fail: unable to execute command\n");
-        if(!($Stream = ssh2_exec($this->Session, $Commands))) echo("Fail: unable to execute command\n");
+        //if (!($Stream = ssh2_shell($this->Session, 'xterm', null, 80, 40, SSH2_TERM_UNIT_CHARS))) echo("Fail: unable to execute command\n");
+        if (!($Stream = ssh2_exec($this->Session, $Commands))) echo("Fail: unable to execute command\n");
         else
         {
           $Response = '';
           stream_set_blocking($Stream, true);
-          while($Buffer = fread($Stream, 4000))
+          while ($Buffer = fread($Stream, 4000))
           {
             $Response .= $Buffer;
@@ -37 +37 @@
             /*
             //echo(') '.strlen($Buffer).' '.ord($Buffer{0}).'(');
-            for($I = 0; $I < strlen($Buffer); $I++)
+            for ($I = 0; $I < strlen($Buffer); $I++)
             {
-              if(((ord($Buffer{$I}) >= 32) and (ord($Buffer{$I}) <= 128)) or ($Buffer{$I} = "\n") or ($Buffer{$I} = "\r")) echo($Buffer{$I});
-              if($Buffer{$I} == '>')
+              if (((ord($Buffer{$I}) >= 32) and (ord($Buffer{$I}) <= 128)) or ($Buffer{$I} = "\n") or ($Buffer{$I} = "\r")) echo($Buffer{$I});
+              if ($Buffer{$I} == '>')
               {
                 fwrite($Stream, $Commands."\n\r");
@@ -54 +54 @@
     }
     echo($Response);
-    return(explode("\n", substr($Response, 0, -1)));
+    return (explode("\n", substr($Response, 0, -1)));
   }
 }