Changeset 868

Timestamp:

Jan 13, 2020, 1:10:38 AM (4 years ago)

Author:

chronos

Message:

• Fixed: Wrong condition evaluation in check network availability and port status.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (4 diffs)
• Modules/Notify/Notify.php (modified) (3 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 867; // Subversion revision
+$Revision = 868; // Subversion revision
 $DatabaseRevision = 867; // SQL structure revision
 $ReleaseTime = strtotime('2020-01-13');

trunk/Modules/Network/Network.php

@@ -816 +816 @@
     $Output = '';
     $Condition = 'WHERE (`NetworkInterface`.`LastOnline` <= "'.TimeToMysqlDateTime($Time - $MinDuration).'")';
-    if ($OnlineNow != null) $Condition .= ' AND (`NetworkInterface`.`Online` = '.$OnlineNow.')';
-    if ($OnlinePrevious != null) $Condition .= ' AND (`NetworkInterface`.`OnlineNotify` = '.$OnlinePrevious.')';
+    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` '.
@@ -854 +857 @@
     $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);
+    $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'], 'ShortTitle' => 'Odezva'));
   }
@@ -869 +869 @@
     $Output = '';
     $Condition = 'WHERE (`NetworkPort`.`LastOnline` <= "'.TimeToMysqlDateTime($Time - $MinDuration).'")';
-    if ($OnlineNow != null) $Condition .= ' AND (`NetworkPort`.`Online` = '.$OnlineNow.')';
-    if ($OnlinePrevious != null) $Condition .= ' AND (`NetworkPort`.`OnlineNotify` = '.$OnlinePrevious.')';
+    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` '.
@@ -909 +909 @@
     $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);
+    $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'], 'ShortTitle' => 'Port'));
   }

trunk/Modules/Notify/Notify.php

@@ -97 +97 @@
       {
         $Mail = new Mail();
-        $Mail->Subject = 'Notification';
+        $Mail->Subject = $Title;
         $Mail->AddTo($User['Value'], $User['Name']);
         $Mail->AddBody(strip_tags($Content), 'text/plain');
@@ -109 +109 @@
         $Output .= strip_tags(str_replace("</", " </", str_replace('<br/>', "\n", $Content)));
       }
-
-      return($Output);
     }
 
@@ -121 +119 @@
       );
     }
+
+    return($Output);
   }