Improved graph legends.

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

2 files changed, 11 insertions, 10 deletions

diff --git a/frontends/php/include/classes.inc.php b/frontends/php/include/classes.inc.php
index 85ad3da7..1d6688b3 100644
--- a/frontends/php/include/classes.inc.php
+++ b/frontends/php/include/classes.inc.php
@@ -96,6 +96,7 @@
 			{
 				$this->date_format="m.d H:i";
 			}
+
 		}
 
 		function addItem($itemid)
@@ -154,7 +155,7 @@
 
 		function drawRectangle()
 		{
-			ImageFilledRectangle($this->im,0,0,$this->sizeX+$this->shiftX+61,$this->sizeY+2*$this->shiftY+40,$this->colors["White"]);
+			ImageFilledRectangle($this->im,0,0,$this->sizeX+$this->shiftX+61,$this->sizeY+$this->shiftY+32+12*$this->num+2,$this->colors["White"]);
 			if($this->border==1)
 			{
 				ImageRectangle($this->im,0,0,imagesx($this->im)-1,imagesy($this->im)-1,$this->colors["Black"]);
@@ -198,7 +199,7 @@
 			{
 				for($i=0;$i<=$this->sizeX;$i+=$this->sizeX/24)
 				{
-					ImageStringUp($this->im, 1,$i+$this->shiftX-3, $this->sizeY+$this->shiftY+29, date($this->date_format,$this->from_time+$i*$this->period/$this->sizeX) , $this->colors["Black"]);
+					ImageStringUp($this->im, 1,$i+$this->shiftX-3, $this->sizeY+$this->shiftY+27, date($this->date_format,$this->from_time+$i*$this->period/$this->sizeX) , $this->colors["Black"]);
 				}
 			}
 		}
@@ -233,8 +234,8 @@
 		{
 			for($i=0;$i<$this->num;$i++)
 			{
-				ImageFilledRectangle($this->im,$this->shiftX,$this->sizeY+$this->shiftY+35+10*$i,$this->shiftX+5,$this->sizeY+$this->shiftY+5+35+10*$i,$this->colors[$this->items[$i]["color"]]);
-				ImageRectangle($this->im,$this->shiftX,$this->sizeY+$this->shiftY+35+10*$i,$this->shiftX+5,$this->sizeY+$this->shiftY+5+35+10*$i,$this->colors["Black"]);
+				ImageFilledRectangle($this->im,$this->shiftX,$this->sizeY+$this->shiftY+32+12*$i,$this->shiftX+5,$this->sizeY+$this->shiftY+5+32+12*$i,$this->colors[$this->items[$i]["color"]]);
+				ImageRectangle($this->im,$this->shiftX,$this->sizeY+$this->shiftY+32+12*$i,$this->shiftX+5,$this->sizeY+$this->shiftY+5+32+12*$i,$this->colors["Black"]);
 
 				$max_host_len=strlen($this->items[$i]["host"]);
 				$max_desc_len=strlen($this->items[$i]["description"]);
@@ -244,7 +245,7 @@
 					convert_units(min($this->min[$i]),$this->items[$i]["units"],$this->items[$i]["multiplier"]),
 					convert_units(max($this->max[$i]),$this->items[$i]["units"],$this->items[$i]["multiplier"]));
 	
-				ImageString($this->im, 2,$this->shiftX+9,$this->sizeY+$this->shiftY+30+10*$i,$str, $this->colors["Black"]);
+				ImageString($this->im, 2,$this->shiftX+9,$this->sizeY+$this->shiftY+27+12*$i,$str, $this->colors["Black"]);
 			}
 
 //		for($i=0;$i<DBnum_rows($result2);$i++)
@@ -325,7 +326,7 @@
 		{
 			$start_time=getmicrotime();
 
-			$this->im = imagecreate($this->sizeX+$this->shiftX+61,$this->sizeY+2*$this->shiftY+40);
+//			$this->im = imagecreate($this->sizeX+$this->shiftX+61,$this->sizeY+2*$this->shiftY+40);
 
 //			Header( "Content-type:  text/html"); 
 			Header( "Content-type:  image/png"); 
@@ -333,7 +334,7 @@
 
 			check_authorisation();
 		
-			$this->im = imagecreate($this->sizeX+$this->shiftX+61,$this->sizeY+2*$this->shiftY+40);
+			$this->im = imagecreate($this->sizeX+$this->shiftX+61,$this->sizeY+$this->shiftY+32+12*$this->num+2);
 
 			$this->initColors();
 			$this->drawRectangle();
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index 8db44c9f..11e68819 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -19,11 +19,11 @@
 **/
 ?>
 <?php
-	$DB_TYPE	="POSTGRESQL";
-//	$DB_TYPE	="MYSQL";
+//	$DB_TYPE	="POSTGRESQL";
+	$DB_TYPE	="MYSQL";
 	$DB_SERVER	="localhost";
 	$DB_DATABASE	="zabbix";
-	$DB_USER	="zabbix";
+	$DB_USER	="root";
 	$DB_PASSWORD	="";
 
 	$USER_DETAILS	="";