Changeset 16 for www

Timestamp:

Jan 17, 2008, 7:13:44 PM (17 years ago)

Author:

george

Message:

Opraveno: Zobrazování topologie počítačů.

Location:

www

Files:

• db.php (deleted)
• error.php (modified) (1 diff)
• is/config.php (deleted)
• is/topologie-img.php (modified) (10 diffs)

www/error.php

@@ -1 @@
-<?
+<?php
 
 // Obsluha chyb v1.1.1 //
-
+include_once('config.php');
 $Error_Email = $Config['Web']['AdminEmail'];                                            // Adresa, kam budou chyby odesílány
 $Error_Subject = $Config['Web']['Title'].' - Chybové hlášení';          // Název zpráv o chybách

www/is/topologie-img.php

@@ -13 +13 @@
   global $debug, $bbound;
   
-  if ($i=@$vfirst[$id]) 
+  if(!array_key_exists($id, $vfirst)) $vfirst[$id] = 0;
+  if($i = $vfirst[$id]) 
   {
-    if ($debug==2) echo @$id.':'.@$i.','.@$vpred[$i].'-'.@$vleft[@$vpred[$i]]."\n";
-    if ((@$vlast[$id]>0)&&(@$vleft[$id]>@$vleft[$vlast[$id]])) 
+    //if ($debug==2) echo $id.':'.@$i.','.@$vpred[$i].'-'.@$vleft[@$vpred[$i]]."\n";
+    if (($vlast[$id] > 0) && ($vleft[$id] > $vleft[$vlast[$id]])) 
     {
       $diff=$vleft[$id]-$vleft[$vlast[$id]];
       $i=$vfirst[$id];
-      if ($vleft[$id]>=@$tbound[$level]) 
-      {
-        $tbound[$level]=$vleft[$id]+2;
-        if ($vleft[$id]>$width) $width=$vleft[$id];
+      if ($vleft[$id] >= $tbound[$level]) 
+      {
+        $tbound[$level] = $vleft[$id] + 2;
+        if ($vleft[$id] > $width) $width = $vleft[$id];
       }
     } else {
@@ -36 +37 @@
       $vleft[$i]+=$diff;
       $limit = balance($i,$level+1, $vlast,$vleft,$vpred, $vfirst,$vnext,$tbound, $width, $limit) + 2;
-      $i=@$vnext[$i];
+      if(!array_key_exists($i, $vnext)) $vnext[$i] = 0;
+      $i = $vnext[$i];
     }
   }
@@ -63 +65 @@
   $height = 0;                                   // Hloubka stromu
 
-  $parent[$level]=0;                             // Rodič dané úrovně
-  $position[$level]=0;                           // Aktuální pozice prvku na dané úrovni
-  $count[$level]=0;                              // Počet prvků na dané úrovni
-  
+  $parent[$level] = 0;                             // Rodič dané úrovně
+  $position[$level] = 0;                           // Aktuální pozice prvku na dané úrovni
+  $count[$level] = 0;                              // Počet prvků na dané úrovni
+  
+  $maxindex = 0;
+  $tbound[$level] = 0;
+  $tranger[$level] = 0;
+   
   // --- Hlavní cyklus ---------------------------------------------------------
   do 
@@ -72 +78 @@
   // --- Proveď databázový dotaz -----------------------------------------------
     $query = 'SELECT * FROM hosts WHERE used=1 AND ';
-    if ($level==0) 
+    if ($level == 0) 
     { 
       $query .= 'name = "'.$TopHostName.'" ORDER BY id'; 
@@ -81 +87 @@
     if ($mode) $query.=' DESC';
     $query .= ' LIMIT '.$position[$level].',1';
+    //echo($query.'<br>');
     $DbResult = $Database->query($query);
     $item = $DbResult->fetch_array();
-    if ($item) {
+    //print_r($item);
+    if($item) 
+    {
   // --- Zpracování položky z DB -----------------------------------------------
       if($position[$level] > 0) 
       {
-        $vnext[$curr]=$item['id']; // Neprvní položka, nastav předchozí
+        $vnext[$curr] = $item['id']; // Neprvní položka, nastav předchozí
       }
       $curr = $item['id'];
-      if ($curr > @$maxindex) $maxindex=$curr;
+      if ($curr > $maxindex) $maxindex = $curr;
       if ($position[$level] == 0) $vfirst[$parent[$level]]=$curr; // První položka, nastav první
-      $vlast[$parent[$level]]=$curr;
+      $vlast[$parent[$level]] = $curr;
       $vtop[$curr] = $level;
-      $vleft[$curr] = @$tbound[$level];
-      $vpred[$curr] = @$tranger[$level];
+      if(!array_key_exists($level, $tbound)) $tbound[$level] = 0;
+      $vleft[$curr] = $tbound[$level];
+      if(!array_key_exists($level, $tranger)) $tranger[$level] = 0;
+      $vpred[$curr] = $tranger[$level];
       $tranger[$level] = $curr;
       if (($debug == 3) && ($level == 8)) echo $curr.',';
@@ -104 +115 @@
       $childcnt = $DbResult->fetch_array();
       if ($childcnt[0] > 0) 
-      {                      // Uzelový vrchol
-        if(@$tbound[$level + 1] > $vleft[$curr]) $vleft[$curr] = @$tbound[$level + 1];
+      {    
+        // Uzelový vrchol
+        if(array_key_exists($level + 1, $tbound))                  
+          if($tbound[$level + 1] > $vleft[$curr]) $vleft[$curr] = $tbound[$level + 1];
       }
       $tbound[$level] = $vleft[$curr] + 2;
@@ -114 +127 @@
         if ($level > $height) $height = $level;
         $parent[$level] = $curr;
-        $position[$level]=0;
+        $position[$level] = 0;
         $count[$level] = 0;
       } else $index++;                            // Listový vrchol
-    } else {
+    } else 
+    {
   // --- Zarovnávání prvků kvůli vzhledu
-      if (@$vleft[$vfirst[$parent[$level]]]>@$vleft[$parent[$level]]) {
+      if(!array_key_exists($vfirst[$parent[$level]], $vleft)) $vleft[$vfirst[$parent[$level]]] = 0;
+      if(!array_key_exists($parent[$level], $vleft)) $vleft[$parent[$level]] = 0;
+      if ($vleft[$vfirst[$parent[$level]]] > $vleft[$parent[$level]]) 
+      {
         $vleft[$parent[$level]] = $vleft[$vfirst[$parent[$level]]];
         if ($vleft[$parent[$level]]+2>$tbound[$level-1]) $tbound[$level-1] = $vleft[$parent[$level]]+2;
       }
-      balance(@$parent[$level],$level, $vlast,$vleft,$vpred,$vfirst,$vnext,$tbound, $width, 0);
-      if (@$position[$level]==1) {
-        $vleft[$vfirst[$parent[$level]]]=@$vleft[$parent[$level]];
+      balance($parent[$level],$level, $vlast,$vleft,$vpred,$vfirst,$vnext,$tbound, $width, 0);
+      if ($position[$level]==1) 
+      {
+        $vleft[$vfirst[$parent[$level]]] = $vleft[$parent[$level]];
       }
       $level--;
-      $curr=@$vlast[$parent[$level]];
-      if (@$tbound[$level]>@$tbound[$level+1]) $tbound[$level+1]=$tbound[$level];
+      if(!array_key_exists($level, $parent)) $parent[$level] = 0;
+      if(!array_key_exists($parent[$level], $vlast)) $vlast[$parent[$level]] = 0;
+      $curr = $vlast[$parent[$level]];
+      
+      if(!array_key_exists($level, $tbound)) $tbound[$level] = 0;
+      if(!array_key_exists($level + 1, $tbound)) $tbound[$level + 1] = 0;
+      if($tbound[$level] > $tbound[$level + 1]) $tbound[$level + 1] = $tbound[$level];
     }
   } while($level >= 0);
-  $data = compact('tbound','count','tbound','vfirst','vlast','vtop','vleft','height','width','index','maxindex');
-  return $data;
+  $data = compact('tbound', 'count', 'tbound', 'vfirst', 'vlast', 'vtop', 'vleft', 'height', 'width', 'index', 'maxindex');
+  return($data);
 };
 
@@ -140 +163 @@
 // exit();
 $data = gentree(1);
-$datawidth = @$data['width'];
-for ($i=0; $i<=$maxindex; $i++) $vleft[$i]=.2+(@$vleft[$i]+($datawidth-@$data['vleft'][$i]))/2;
-
-$spacex=32;
-$spacey=68;
-$halfx=$spacex/2;
-$halfy=$spacey/2;
+$datawidth = $data['width'];
+for($i=0; $i <= $maxindex; $i++)
+{ 
+  if(!array_key_exists($i, $vleft)) $vleft[$i] = 0;
+  if(!array_key_exists($i, $data['vleft'])) $data['vleft'][$i] = 0;
+  $vleft[$i] = .2 + ($vleft[$i] + ($datawidth - $data['vleft'][$i])) / 2;
+}
+
+$spacex = 32;
+$spacey = 68;
+$halfx = $spacex / 2;
+$halfy = $spacey / 2;
 // === Načtení pomocných obrázků ===============================================
-$im_comp = @imagecreatefrompng('images/comp.png');
-$im_dev = @imagecreatefrompng('images/device.png');
+$im_comp = imagecreatefrompng('images/comp.png');
+$im_dev = imagecreatefrompng('images/device.png');
 // === Generování obrázku ======================================================
-$im = @imagecreate(($width+1.6)*$spacex, ($height+1)*$spacey);
+$im = imagecreate(($width + 1.6) * $spacex, ($height + 1) * $spacey);
 $background_color = imagecolorallocate($im, 255, 255, 255);
-$black = imagecolorallocate($im, 0,0,0);
-$red = imagecolorallocate($im, 255,0,0);
-$green = imagecolorallocate($im, 0,128,0);
-$blue = imagecolorallocate($im, 100,100,255);
-$gray = imagecolorallocate($im, 160,160,160);
-
-function xpos($id) {
+$black = imagecolorallocate($im, 0, 0, 0);
+$red = imagecolorallocate($im, 255, 0, 0);
+$green = imagecolorallocate($im, 0, 128, 0);
+$blue = imagecolorallocate($im, 100, 100, 255);
+$gray = imagecolorallocate($im, 160, 160, 160);
+
+function xpos($id) 
+{
   global $vleft, $spacex;
-  return @$vleft[$id]*$spacex;
+  return($vleft[$id] * $spacex);
 }
 
 $DbResult = $Database->query("SELECT * FROM hosts WHERE used=1");
-while ($item = $DbResult->fetch_array()) 
+while($item = $DbResult->fetch_array()) 
 {
   $id = $item['id'];
-  if ((@$vtop[$id]>0)||($item['name']==$TopHostName)) 
+  if(!array_key_exists($id, $vtop)) $vtop[$id] = 0;
+  if(($vtop[$id] > 0) || ($item['name'] == $TopHostName)) 
   {
-    if ($vtop[$id]>0) imageline($im,xpos($id)+$halfx,@$vtop[$id]*$spacey,xpos($id)+$halfx,@$vtop[$id]*$spacey+8,$black);
-    if (@$vfirst[$id]>0) {
-      imageline($im,xpos($vfirst[$id])+$halfx,$vtop[$id]*$spacey+$spacey,xpos($vlast[$id])+$halfx,$vtop[$id]*$spacey+$spacey,$black);
-      imageline($im,xpos($id)+$halfx,($vtop[$id]+1)*$spacey-10,xpos($id)+$halfx,($vtop[$id]+1)*$spacey,$black);
-    }
-    $ip=explode('.',$item['IP']);
-    if (@$ip[3]<100) { $image=$im_comp; } else $image=$im_dev;  
+    if($vtop[$id] > 0) imageline($im, xpos($id) + $halfx, $vtop[$id] * $spacey, xpos($id) + $halfx, $vtop[$id] * $spacey + 8, $black);
+    if(!array_key_exists($id, $vfirst)) $vfirst[$id] = 0;
+    if($vfirst[$id] > 0) 
+    {
+      imageline($im, xpos($vfirst[$id]) + $halfx, $vtop[$id] * $spacey + $spacey, xpos($vlast[$id]) + $halfx, $vtop[$id] * $spacey + $spacey, $black);
+      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)) 
     { 
@@ -185 +221 @@
       $color = $gray;
       $image = $im_dev;
-    } else {
-      if ((($ip[0] != 192) and ($ip[0] != 168)) or ($ip[3]>=100) or ($ip[3]==1)) 
+    } 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 {
+      } else 
+      {
         if($item['online'] == 1) { $color = $green; } else $color = $black;
       }
@@ -204 +242 @@
 
 // === Sestavení výsledného souboru ============================================
-if(!($debug>1))
+if(!($debug > 1))
 {
   header("Content-type: image/png");