Changeset 767

Timestamp:

Nov 22, 2015, 12:05:45 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Notify also about newly online network interfaces.

Location:

trunk

Files:

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

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 765; // Subversion revision
+$Revision = 767; // Subversion revision
 $DatabaseRevision = 765; // SQL structure revision
-$ReleaseTime = strtotime('2015-11-06');
+$ReleaseTime = strtotime('2015-11-22');

trunk/Modules/Notify/Notify.php

@@ -35 +35 @@
   }
 
-  function OnlineList($Title, $OnlineNow, $OnlinePrevious)
+  function OnlineList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
   {
     $Time = time();
-    $MinDuration = 5;
     $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).'")';
     $DbResult3 = $this->Database->query('SELECT CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) AS `Name`, '.
       '`NetworkInterface`.`Online`, `NetworkInterface`.`LastOnline` FROM `NetworkInterface` '.
       'LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
-      'WHERE (`NetworkInterface`.`Online` = '.$OnlineNow.') AND (`NetworkInterface`.`OnlineNotify` = '.$OnlinePrevious.') '.
-      'AND (`NetworkDevice`.`PermanentOnline`=1) AND (`NetworkDevice`.`Used`=1) '.
-      'AND (`NetworkInterface`.`LastOnline` < "'.TimeToMysqlDateTime($Time - $MinDuration).'") ORDER BY `Name` ASC');
+      $Condition.' AND (`NetworkDevice`.`PermanentOnline`=1) AND (`NetworkDevice`.`Used`=1) '.
+      'ORDER BY `Name` ASC');
     if($DbResult3->num_rows > 0) {
       $Output .= $Title.'<br/>';
@@ -65 +65 @@
       $Output .= '</table><br/>'."\n";
     }
+    $this->Database->query('UPDATE `NetworkInterface` SET `OnlineNotify` = `Online` '.
+      $Condition);
     return $Output;
   }
@@ -83 +85 @@
       {
         if($Category['SysName'] == 'NetworkReachability') {
-          $List = $this->OnlineList('Nově online', 1, 0);
-          $List .= $this->OnlineList('Nově offline', 0, 1);
+          $List = $this->OnlineList('Nově online', 1, 0, 0);
+          $List .= $this->OnlineList('Nově offline', 0, 1, 5);
           if($List != '') $List .= $this->OnlineList('Stále offline', 0, 0);
           if($List != '') {
@@ -93 +95 @@
         }
       }
-      $this->Database->query('UPDATE `NetworkInterface` SET `OnlineNotify` = `Online` '.
-        'WHERE `OnlineNotify` != `Online`');
       $this->Database->update('NotifyUser', '`Id`='.$User['Id'], array('LastTime' => TimeToMysqlDateTime($Time)));