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

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (7 diffs)

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