Changeset 214 for trunk

Timestamp:

May 11, 2009, 9:28:16 PM (16 years ago)

Author:

george

Message:

• Opraveno: Nezobrazovat nepoužité počítač v seznamu uživatelů.
• Opraveno: Aktualizovat online stav zařízení dle stavu rozhraní.
• Opraveno: Nepoužívané zařízení nezařazovat do systému omezování rychlosti.

Location:

trunk

Files:

• system/generators/traffic_shaping_routerboard.php (modified) (2 diffs)
• system/netwatch_import.php (modified) (3 diffs)
• userlist.php (modified) (1 diff)

trunk/system/generators/traffic_shaping_routerboard.php

@@ -75 +75 @@
   $Commands[] = ' /queue tree add name='.$Member['Name'].'-in limit-at='.$SpeedOut.' max-limit='.$UserMaxSpeedOut.' parent=main-in queue=wireless-default';
 
-  $DbResult2 = $Database->select('NetworkDevice', 'COUNT(*)', 'Member='.$Member['Id']);
+  $DbResult2 = $Database->select('NetworkDevice', 'COUNT(*)', 'Used = 1 AND Member='.$Member['Id']);
   $Row = $DbResult2->fetch_row();
   $HostCount = $Row[0];
@@ -88 +88 @@
   }
 
-  $DbResult2 = $Database->select('NetworkDevice', '*', 'Member = '.$Member['Id']);
+  $DbResult2 = $Database->select('NetworkDevice', '*', 'Used = 1 AND Member = '.$Member['Id']);
   while($Device = $DbResult2->fetch_assoc())
   {

trunk/system/netwatch_import.php

@@ -34 +34 @@
     {
       $Online = 1;
-      $Values = array('Online' => $Online,  'LastOnline' => 'NOW()');
+      $Values = array('Online' => $Online, 'LastOnline' => 'NOW()');
     } else 
     {
@@ -45 +45 @@
     {
       $DbResult = $Database->select('NetworkInterface', 'Id', 'LocalIP = "'.$Properties['host'].'"');
-      $DbRow = $DbResult->fetch_array();
+      $DbRow = $DbResult->fetch_assoc();
       $HostId = $DbRow['Id'];
       $DbResult2 = $Database->select('stat_hosts', '*', '(host_id="'.$HostId.'") AND (time = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
@@ -54 +54 @@
 }
 
+// Update device online state
+$DbResult = $Database->select('NetworkDevice', 'Id', 'Used=1');
+while($Device = $DbResult->fetch_assoc())
+{
+  $DbResult2 = $Database->select('NetworkInterface', 'SUM(Online)', 'Device='.$Device['Id']);
+  $DbRow = $DbResult2->fetch_array();
+  if($DbRow['SUM(Online)'] > 0) $Online = 1; else $Online = 0;  
+  $Database->update('NetworkDevice', 'Id='.$Device['Id'], array('Online' => $Online));
+}
+
 ?>

trunk/userlist.php

@@ -17 +17 @@
       if($User['PhoneNumber'] > 0) $Phone = $User['PhoneNumber']; else $Phone = ' ';
 
-      $DbResult2 = $this->Database->query('SELECT Name, Id FROM NetworkDevice WHERE Member = (SELECT Id FROM Member WHERE Member.ResponsibleUser = '.$User['Id'].') ORDER BY Name');
+      $DbResult2 = $this->Database->query('SELECT Name, Id FROM NetworkDevice WHERE Member = (SELECT Id FROM Member WHERE Member.ResponsibleUser = '.$User['Id'].') AND Used=1 ORDER BY Name');
       $Devices = array();
       while($Device = $DbResult2->fetch_assoc())