Changeset 945 for trunk

Timestamp:

Dec 7, 2022, 12:25:42 AM (2 years ago)

Author:

chronos

Message:

• Fixed: New offline devices and ports were not properly notified.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (5 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 943; // Subversion revision
+$Revision = 945; // Subversion revision
 $DatabaseRevision = 939; // SQL structure revision
 $ReleaseTime = strtotime('2022-12-06');

trunk/Modules/Network/Network.php

@@ -892 +892 @@
   }
 
-  function OnlineList(string $Title, string $OnlineNow, string $OnlinePrevious, int $MinDuration): array
+  function OnlineList(string $Title, int $OnlineNow, int $OnlinePrevious, int $MinDuration): array
   {
     $Time = time();
@@ -899 +899 @@
     $Condition = 'WHERE (`NetworkInterface`.`LastOnline` <= "'.TimeToMysqlDateTime($Time - $MinDuration).'")';
     if ($OnlineNow >= 0) $Condition .= ' AND (`NetworkInterface`.`Online` = '.$OnlineNow.')';
-    if ($OnlinePrevious >= 0) $Condition .= ' AND (`NetworkInterface`.`OnlineNotify` = '.$OnlinePrevious.')';
+    if ($OnlinePrevious >= 0) $Condition .= ' AND (`NetworkInterface`.`OnlineNotify` = '.$OnlinePrevious.')';  
     $DbResult3 = $this->Database->query('SELECT CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) AS `Name`, '.
       '`NetworkInterface`.`Online`, `NetworkInterface`.`LastOnline` FROM `NetworkInterface` '.
@@ -925 +925 @@
       $Output .= '</table><br/>'."\n";
     }
-    $this->Database->query('UPDATE `NetworkInterface` SET `OnlineNotify` = `Online` '.
-      $Condition);
+
+    if (($OnlineNow >= 0) and ($OnlinePrevious >= 0))
+    {
+      $this->Database->query('UPDATE `NetworkInterface` SET `OnlineNotify` = `Online` '.$Condition);
+    }
     return array('Report' => $Output, 'Count' => $DbResult3->num_rows);
   }
@@ -945 +948 @@
   }
 
-  function PortCheckList(string $Title, string $OnlineNow, string $OnlinePrevious, int $MinDuration): array
+  function PortCheckList(string $Title, int $OnlineNow, int $OnlinePrevious, int $MinDuration): array
   {
     $Time = time();
@@ -979 +982 @@
       $Output .= '</table><br/>'."\n";
     }
-    $this->Database->query('UPDATE `NetworkPort` SET `OnlineNotify` = `Online` '.
-      $Condition);
+
+    if (($OnlineNow >= 0) and ($OnlinePrevious >= 0))
+    {
+      $this->Database->query('UPDATE `NetworkPort` SET `OnlineNotify` = `Online` '.$Condition);
+    }
     return array('Report' => $Output, 'Count' => $DbResult3->num_rows);
   }