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

Timestamp:

Jan 13, 2020, 12:26:00 AM (5 years ago)

Author:

chronos

Message:

• Added: NotifLog table to collect notify changes in table to be able to preset them through RSS channel.

File:

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

trunk/Modules/Network/Network.php

@@ -132 +132 @@
     $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkPort',
       array($this, 'PortCheck'));
-
 
     $this->System->RegisterPage('network', 'PageNetwork');
@@ -816 +815 @@
     $OnlineText = array('<span style="color:red;">Nedostupný</span>', '<span style="color:green;">Dostupný</span>');
     $Output = '';
-    $Condition = 'WHERE (`NetworkInterface`.`Online` = '.$OnlineNow.') AND (`NetworkInterface`.`OnlineNotify` = '.$OnlinePrevious.') '.
-      'AND (`NetworkInterface`.`LastOnline` <= "'.TimeToMysqlDateTime($Time - $MinDuration).'")';
+    $Condition = 'WHERE (`NetworkInterface`.`LastOnline` <= "'.TimeToMysqlDateTime($Time - $MinDuration).'")';
+    if ($OnlineNow != null) $Condition .= ' AND (`NetworkInterface`.`Online` = '.$OnlineNow.')';
+    if ($OnlinePrevious != null) $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` '.
@@ -845 +845 @@
     $this->Database->query('UPDATE `NetworkInterface` SET `OnlineNotify` = `Online` '.
       $Condition);
-    return $Output;
+    return array('Report' => $Output, 'Count' => $DbResult3->num_rows);
   }
 
   function ReachabilityCheck()
   {
-    $Output = '';
-    $Output = $this->OnlineList('Nově online', 1, 0, 0);
-    $Output .= $this->OnlineList('Nově offline', 0, 1, $this->MinNotifyTime);
-    if($Output != '') $Output .= $this->OnlineList('Stále offline', 0, 0, 0);
-    return($Output);
+    $NewOnline = $this->OnlineList('Nově online', 1, 0, 0);
+    $Output = $NewOnline['Report'];
+    $NewOffline = $this->OnlineList('Nově offline', 0, 1, $this->MinNotifyTime);
+    $Output .= $NewOffline['Report'];
+    if ($Output != '')
+    {
+      $StillOffline = $this->OnlineList('Stále offline', 0, 0, 0);
+      $Output .= $StillOffline['Report'];
+    }
+    $Offline = $this->OnlineList('Offline', 0, null, 0);
+    return(array('Report' => $Output, 'Count' => $Offline['Count'], 'ShortTitle' => 'Odezva'));
   }
 
@@ -862 +868 @@
     $OnlineText = array('<span style="color:red;">Nedostupný</span>', '<span style="color:green;">Dostupný</span>');
     $Output = '';
-    $Condition = 'WHERE (`NetworkPort`.`Online` = '.$OnlineNow.') AND (`NetworkPort`.`OnlineNotify` = '.$OnlinePrevious.') '.
-      'AND (`NetworkPort`.`LastOnline` <= "'.TimeToMysqlDateTime($Time - $MinDuration).'")';
+    $Condition = 'WHERE (`NetworkPort`.`LastOnline` <= "'.TimeToMysqlDateTime($Time - $MinDuration).'")';
+    if ($OnlineNow != null) $Condition .= ' AND (`NetworkPort`.`Online` = '.$OnlineNow.')';
+    if ($OnlinePrevious != null) $Condition .= ' AND (`NetworkPort`.`OnlineNotify` = '.$OnlinePrevious.')';
     $DbResult3 = $this->Database->query('SELECT CONCAT(CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")), ":", `NetworkPort`.`Number`, "(", `NetworkPort`.`Name`, ")") AS `Name`, '.
       '`NetworkPort`.`Online`, `NetworkPort`.`LastOnline` FROM `NetworkPort` '.
@@ -871 +878 @@
       '(`NetworkInterface`.`LocalIP` != "") AND (`NetworkPort`.`Enabled` = 1)'.
       'ORDER BY `Name` ASC');
-    if($DbResult3->num_rows > 0)
+    if ($DbResult3->num_rows > 0)
     {
       $Output .= $Title.'<br/>';
@@ -892 +899 @@
     $this->Database->query('UPDATE `NetworkPort` SET `OnlineNotify` = `Online` '.
       $Condition);
-    return $Output;
+    return array('Report' => $Output, 'Count' => $DbResult3->num_rows);
   }
 
@@ -898 +905 @@
   {
     $Output = '';
-    $Output = $this->PortCheckList('Nově online', 1, 0, 0);
-    $Output .= $this->PortCheckList('Nově offline', 0, 1, $this->MinNotifyTime);
-    if($Output != '') $Output .= $this->PortCheckList('Stále offline', 0, 0, 0);
-    return($Output);
+    $NewOnline = $this->PortCheckList('Nově online', 1, 0, 0);
+    $Output .= $NewOnline['Report'];
+    $NewOffline = $this->PortCheckList('Nově offline', 0, 1, $this->MinNotifyTime);
+    $Output .= $NewOffline['Report'];
+    if ($Output != '')
+    {
+      $StillOffline = $this->PortCheckList('Stále offline', 0, 0, 0);
+      $Output .= $StillOffline['Report'];
+    }
+    $Offline = $this->PortCheckList('Offline', 0, null, 0);
+    return(array('Report' => $Output, 'Count' => $Offline['Count'], 'ShortTitle' => 'Port'));
   }
 }