Changeset 763

Timestamp:

Nov 5, 2015, 9:56:35 PM (9 years ago)

Author:

chronos

Message:

• Modified: Now network notify state is read from network interface rather then network device.
• Added: Filter to notify only about network online changes longer then 5 seconds.
• Modified: Show "still offline" list only if new online or offline is detected.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Notify/Notify.php (modified) (4 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 762; // Subversion revision
-$DatabaseRevision = 762; // SQL structure revision
+$Revision = 763; // Subversion revision
+$DatabaseRevision = 763; // SQL structure revision
 $ReleaseTime = strtotime('2015-11-05');

trunk/Common/Setup/Updates.php

@@ -1598 +1598 @@
 }
 
+function UpdateTo763($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NetworkInterface` ADD `OnlineNotify` INT NOT NULL AFTER `LastOnline`;');
+  $Manager->Execute('ALTER TABLE `NetworkDevice` DROP `OnlineNotify`;');
+}
 
 
@@ -1676 +1681 @@
       755 => array('Revision' => 759, 'Function' => 'UpdateTo759'),
       759 => array('Revision' => 762, 'Function' => 'UpdateTo762'),
+      762 => array('Revision' => 763, 'Function' => 'UpdateTo763'),
     ));
   }

trunk/Modules/Notify/Notify.php

@@ -37 +37 @@
   function OnlineList($Title, $OnlineNow, $OnlinePrevious)
   {
+    $Time = time();
+    $MinDuration = 5;
     $OnlineText = array('<span style="color:red;">Nedostupný</span>', '<span style="color:green;">Dostupný</span>');
     $Output = '';
     $DbResult3 = $this->Database->query('SELECT CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) AS `Name`, '.
-      '`NetworkDevice`.`Online`, `NetworkDevice`.`LastOnline` FROM `NetworkInterface` '.
+      '`NetworkInterface`.`Online`, `NetworkInterface`.`LastOnline` FROM `NetworkInterface` '.
       'LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
-      'WHERE (`NetworkDevice`.`Online` = '.$OnlineNow.') AND (`NetworkDevice`.`OnlineNotify` = '.$OnlinePrevious.') '.
-      'AND (`NetworkDevice`.`PermanentOnline`=1) ORDER BY `Name` DESC');
+      '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');
     if($DbResult3->num_rows > 0) {
       $Output .= $Title.'<br/>';
-      $Output .= '<table border="1" cellspacing="0" cellpadding="5">'.
+      $Output .= '<table>'.
       '<tr><th align="center">Jméno</th><th align="center">Stav</th><th align="center">Čas</th><th align="center">Trvání</th></tr>'."\n";
       while($Item = $DbResult3->fetch_assoc())
       {
-        $Duration = MysqlDateTimeToTime($Item['LastOnline']);
+        $Duration = $Time - MysqlDateTimeToTime($Item['LastOnline']);
         $DurationText = sprintf('%02d', floor($Duration / 3600 % 24)).':'.
-            sprintf('%02d', floor($Duration / 60 % 60)).':'.
-            sprintf('%02d', floor($Duration % 60));
+          sprintf('%02d', floor($Duration / 60 % 60)).':'.
+          sprintf('%02d', floor($Duration % 60));
         $Days = floor($Duration / (60 * 60 * 24));
         if($Days > 0) $DurationText = $Days.' dnů '.$DurationText;
@@ -67 +70 @@
   function Check()
   {
-          echo('ss');
     $Output = '';
     $DbResult = $this->Database->query('SELECT `NotifyUser`.`Id`, `NotifyUser`.`LastTime`, `User`.`Name`, `Contact`.`Value`, `Contact`.`Category` FROM `NotifyUser` '.
@@ -83 +85 @@
           $List = $this->OnlineList('Nově online', 1, 0);
           $List .= $this->OnlineList('Nově offline', 0, 1);
-          $List .= $this->OnlineList('Stále offline', 0, 0);
+          if($List != '') $List .= $this->OnlineList('Stále offline', 0, 0);
           if($List != '') {
-            $Output .= 'Category '.$Category['Name'].":\n";
-            $Content .= 'Category '.$Category['Name']."<br>\n";
+            $Output .= 'Kategorie: '.$Category['Name'].":\n";
+            $Content .= 'Kategorie: '.$Category['Name']."<br>\n";
             $Content .= $List;
           }
         }
       }
-      $this->Database->query('UPDATE `NetworkDevice` SET `OnlineNotify` = `Online` '.
+      $this->Database->query('UPDATE `NetworkInterface` SET `OnlineNotify` = `Online` '.
         'WHERE `OnlineNotify` != `Online`');
       $this->Database->update('NotifyUser', '`Id`='.$User['Id'], array('LastTime' => TimeToMysqlDateTime($Time)));
@@ -100 +102 @@
         $Mail->AddTo($User['Value'], $User['Name']);
         $Mail->AddBody(strip_tags($Content), 'text/plain');
-        $Mail->AddBody($Content, 'text/html');
+        $Mail->AddBody('<style>
+table { border-collapse: collapse; }
+table, th, td { border: 1px solid black; }
+td { padding: 5px; }
+        </style>'.$Content, 'text/html');
         $Mail->Send();
         $Output .= 'Sent email to '.$User['Value'].' ('.$User['Name'].')<br/>';