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

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/Netwatch.php (modified) (3 diffs)

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