Changeset 575

Timestamp:

Oct 2, 2013, 8:26:20 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Nastavení online stavu rozhraní a zařízení na nedostupné pokud čas LastOnline je starší než perioda. Pokud se neprováděla aktualizace, tak zařízení se tvářila falešně jako online.

Location:

trunk

Files:

• Common/Update.php (modified) (2 diffs)
• Common/Version.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (2 diffs)

trunk/Common/Update.php

@@ -250 +250 @@
       if($Def['Type'] == 'Password') $Output .= '<input type="password" name="'.$Def['Name'].'"/>';
       if($Def['Type'] == 'Integer') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
+      if($Def['Type'] == 'Float') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
       if($Def['Type'] == 'Boolean') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
     }
@@ -270 +271 @@
         $Value = $_POST[$Def['Name']];
       if($Def['Type'] == 'Integer') if(array_key_exists($Def['Name'], $_POST))
+        $Value = $_POST[$Def['Name']];
+      if($Def['Type'] == 'Float') if(array_key_exists($Def['Name'], $_POST))
         $Value = $_POST[$Def['Name']];
       if($Def['Type'] == 'Boolean') if(array_key_exists($Def['Name'], $_POST))

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 574; // Subversion revision
+$Revision = 575; // Subversion revision
 $DatabaseRevision = 574; // SQL structure revision
-$ReleaseTime = '2013-09-29';
+$ReleaseTime = '2013-10-02';

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -12 +12 @@
   $StartTime = time();
 
+  // 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');
-  //echo($DbResult3->num_rows);
   while($Subnet = $DbResult3->fetch_assoc())
   {
@@ -24 +24 @@
     foreach($List as $Properties)
     {
-      //echo($Properties['host'].', ');
       if($Properties['status'] == 'up')
       {
-        $Online = 1;
-        $Values = array('Online' => $Online, 'LastOnline' => 'NOW()');
-        //echo($Properties['host']." up\n");
-      } else 
-      {
-        $Online = 0;
-        $Values = array('Online' => $Online);
-        //echo($Properties['host']." down\n");
-      }
-
-      $DbResult = $System->Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"', $Values);
+        $DbResult = $System->Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"', 
+          array('Online' => $Online, 'LastOnline' => TimeToMysqlDateTime($StartTime)));
+      } 
     }
-  }
+  } 
+  $DbResult = $System->Database->update('NetworkInterface', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));
 
   // Update device online state
-  $DbResult = $System->Database->select('NetworkDevice', 'Id', '`Used`=1');
+  $DbResult = $System->Database->select('NetworkInterface', '`Device`, SUM(`Online`) AS `SumOnline`', '`Online` = 1 GROUP BY `Device`');
   while($Device = $DbResult->fetch_assoc())
   {
-    $DbResult2 = $System->Database->select('NetworkInterface', 'SUM(`Online`) AS `SumOnline`', '`Device`='.$Device['Id']);
-    $DbRow = $DbResult2->fetch_array();
-    if($DbRow['SumOnline'] > 0) $Online = 1; 
-      else $Online = 0;  
-    $Values = array('Online' => $Online);
-    if($Online == 1) $Values['LastOnline'] = 'NOW()';
-    $System->Database->update('NetworkDevice', 'Id='.$Device['Id'], $Values);
+    if($Device['SumOnline'] > 0)
+      $System->Database->update('NetworkDevice', 'Id='.$Device['Device'], array('LastOnline' => TimeToMysqlDateTime($StartTime)));
   }
+  $DbResult = $System->Database->update('NetworkDevice', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));
 
   // Update interface online statistics