Changeset 192 for trunk/is/topologie-img.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/is/topologie-img.php (modified) (6 diffs)

trunk/is/topologie-img.php

@@ -112 +112 @@
       $count[$level]++;
   // --- Zjisti existenci potomků ----------------------------------------------
-      $DbResult = $Database->query("SELECT COUNT(*) FROM hosts WHERE used=1 AND parent = ".$curr);
+      $DbResult = $Database->query('SELECT COUNT(*) FROM hosts WHERE used=1 AND parent = '.$curr);
       $childcnt = $DbResult->fetch_array();
       if ($childcnt[0] > 0) 
@@ -164 +164 @@
 $data = gentree(1);
 $datawidth = $data['width'];
-for($i=0; $i <= $maxindex; $i++)
+for($i = 0; $i <= $maxindex; $i++)
 { 
   if(!array_key_exists($i, $vleft)) $vleft[$i] = 0;
@@ -175 +175 @@
 $halfx = $spacex / 2;
 $halfy = $spacey / 2;
-// === Načtení pomocných obrázků ===============================================
-$im_comp = imagecreatefrompng('images/comp.png');
-$im_dev = imagecreatefrompng('images/device.png');
+
+// Preload icon images
+$IconList = array();
+$DbResult = $Database->query('SELECT * FROM HostType');
+while($HostType = $DbResult->fetch_assoc()) 
+  $IconList[$HostType['Id']] = imagecreatefrompng('images/'.$HostType['IconName'].'.png');
+
 // === Generování obrázku ======================================================
-$im = imagecreate(($datawidth+$width+3.2) * $halfx, ($height + 1) * $spacey);
+$im = imagecreate(($datawidth + $width + 3.2) * $halfx, ($height + 1) * $spacey);
 $background_color = imagecolorallocate($im, 255, 255, 255);
 $black = imagecolorallocate($im, 0, 0, 0);
@@ -193 +197 @@
 }
 
-$DbResult = $Database->query("SELECT * FROM hosts WHERE used=1");
+$DbResult = $Database->query('SELECT * FROM hosts JOIN HostType ON HostType.Id = hosts.type WHERE hosts.used=1');
 while($item = $DbResult->fetch_array()) 
 {
@@ -207 +211 @@
       imageline($im, xpos($id) + $halfx, ($vtop[$id] + 1) * $spacey - 10, xpos($id) + $halfx, ($vtop[$id] + 1) * $spacey, $black);
     }
-    $ip = explode('.',$item['IP']);
-    if(!array_key_exists(3, $ip)) $ip[3] = '';
-    if($ip[3] < 100) 
-    { 
-      $image = $im_comp; 
-    } else $image = $im_dev;  
-    if(($ip[0] != 192) and ($ip[0] != 168)) 
-    { 
-      $image = $im_dev;
-    }
-    if($item['IP'] == '') 
-    { 
+    
+    $image = $IconList[$item['type']];
+    if($item['IP'] == '')
+    {
       $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;
-      }
+    } else
+    if($item['ShowOnline'] == 1)
+    {
+      if($item['online'] == 1) $color = $green; else $color = $black;
+    } else
+    {
+      if($item['online'] == 1) $color = $green; else $color = $red;
     }
 //      $text='IP: '.$ip[0];
 //      imagestring($im,2,xpos($id)+($spacex-strlen($text)*imagefontwidth(2))/2,$vtop[$id]*$spacey+24+imagefontheight(2),$text,$black);
-    imagecopy($im, $image, xpos($id)+$halfx-15,$vtop[$id]*$spacey+12, 0, 0, 30, 30);
+    imagecopy($im, $image, xpos($id) + $halfx - 15, $vtop[$id] * $spacey + 12, 0, 0, 30, 30);
 //    imagerectangle($im,xpos($id)+$halfx-6,$vtop[$id]*$spacey+16,xpos($id)+$halfx+6,$vtop[$id]*$spacey+28,$color);
-    if ($debug) {
+    if($debug) 
+    {
       imagestring($im, 2, xpos($id) + ($spacex - strlen($item['id']) * imagefontwidth(2)) / 2, $vtop[$id] * $spacey + 31 + imagefontheight(2), $item['id'], $color);
-    } else imagestring($im, 2, xpos($id) + ($spacex - strlen($item['name']) * imagefontwidth(2)) / 2, $vtop[$id] * $spacey + 31 + imagefontheight(2), strtoupper($item['name']), $color);
+    } else 
+      imagestring($im, 2, xpos($id) + ($spacex - strlen($item['name']) * imagefontwidth(2)) / 2, $vtop[$id] * $spacey + 31 + imagefontheight(2), strtoupper($item['name']), $color);
   }
 }
@@ -244 +239 @@
 if(!($debug > 1))
 {
-  header("Content-type: image/png");
-  header("Cache-Control: no-cache");    // Dynamický graf, nekešovat
+  header('Content-type: image/png');
+  header('Cache-Control: no-cache');
   imagepng($im);
   imagedestroy($im);
-  imagedestroy($im_comp);
-  imagedestroy($im_dev);
-}
+}
+
 ?>