- different icons depending on a triger status for sysmaps (Alexei)

 - added column sysmaps_hosts.icon_on (Alexei)
 - hierarchial maps (Alexei)
 - added column sysmaps_hosts.url (Alexei)
 - upgrades/dbpatches/1.0_to_1.1alpha1/data/images/ (Alexei)


git-svn-id: svn://svn.zabbix.com/trunk@1421 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 5 insertions, 5 deletions

diff --git a/frontends/php/include/classes.inc.php b/frontends/php/include/classes.inc.php
index ec2e68f2..7973e92e 100644
--- a/frontends/php/include/classes.inc.php
+++ b/frontends/php/include/classes.inc.php
@@ -184,7 +184,7 @@
 
 		function setWidth($width)
 		{
-// Avoid sizeX==0, to prevent division bu zero later
+// Avoid sizeX==0, to prevent division by zero later
 			if($width>0)
 			{
 				$this->sizeX=$width;
@@ -321,7 +321,7 @@
 			{
 				$this->drawGrid();
 				ImageString($this->im, 2,$this->sizeX/2 -50,$this->sizeY+$this->shiftY+3, "NO PERMISSIONS" , $this->colors["Dark Red No Alpha"]);
-				ImagePng($this->im); 
+				ImageOut($this->im); 
 				ImageDestroy($this->im); 
 				exit;
 			}
@@ -333,7 +333,7 @@
 
 			ImageString($this->im, 2,$this->sizeX/2-50,                $this->sizeY+$this->shiftY+3, "NO DATA FOUND FOR THIS PERIOD" , $this->colors["Dark Red No Alpha"]);
 			ImageStringUp($this->im,0,imagesx($this->im)-10,imagesy($this->im)-50, "http://www.zabbix.com", $this->colors["Gray"]);
-			ImagePng($this->im); 
+			ImageOut($this->im); 
 			ImageDestroy($this->im); 
 			exit;
 		}
@@ -434,7 +434,7 @@
 				unset($maxY);
 				for($i=0;$i<$this->num;$i++)
 				{
-					if(!isset($maxY))
+					if(!isset($maxY)&&(isset($this->max[$i])))
 					{
 						if(count($this->max[$i])>0)
 						{
@@ -628,7 +628,7 @@
 			$str=sprintf("%0.2f",($end_time-$start_time));
 			ImageString($this->im, 0,imagesx($this->im)-120,imagesy($this->im)-12,"Generated in $str sec", $this->colors["Gray"]);
 
-			ImagePng($this->im); 
+			ImageOut($this->im); 
 			ImageDestroy($this->im); 
 		}
 	}