Changeset 663

Timestamp:

Jun 3, 2014, 10:36:43 PM (10 years ago)

Author:

chronos

Message:

• Fixed: NetworkImport was not recorded online to offline changes correctly.

Location:

trunk

Files:

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

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 662; // Subversion revision
+$Revision = 663; // Subversion revision
 $DatabaseRevision = 662; // SQL structure revision
-$ReleaseTime = strtotime('2014-05-31');
+$ReleaseTime = strtotime('2014-06-03');

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -30 +30 @@
         else $Online = 0;
 
-      $DbResult = $System->Database->select('NetworkInterface', '`Id`,`Online`', '`LocalIP` = "'.$Properties['host'].'";');
-      while($DbRow = $DbResult->fetch_assoc())
-      {
-        $LastOnline = $DbRow['Online'];
-        $Interface = $DbRow['Id'];
-
-        // Record state changes
-        if($Online != $LastOnline)
-        {
-          $System->Database->insert('NetworkInterfaceUpDown', array(
-                  'Interface' => $Interface, 'State' => $Online, 'Time' => TimeToMysqlDateTime($StartTime)));
-        }
-      }
-
       if($Online)
       {
+        // Set only online state
+        $DbResult = $System->Database->select('NetworkInterface', '`Id`, `Online`', '`LocalIP` = "'.$Properties['host'].'";');
+        while($DbRow = $DbResult->fetch_assoc())
+        {
+          $LastOnline = $DbRow['Online'];
+          $Interface = $DbRow['Id'];
+
+          // Record state changes
+          if($Online != $LastOnline)
+          {
+            $System->Database->insert('NetworkInterfaceUpDown', array(
+              'Interface' => $Interface, 'State' => $Online, 'Time' => TimeToMysqlDateTime($StartTime)));
+          }
+        }
+
         $DbResult = $System->Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"',
           array('Online' => 1, 'LastOnline' => TimeToMysqlDateTime($StartTime)));
       }
     }
+  }
+
+  // Set offline state for not updated interfaces
+  $DbResult = $System->Database->select('NetworkInterface', 'Id', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"');
+  while($DbRow = $DbResult->fetch_assoc())
+  {
+    $System->Database->insert('NetworkInterfaceUpDown', array(
+      'Interface' => $DbRow['Id'], 'State' => 0, 'Time' => TimeToMysqlDateTime($StartTime)));
   }
   $DbResult = $System->Database->update('NetworkInterface', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));