Changeset 818 for trunk/Modules/NetworkConfigRouterOS

Timestamp:

Mar 16, 2016, 10:01:02 PM (9 years ago)

Author:

chronos

Message:

• Added: UpDown history for network ports.

Location:

trunk/Modules/NetworkConfigRouterOS

Files:

• Generators/NetwatchImport.php (modified) (1 diff)
• NetworkConfigRouterOS.php (modified) (1 diff)

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -49 +49 @@
               array('LastOnline' => TimeToMysqlDateTime($StartTime)));
 
-          if($Interface['Online'] != $Interface['NewOnline'])
-          {
-            // Online state changed
-            $DbResult = $this->Database->query('INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
-        `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
-                TimeToMysqlDateTime($StartTime).'", NULL)');
-            // Update previous record duration in UpDown table
-            $this->Database->query('UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
-                '`TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`) '.
-                'AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` ASC LIMIT 1)) '.
-                'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Interface` ='.$Interface['Id'].')');
-            $this->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
-                array('Online' => $Interface['NewOnline']));
-          }
+        if($Interface['Online'] != $Interface['NewOnline'])
+        {
+          // Online state changed
+          $DbResult = $this->Database->query('INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
+           `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
+            TimeToMysqlDateTime($StartTime).'", NULL)');
+          // Update previous record duration in UpDown table
+          $this->Database->query('UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
+            '`TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`) '.
+            'AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` ASC LIMIT 1)) '.
+            'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Interface` ='.$Interface['Id'].')');
+          $this->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
+            array('Online' => $Interface['NewOnline']));
+        }
       }
 

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -40 +40 @@
   {
     $this->System->Pages['zdarma'] = 'PageFreeAccess';
-    $this->System->FormManager->RegisterClass('NetworkInterfaceUpDown', array(
-      'Title' => 'Změny stavu rozhraní',
-      'Table' => 'NetworkInterfaceUpDown',
-      'DefaultSortColumn' => 'Time',
-      'DefaultSortOrder' => 1,
-      'Items' => array(
-        'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => '', 'ReadOnly' => true),
-        'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => '', 'ReadOnly' => true),
-        'State' => array('Type' => 'TOnlineState', 'Caption' => 'Stav', 'Default' => '', 'ReadOnly' => true),
-        'Duration' => array('Type' => 'TimeDiff', 'Caption' => 'Trvání', 'Default' => '', 'ReadOnly' => true),
-      ),
-    ));
-
     $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-dns', 'ConfigRouterOSDNS');
     $this->System->ModuleManager->Modules['NetworkConfig']->RegisterConfigItem('routeros-dhcp', 'ConfigRouterOSDHCP');