Changeset 928 for trunk/Modules/Network/Network.php

Timestamp:

May 11, 2022, 12:06:31 PM (3 years ago)

Author:

chronos

Message:

• Fixed: PHP 8.1 related fixes.

File:

• trunk/Modules/Network/Network.php (modified) (4 diffs)

trunk/Modules/Network/Network.php

@@ -785 +785 @@
   }
 
-  function AfterInsertNetworkDevice(Form $Form): void
+  function AfterInsertNetworkDevice(Form $Form, string $Id): array
   {
     $this->System->Models['NetworkDevice']->DoOnChange();
-  }
-
-  function AfterModifyNetworkDevice(Form $Form, string $Id): void
+    return $Form->Values;
+  }
+
+  function AfterModifyNetworkDevice(Form $Form, string $Id): array
   {
     $this->System->Models['NetworkDevice']->DoOnChange();
-  }
-
-  function AfterInsertNetworkInterface(Form $Form): void
+    return $Form->Values;
+  }
+
+  function AfterInsertNetworkInterface(Form $Form, string $Id): array
   {
     $this->System->Models['NetworkInterface']->DoOnChange();
-  }
-
-  function AfterModifyNetworkInterface(Form $Form, string $Id): void
+    return $Form->Values;
+  }
+
+  function AfterModifyNetworkInterface(Form $Form, string $Id): array
   {
     $this->System->Models['NetworkInterface']->DoOnChange();
+    return $Form->Values;
   }
 
@@ -877 +881 @@
     $Output = '';
     $Condition = 'WHERE (`NetworkInterface`.`LastOnline` <= "'.TimeToMysqlDateTime($Time - $MinDuration).'")';
-    echo($OnlineNow);
     if ($OnlineNow >= 0) $Condition .= ' AND (`NetworkInterface`.`Online` = '.$OnlineNow.')';
-    echo($OnlinePrevious);
     if ($OnlinePrevious >= 0) $Condition .= ' AND (`NetworkInterface`.`OnlineNotify` = '.$OnlinePrevious.')';
-    echo($Condition."\n");
     $DbResult3 = $this->Database->query('SELECT CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) AS `Name`, '.
       '`NetworkInterface`.`Online`, `NetworkInterface`.`LastOnline` FROM `NetworkInterface` '.
@@ -918 +919 @@
     $NewOffline = $this->OnlineList('Nově offline', 0, 1, $this->MinNotifyTime);
     $Output .= $NewOffline['Report'];
-    $StillOffline = $this->OnlineList('Stále offline', 0, 0, 0);
-    $Output .= $StillOffline['Report'];
+    if ($Output != '')
+    {
+      $StillOffline = $this->OnlineList('Stále offline', 0, 0, 0);
+      $Output .= $StillOffline['Report'];
+    }
     $Offline = $this->OnlineList('Offline', 0, -1, 0);
     return array('Report' => $Output, 'Count' => $Offline['Count'], 'Title' => 'Odezva');
@@ -970 +974 @@
     $NewOffline = $this->PortCheckList('Nově offline', 0, 1, $this->MinNotifyTime);
     $Output .= $NewOffline['Report'];
-    $StillOffline = $this->PortCheckList('Stále offline', 0, 0, 0);
-    $Output .= $StillOffline['Report'];
+    if ($Output != '')
+    {
+      $StillOffline = $this->PortCheckList('Stále offline', 0, 0, 0);
+      $Output .= $StillOffline['Report'];
+    }
     $Offline = $this->PortCheckList('Offline', 0, -1, 0);
     return array('Report' => $Output, 'Count' => $Offline['Count'], 'Title' => 'Port');