Changeset 192 for trunk

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.

Location:

trunk

Files:

• index.php (modified) (3 diffs)
• is/dostupnost.php (deleted)
• is/online_hosts.php (deleted)
• is/topologie-img.php (modified) (6 diffs)
• is/topologie.php (modified) (2 diffs)
• network/dostupnost.php (modified) (1 diff)
• sql/updates/192.sql (added)

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())
     {

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);
-}
+}
+
 ?>

trunk/is/topologie.php

@@ -1 +1 @@
 <?php
-include_once('../style.php');
+include_once('../global.php');
 
-ShowHeader('Grafické zobrazení topologie sítě','Topologie sítě');
-
-// Seznam segmentů a zařízení
-echo('<img src="topologie-img.php"><br/>
+class NetworkTopologyPage extends Page
+{
+  var $FullTitle = 'Grafické zobrazení topologie sítě';
+  var $ShortTitle = 'Topologie sítě';
+  
+  function Show()
+  {
+    $Output = '<img src="topologie-img.php"><br/>
 <p>Vysvětlivky: Obrázek znázorňuje připojení prvků sítě do internetu.<br/>
 <img src="images/comp.png"> Je počítač zapojený v síti a pod ním je uvedeno jeho jméno.
@@ -16 +20 @@
 z počítače Centrála, takže při výpadku zařízení nebude možné zjistit stav
 zařízení, které jsou přes něj připojeny. U zařízení, kde není stav možné
-zjišťovat je použita <span style="color:gray">šedá barvou</span>.</p>');
+zjišťovat je použita <span style="color:gray">šedá barvou</span>.</p>';
+    return($Output);
+  }
+}
 
-ShowFooter();
+$System->AddModule(new NetworkTopologyPage());
+$System->Modules['NetworkTopologyPage']->GetOutput();
+
 ?>

trunk/network/dostupnost.php

@@ -13 +13 @@
     $Output .= '<div align="center">';
 
+    $HostTypeList = array();
+    $DbResult = $this->Database->select('HostType', '*');
+    while($DbRow = $DbResult->fetch_assoc())
+      $HostTypeList[$DbRow['Id']] = $DbRow;
+   
     // Zařízení
     $Output .= '<br /><table class="WideTable" style="font-size: small;">';
     $Output .= '<tr><th>Jméno</th><th>Hodina [%]</th><th>Den [%]</th><th>Týden [%]</th><th>Měsíc [%]</th><th>Rok [%]</th></tr>';
-    $DbResult = $this->Database->query('SELECT hosts.name, PeriodHour.Percent as Hour, PeriodDay.Percent as Day, PeriodWeek.Percent as Week, PeriodMonth.Percent as Month, PeriodYear.Percent as Year FROM hosts LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 1 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 1 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodHour ON PeriodHour.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodDay ON PeriodDay.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 7 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 7 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodWeek ON PeriodWeek.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 30 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 30 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodMonth ON PeriodMonth.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 365 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 365 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodYear ON PeriodYear.host_id=hosts.id WHERE hosts.used=1 AND hosts.show_online=0 GROUP BY hosts.IP ORDER BY name');
-    echo($this->Database->error);
-    while($Row = $DbResult->fetch_array())
+    $DbResult = $this->Database->query('SELECT hosts.type, hosts.name, PeriodHour.Percent as Hour, PeriodDay.Percent as Day, PeriodWeek.Percent as Week, PeriodMonth.Percent as Month, PeriodYear.Percent as Year FROM hosts LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 1 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 1 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodHour ON PeriodHour.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodDay ON PeriodDay.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 7 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 7 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodWeek ON PeriodWeek.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 30 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 30 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodMonth ON PeriodMonth.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 365 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 365 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodYear ON PeriodYear.host_id=hosts.id WHERE hosts.used=1 GROUP BY hosts.IP ORDER BY name');
+    while($Row = $DbResult->fetch_assoc())
+    if(($Row['type'] == 1) or ($Row['type'] == 4))
     {
       $Output .= '<tr><td>'.$Row['name'].'</td><td style="text-align: right;">'.sprintf("%01.2f", $Row['Hour']).'</td><td style="text-align: right;">'.sprintf("%01.2f", $Row['Day']).'</td><td style="text-align: right;">'.sprintf("%01.2f", $Row['Week']).'</td><td style="text-align: right;">'.sprintf("%01.2f", $Row['Month']).'</td><td style="text-align: right;">'.sprintf("%01.2f", $Row['Year']).'</td></tr>';