Changeset 813

Timestamp:

Mar 9, 2016, 9:16:11 PM (9 years ago)

Author:

chronos

Message:

• Modified: Network interface state notification made registrated as callback instead of fixed method in Notify class.

Location:

trunk

Files:

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

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 810; // Subversion revision
+$Revision = 813; // Subversion revision
 $DatabaseRevision = 808; // SQL structure revision
-$ReleaseTime = strtotime('2016-03-06');
+$ReleaseTime = strtotime('2016-03-09');

trunk/Modules/Network/Network.php

@@ -107 +107 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Networking related tools';
-    $this->Dependencies = array();
+    $this->Dependencies = array('Notify');
   }
 
@@ -120 +120 @@
   function DoStart()
   {
+    $this->System->ModuleManager->Modules['Notify']->RegisterCheck('NetworkReachability', array($this, 'ReachabilityCheck'));
+    
     $this->System->RegisterPage('network', 'PageNetwork');
     $this->System->RegisterPage(array('network', 'administration'), 'PageNetworkAdministration');
@@ -593 +595 @@
   {
   }
+  
+  function OnlineList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
+  {
+    $Time = time();
+    $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` '.
+      $Condition.' AND (`NetworkDevice`.`PermanentOnline`=1) AND (`NetworkDevice`.`Used`=1) AND '.
+      '(`NetworkInterface`.`LocalIP` != "") '.
+      'ORDER BY `Name` ASC');
+    if($DbResult3->num_rows > 0) 
+    {
+      $Output .= $Title.'<br/>';
+      $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 = $Time - 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";
+    }
+    $this->Database->query('UPDATE `NetworkInterface` SET `OnlineNotify` = `Online` '.
+      $Condition);
+    return $Output;
+  }
+
+  function ReachabilityCheck()
+  {
+    $Output = '';
+    $Output = $this->OnlineList('Nově online', 1, 0, 0);
+    $Output .= $this->OnlineList('Nově offline', 0, 1, 5 * 60);
+    if($Output != '') $Output .= $this->OnlineList('Stále offline', 0, 0, 0);
+    return($Output);
+  }
+  
+  function CheckPortStatus($Ip, $Port)
+  {
+    $Timeout = 1;
+    if($Socket = @fsockopen($Ip, $Port, $ErrorNumber, $ErrorString, $Timeout))
+    {
+      fclose($Socket);
+      return(1);
+    } else
+    {
+      return(0);
+    }
+  }
 }

trunk/Modules/Notify/Notify.php

@@ -1 +1 @@
 <?php
+
+define('CONTACT_CATEGORY_EMAIL', 4);
 
 class ModuleNotify extends AppModule
 {
+  var $Checks;
+  
   function __construct($System)
   {
@@ -11 +15 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Send notification messages to selected users';
-    $this->Dependencies = array('User', 'Subject');
+    $this->Dependencies = array('User');
+    $this->Checks = array();
   }
 
@@ -34 +39 @@
     ));
   }
-
-  function OnlineList($Title, $OnlineNow, $OnlinePrevious, $MinDuration)
+  
+  function RegisterCheck($Name, $Callback)
   {
-    $Time = time();
-    $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` '.
-      $Condition.' AND (`NetworkDevice`.`PermanentOnline`=1) AND (`NetworkDevice`.`Used`=1) AND '.
-      '(`NetworkInterface`.`LocalIP` != "") '.
-      'ORDER BY `Name` ASC');
-    if($DbResult3->num_rows > 0) {
-      $Output .= $Title.'<br/>';
-      $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 = $Time - 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";
-    }
-    $this->Database->query('UPDATE `NetworkInterface` SET `OnlineNotify` = `Online` '.
-      $Condition);
-    return $Output;
+    if(array_key_exists($Name, $this->Checks)) 
+      throw new Exception('Check function "'.$Name.'" already registered.');
+    $this->Checks[$Name] = array('Callback' => $Callback);
+  }
+  
+  function UnregisterCheck($Name)
+  {
+    if(!array_key_exists($Name, $this->Checks)) 
+      throw new Exception('Check function "'.$Name.'" not registered.');
+    unset($this->Checks[$Name]);
   }
 
@@ -74 +57 @@
   {
     $Output = '';
+    $Content = '';
+
+    // Get output from checks
+    $DbResult2 = $this->Database->query('SELECT `Id`, `Name`, `SysName` FROM `NotifyCategory`');
+    while($Category = $DbResult2->fetch_assoc())
+    {
+      if(array_key_exists($Category['SysName'], $this->Checks))
+      {
+        $List = call_user_func($this->Checks[$Category['SysName']]['Callback']);
+        if($List != '') {
+          $Output .= 'Kategorie: '.$Category['Name'].":\n";
+          $Content .= 'Kategorie: '.$Category['Name']."<br>\n";
+          $Content .= $List;
+        }
+      }
+    }
+    
+    // Send content to users
     $DbResult = $this->Database->query('SELECT `NotifyUser`.`Id`, `NotifyUser`.`LastTime`, `User`.`Name`, `Contact`.`Value`, `Contact`.`Category` FROM `NotifyUser` '.
       'LEFT JOIN `User` ON `User`.`Id` = `NotifyUser`.`User` '.
@@ -80 +81 @@
     {
       $Time = time();
-      $Content = '';
       $Output .= 'User '.$User['Name'].'<br/>';
-      $DbResult2 = $this->Database->query('SELECT `Id`, `Name`, `SysName` FROM `NotifyCategory`');
-      while($Category = $DbResult2->fetch_assoc())
-      {
-        if($Category['SysName'] == 'NetworkReachability') {
-          $List = $this->OnlineList('Nově online', 1, 0, 0);
-          $List .= $this->OnlineList('Nově offline', 0, 1, 5 * 60);
-          if($List != '') $List .= $this->OnlineList('Stále offline', 0, 0, 0);
-          if($List != '') {
-            $Output .= 'Kategorie: '.$Category['Name'].":\n";
-            $Content .= 'Kategorie: '.$Category['Name']."<br>\n";
-            $Content .= $List;
-          }
-        }
-      }
+      
       $this->Database->update('NotifyUser', '`Id`='.$User['Id'], array('LastTime' => TimeToMysqlDateTime($Time)));
 
-      if(($User['Category'] == 4) and ($Content !='')) {
+      if(($User['Category'] == CONTACT_CATEGORY_EMAIL) and ($Content !='')) {
         $Mail = new Mail();
         $Mail->Subject = 'Notification';
         $Mail->AddTo($User['Value'], $User['Name']);
-        $Mail->AddBody(strip_tags($Content), 'text/plain');
+        //$Mail->AddBody(strip_tags($Content), 'text/plain');
         $Mail->AddBody('<style>
 table { border-collapse: collapse; }
@@ -110 +97 @@
         $Mail->Send();
         $Output .= 'Sent email to '.$User['Value'].' ('.$User['Name'].')<br/>';
-        $Output .= $Content;
+        $Output .= strip_tags(str_replace("</", " </", str_replace('<br/>', "\n", $Content)));
       }
 
@@ -147 +134 @@
 ADD CONSTRAINT `NotifyUser_ibfk_1` FOREIGN KEY (`User`) REFERENCES `User` (`Id`),
 ADD CONSTRAINT `NotifyUser_ibfk_2` FOREIGN KEY (`Contact`) REFERENCES `Contact` (`Id`);');
-
   }