Changeset 192 for trunk/index.php

Timestamp:

Apr 26, 2009, 11:30:31 PM (16 years ago)

Author:

george

Message:

• Přidáno: Tabulka HostType definující účel zařízení v síti.
• Opraveno: Zobrazování online stavu počítačů v topologii s adresou IP vyšší než 100.

File:

• trunk/index.php (modified) (3 diffs)

trunk/index.php

@@ -104 +104 @@
     $Output2 = '';
 
-    $DbResult = $this->Database->select('hosts', 'COUNT(*)', 'show_online=1');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM hosts LEFT JOIN HostType ON HostType.Id = hosts.type WHERE HostType.ShowOnline = 1');
     $DbRow = $DbResult->fetch_array();
     $TotalComputers = $DbRow[0];
 
-    $DbResult = $this->Database->select('hosts', 'COUNT(*)', 'show_online=1 AND online=1');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM hosts LEFT JOIN HostType ON HostType.Id = hosts.type WHERE (HostType.ShowOnline = 1) AND (hosts.online = 1)');
     $DbRow = $DbResult->fetch_array();
     $OnlineComputers = $DbRow[0];
@@ -118 +118 @@
     $TotalUser = $DbRow[0];
 
-    $DbResult = $this->Database->select('hosts', 'COUNT(DISTINCT(user))', 'show_online=1 AND online=1');
+    $DbResult = $this->Database->query('SELECT COUNT(DISTINCT(user)) FROM hosts LEFT JOIN HostType ON HostType.Id = hosts.type WHERE HostType.ShowOnline = 1 AND hosts.online = 1');
     $DbRow = $DbResult->fetch_array();
     $OnlineUser = $DbRow[0];
@@ -173 +173 @@
   function OnlineHostList()
   {
-    global $Database;
-
     $Output = '<div class="PanelTitle">Online počítače</div><span style="font-size: smaller;">';
-    $DbResult = $Database->select('hosts', '*', 'online=1 AND show_online=1 ORDER BY name');
+    $DbResult = $this->Database->query('SELECT hosts.name FROM hosts LEFT JOIN HostType ON HostType.Id = hosts.type WHERE (HostType.ShowOnline = 1) AND (hosts.online = 1) ORDER BY hosts.name');
     while($Row = $DbResult->fetch_array())
     {