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

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/AddressPortability.php (modified) (5 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']);