Changeset 867

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.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (7 diffs)
• Modules/Notify/Notify.php (modified) (6 diffs)

trunk/Application/UpdateTrace.php

@@ -2063 +2063 @@
   $Manager->Execute('ALTER TABLE `NetworkInterfaceUpDown` ADD INDEX ( `Previous` )');
   $Manager->Execute('UPDATE `NetworkInterfaceUpDown` AS T1, `NetworkInterfaceUpDown` AS T2 SET T1.Previous = T2.Id WHERE (T1.Previous IS NULL) AND (T2.Interface=T1.Interface) AND (T1.Time = DATE_ADD(T2.Time, INTERVAL T2.Duration SECOND))');
+}
+
+function UpdateTo867($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NotifyLog` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `Time` datetime NOT NULL,
+    `Title` varchar(255) NOT NULL DEFAULT "",
+    `Content` mediumtext NOT NULL DEFAULT "",
+    PRIMARY KEY (`Id`),
+    KEY `Time` (`Time`)
+  ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+
 }
 
@@ -2162 +2175 @@
       844 => array('Revision' => 855, 'Function' => 'UpdateTo855'),
       855 => array('Revision' => 862, 'Function' => 'UpdateTo862'),
+      862 => array('Revision' => 867, 'Function' => 'UpdateTo867'),
     ));
   }

trunk/Application/Version.php

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

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'));
   }
 }

trunk/Modules/Notify/Notify.php

@@ -15 +15 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Send notification messages to selected users';
-    $this->Dependencies = array('User');
+    $this->Dependencies = array('User', 'RSS');
     $this->Checks = array();
   }
@@ -39 +39 @@
     ));
     $this->System->RegisterCommandLine('notify', array($this, 'RunCheck'));
+    $this->System->ModuleManager->Modules['RSS']->RegisterRSS(array('Title' => 'Notify log',
+    'Channel' => 'notifylog', 'Callback' => array('ModuleNotify', 'ShowLogRSS'),
+    'Permission' => array('Module' => 'Notify', 'Operation' => 'RSS')));
   }
 
@@ -59 +62 @@
     $Output = '';
     $Content = '';
+    $Title = '';
 
     // Get output from checks
     $DbResult2 = $this->Database->query('SELECT `Id`, `Name`, `SysName` FROM `NotifyCategory`');
-    while($Category = $DbResult2->fetch_assoc())
+    while ($Category = $DbResult2->fetch_assoc())
     {
-      if(array_key_exists($Category['SysName'], $this->Checks))
+      if (array_key_exists($Category['SysName'], $this->Checks))
       {
-        $List = call_user_func($this->Checks[$Category['SysName']]['Callback']);
-        if($List != '') {
+        $Status = call_user_func($this->Checks[$Category['SysName']]['Callback']);
+        if ($Status['Report'] != '')
+        {
           $Output .= 'Kategorie: '.$Category['Name'].":\n";
           $Content .= 'Kategorie: '.$Category['Name']."<br>\n";
-          $Content .= $List;
+          $Content .= $Status['Report'];
         }
+        if (strlen($Title) > 0) $Title .= ', ';
+        $Title .= $Status['ShortTitle'].':'.$Status['Count'];
       }
     }
+
+    $Time = time();
 
     // Send content to users
@@ -81 +90 @@
     while($User = $DbResult->fetch_assoc())
     {
-      $Time = time();
       $Output .= 'User '.$User['Name'].'<br/>';
 
       $this->Database->update('NotifyUser', '`Id`='.$User['Id'], array('LastTime' => TimeToMysqlDateTime($Time)));
 
-      if(($User['Category'] == CONTACT_CATEGORY_EMAIL) and ($Content !='')) {
+      if(($User['Category'] == CONTACT_CATEGORY_EMAIL) and ($Content != ''))
+      {
         $Mail = new Mail();
         $Mail->Subject = 'Notification';
@@ -102 +111 @@
 
       return($Output);
+    }
+
+    if ($Content != '')
+    {
+      $this->Database->insert('NotifyLog', array(
+        'Time' => TimeToMysqlDateTime($Time),
+        'Title' => $Title,
+        'Content' => $Content)
+      );
     }
   }
@@ -147 +165 @@
     $this->Database->query('DROP TABLE `NotifyCategory`');
   }
+
+  function ShowLogRSS()
+  {
+    $this->ClearPage = true;
+    $this->FormatHTML = false;
+    Header('Content-Type: text/xml');
+    $Count = 100;
+
+    $Output = '';
+    $Items = array();
+    $sql = 'SELECT Title,Content, UNIX_TIMESTAMP(`Time`) AS `Time` FROM `NotifyLog`'.
+      ' ORDER BY `Time` DESC LIMIT '.$Count;
+    $DbResult = $this->System->Database->query($sql);
+    while($Line = $DbResult->fetch_assoc())
+    {
+      $Items[] = array
+      (
+        'Title' => $Line['Title'],
+        'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/Notify.php'),
+        'Description' => $Line['Content'],
+        'Time' => $Line['Time'],
+      );
+    }
+
+    $RSS = new RSS();
+    $RSS->Title = $this->System->Config['Web']['Title'].' - Záznamy upozornění';
+    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/';
+    $RSS->Description = 'Záznam upozornění '.$this->System->Config['Web']['Description'];
+    $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];
+    $RSS->Items = $Items;
+    return($RSS->Generate());
+  }
 }