Changeset 658 for trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

Timestamp:

May 26, 2014, 1:00:20 AM (11 years ago)

Author:

chronos

Message:

• Přidáno: V tabulce změn stavu síťových rozhraní zobrazovat také dobu trvání.
• Opraveno: Neprováděly se skripty využívající třídu Routerboard.
• Opraveno: Načítání stavu rozhraní z RouterOS.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (3 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -14 +14 @@
   $StartTime = time();
 
-  // Load netwatch status from all DHCP routers 
+  // Load netwatch status from all DHCP routers
   $DbResult3 = $System->Database->query('SELECT `DHCP`, `AddressRange`, `Mask` FROM `NetworkSubnet` '.
                 'WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
@@ -29 +29 @@
       if($Properties['status'] == 'up') $Online = 1;
         else $Online = 0;
-        
-      $DbResult = $System->Database->select('NetworkInterface', 'Online', '`LocalIP` = "'.$Properties['host'].'";');
+
+      $DbResult = $System->Database->select('NetworkInterface', '`Id`,`Online`', '`LocalIP` = "'.$Properties['host'].'";');
       while($DbRow = $DbResult->fetch_assoc())
       {
         $LastOnline = $DbRow['Online'];
-        $Interface = $DbRow['NetworkInterface']; 
-        
+        $Interface = $DbRow['Id'];
+
         // Record state changes
         if($Online != $LastOnline)
-        {      
+        {
           $System->Database->insert('NetworkInterfaceUpDown', array(
                   'Interface' => $Interface, 'State' => $Online, 'Time' => TimeToMysqlDateTime($StartTime)));
         }
-      };
-        
+      }
+
       if($Online)
       {
-        $DbResult = $System->Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"', 
+        $DbResult = $System->Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"',
           array('Online' => 1, 'LastOnline' => TimeToMysqlDateTime($StartTime)));
-      } 
+      }
     }
-  } 
+  }
   $DbResult = $System->Database->update('NetworkInterface', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));
 
@@ -67 +67 @@
   {
     $DbResult2 = $System->Database->select('NetworkInterfaceStat', '*', '(`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
-    if($DbResult2->num_rows == 0) $System->Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`, `PingCount`) VALUES ("'.$Interface['Id'].'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"), 1)');          
+    if($DbResult2->num_rows == 0) $System->Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`, `PingCount`) VALUES ("'.$Interface['Id'].'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"), 1)');
       else $System->Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
   }