Changeset 222 for trunk/is/topologie-img2.php

Timestamp:

May 31, 2009, 8:48:51 PM (16 years ago)

Author:

hajdam

Message:

Úprava zobrazení topologie

File:

• trunk/is/topologie-img2.php (modified) (2 diffs)

trunk/is/topologie-img2.php

@@ -36 +36 @@
 }
 
-$DbResult = $Database->query("SELECT * FROM hosts, hosts_topology WHERE host = id AND used=1");
+//$DbResult = $Database->query("SELECT * FROM hosts, hosts_topology WHERE host = id AND used=1");
+$DbResult = $Database->query("SELECT tpl.*, tpl.host AS id, dev.name AS name, dev.online AS online, dtp.iconname AS iconname, dtp.showonline AS showonline
+  FROM hosts_topology tpl LEFT JOIN NetworkDevice dev ON dev.id = tpl.host LEFT JOIN NetworkDeviceType dtp ON dev.type = dtp.id");
 while($item = $DbResult->fetch_array()) 
 {
@@ -52 +54 @@
       imageline($im, xpos() + $halfx, ($vtop + 1) * $spacey - 10, xpos() + $halfx, ($vtop + 1) * $spacey, $black);
     }
-    $ip = explode('.',$item['IP']);
-    if(!array_key_exists(3, $ip)) $ip[3] = '';
-    if($ip[3] < 100) 
-    { 
-      $image = $im_comp; 
+//    $ip = explode('.',$item['IP']);
+//    if(!array_key_exists(3, $ip)) $ip[3] = '';
+    if ($item['iconname']=='comp')
+    {
+      if($item['online'] == 1) { $color = $green; } else $color = $black;
+      $image = $im_comp;
     } else $image = $im_dev;  
-    if(($ip[0] != 192) and ($ip[0] != 168)) 
-    { 
+    if ($item['iconname']=='device')
+    {
+      if($item['online'] == 1) { $color = $green; } else $color = $red;
       $image = $im_dev;
     }
-    if($item['IP'] == '') 
-    { 
+    if($item['showonline']==0)
+    {
       $color = $gray;
       $image = $im_dev;
-    } else 
-    {
-      if((($ip[0] != 192) and ($ip[0] != 168)) or ($ip[3] >= 100) or ($ip[3] == 1)) 
-      {
-        if($item['online'] == 1) { $color = $green; } else $color = $red;
-      } else 
-      {
-        if($item['online'] == 1) { $color = $green; } else $color = $black;
-      }
     }
 //      $text='IP: '.$ip[0];