Changeset 762

Timestamp:

Nov 5, 2015, 9:38:59 AM (9 years ago)

Author:

chronos

Message:

• Modified: Notification of network interface state now show separate state table for "Now online", "Now offline", "Still offline".

Location:

trunk

Files:

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

trunk/Application/Version.php

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

trunk/Common/Setup/Updates.php

@@ -1592 +1592 @@
 }
 */
+
+function UpdateTo762($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NetworkDevice` ADD `OnlineNotify` INT NOT NULL AFTER `API`;');
+}
+
+
 
 class Updates
@@ -1668 +1675 @@
       752 => array('Revision' => 755, 'Function' => 'UpdateTo755'),
       755 => array('Revision' => 759, 'Function' => 'UpdateTo759'),
+      759 => array('Revision' => 762, 'Function' => 'UpdateTo762'),
     ));
   }

trunk/Modules/Notify/Notify.php

@@ -35 +35 @@
   }
 
+  function OnlineList($Title, $OnlineNow, $OnlinePrevious)
+  {
+    $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` '.
+      'LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
+      'WHERE (`NetworkDevice`.`Online` = '.$OnlineNow.') AND (`NetworkDevice`.`OnlineNotify` = '.$OnlinePrevious.') '.
+      'AND (`NetworkDevice`.`PermanentOnline`=1) ORDER BY `Name` DESC');
+    if($DbResult3->num_rows > 0) {
+      $Output .= $Title.'<br/>';
+      $Output .= '<table border="1" cellspacing="0" cellpadding="5">'.
+      '<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']);
+        $DurationText = sprintf('%02d', floor($Duration / 3600 % 24)).':'.
+            sprintf('%02d', floor($Duration / 60 % 60)).':'.
+            sprintf('%02d', floor($Duration % 60));
+        $Days = floor($Duration / (60 * 60 * 24));
+        if($Days > 0) $DurationText = $Days.' dnů '.$DurationText;
+
+        $Output .= '<tr><td>'.$Item['Name'].'</td><td>'.$OnlineText[$Item['Online']].
+        '</td><td>'.$Item['LastOnline'].'</td><td>'.$DurationText.'</td></tr>'."\n";
+      }
+      $Output .= '</table><br/>'."\n";
+    }
+    return $Output;
+  }
+
   function Check()
   {
-    $OnlineText = array('<span style="color:red;">Nedostupný</span>', '<span style="color:green;">Dostupný</span>');
+          echo('ss');
     $Output = '';
     $DbResult = $this->Database->query('SELECT `NotifyUser`.`Id`, `NotifyUser`.`LastTime`, `User`.`Name`, `Contact`.`Value`, `Contact`.`Category` FROM `NotifyUser` '.
@@ -51 +81 @@
       {
         if($Category['SysName'] == 'NetworkReachability') {
-          $DbResult3 = $this->Database->query('SELECT CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) AS `Name`, '.
-            '`NetworkInterfaceUpDown`.`State`, `NetworkInterfaceUpDown`.`Duration`, `NetworkInterfaceUpDown`.`Time` FROM `NetworkInterfaceUpDown` '.
-            'LEFT JOIN `NetworkInterface` ON `NetworkInterface`.`Id` = `NetworkInterfaceUpDown`.`Interface` '.
-            'LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
-            'WHERE (`Time` > "'.$User['LastTime'].'") AND (`Time` <= "'.TimeToMysqlDateTime($Time).'") '.
-            'AND (`NetworkDevice`.`PermanentOnline`=1) ORDER BY `NetworkInterfaceUpDown`.`Time` DESC');
-          if($DbResult3->num_rows > 0) {
+          $List = $this->OnlineList('Nově online', 1, 0);
+          $List .= $this->OnlineList('Nově offline', 0, 1);
+          $List .= $this->OnlineList('Stále offline', 0, 0);
+          if($List != '') {
             $Output .= 'Category '.$Category['Name'].":\n";
             $Content .= 'Category '.$Category['Name']."<br>\n";
-            $Content .= '<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 = sprintf('%02d', floor($Item['Duration'] / 3600 % 24)).':'.
-                sprintf('%02d', floor($Item['Duration'] / 60 % 60)).':'.
-                sprintf('%02d', floor($Item['Duration'] % 60));
-              $Days = floor($Item['Duration'] / (60 * 60 * 24));
-              if($Days > 0) $Duration = $Days.' dnů '.$Duration;
-
-              $Content .= '<tr><td>'.$Item['Name'].'</td><td>'.$OnlineText[$Item['State']].
-                '</td><td>'.$Item['Time'].'</td><td>'.$Duration.'</td></tr>'."\n";
-            }
-            $Content .= '</table>'."\n";
+            $Content .= $List;
           }
         }
       }
+      $this->Database->query('UPDATE `NetworkDevice` SET `OnlineNotify` = `Online` '.
+        'WHERE `OnlineNotify` != `Online`');
       $this->Database->update('NotifyUser', '`Id`='.$User['Id'], array('LastTime' => TimeToMysqlDateTime($Time)));