Misc changes.

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

1 files changed, 37 insertions, 37 deletions

diff --git a/frontends/php/charts.php b/frontends/php/charts.php
index 8c7f47fb..39c57dd8 100644
--- a/frontends/php/charts.php
+++ b/frontends/php/charts.php
@@ -4,11 +4,11 @@
 	$page["file"] = "charts.php";
 
 	$nomenu=0;
-	if(isset($HTTP_GET_VARS["fullscreen))
+	if(isset($HTTP_GET_VARS["fullscreen"]))
 	{
 		$nomenu=1;
 	}
-	if(isset($HTTP_GET_VARS["graphid))
+	if(isset($HTTP_GET_VARS["graphid"]))
 	{
 		show_header($page["title"],30,$nomenu);
 	}
@@ -19,7 +19,7 @@
 ?>
 
 <?
-	if(!isset($HTTP_GET_VARS["fullscreen))
+	if(!isset($HTTP_GET_VARS["fullscreen"]))
 	{
 		show_table_header_begin();
 		echo "GRAPHS";
@@ -35,12 +35,12 @@
 			{
 				continue;
 			}
-			if( isset($HTTP_GET_VARS["graphid) && ($HTTP_GET_VARS["graphid == $row["graphid"]) )
+			if( isset($HTTP_GET_VARS["graphid"]) && ($HTTP_GET_VARS["graphid"] == $row["graphid"]) )
 			{
 				echo "<b>[";
 			}
 			echo "<a href='charts.php?graphid=".$row["graphid"]."'>".$row["name"]."</a>";
-			if(isset($HTTP_GET_VARS["graphid) && ($HTTP_GET_VARS["graphid == $row["graphid"]) )
+			if(isset($HTTP_GET_VARS["graphid"]) && ($HTTP_GET_VARS["graphid"] == $row["graphid"]) )
 			{
 				echo "]</b>";
 			}
@@ -60,30 +60,30 @@
 ?>
 
 <?
-	if(isset($HTTP_GET_VARS["graphid))
+	if(isset($HTTP_GET_VARS["graphid"]))
 	{
-		$result=DBselect("select name from graphs where graphid=$HTTP_GET_VARS["graphid");
+		$result=DBselect("select name from graphs where graphid=".$HTTP_GET_VARS["graphid"]);
 		$row=DBfetch($result);
-		if(isset($HTTP_GET_VARS["fullscreen))
+		if(isset($HTTP_GET_VARS["fullscreen"]))
 		{
-			$map="<a href=\"charts.php?graphid=$HTTP_GET_VARS["graphid\">".$row["name"]."</a>";
+			$map="<a href=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."\">".$row["name"]."</a>";
 		}
 		else
 		{
-			$map="<a href=\"charts.php?graphid=$HTTP_GET_VARS["graphid&fullscreen=1\">".$row["name"]."</a>";
+			$map="<a href=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&fullscreen=1\">".$row["name"]."</a>";
 		}
 	}
 	else
 	{
 		$map="Select graph to display";
 	}
-	if(!isset($HTTP_GET_VARS["from))
+	if(!isset($HTTP_GET_VARS["from"]))
 	{
-		$HTTP_GET_VARS["from=0;
+		$HTTP_GET_VARS["from"]=0;
 	}
-	if(!isset($HTTP_GET_VARS["period))
+	if(!isset($HTTP_GET_VARS["period"]))
 	{
-		$HTTP_GET_VARS["period=3600;
+		$HTTP_GET_VARS["period"]=3600;
 	}
 
 	show_table_header($map);
@@ -91,9 +91,9 @@
 	echo "<TR BGCOLOR=#EEEEEE>";
 	echo "<TR BGCOLOR=#DDDDDD>";
 	echo "<TD ALIGN=CENTER>";
-	if(isset($HTTP_GET_VARS["graphid))
+	if(isset($HTTP_GET_VARS["graphid"]))
 	{
-		echo "<IMG SRC=\"chart2.php?graphid=$HTTP_GET_VARS["graphid&period=$HTTP_GET_VARS["period&from=$HTTP_GET_VARS["from\">";
+		echo "<IMG SRC=\"chart2.php?graphid=".$HTTP_GET_VARS["graphid"]."&period=".$HTTP_GET_VARS["period"]."&from=".$HTTP_GET_VARS["from"]."\">";
 	}
 	else
 	{
@@ -103,30 +103,30 @@
 	echo "</TR>";
 	echo "</TABLE>";
 
-	if(isset($HTTP_GET_VARS["graphid)&&(!isset($HTTP_GET_VARS["fullscreen)))
+	if(isset($HTTP_GET_VARS["graphid"])&&(!isset($HTTP_GET_VARS["fullscreen"])))
 	{
 		echo("<div align=center>");
 		echo("<hr>");
-		$tmp=$HTTP_GET_VARS["from+12*14;
-		echo("[<A HREF=\"charts.php?graphid=$HTTP_GET_VARS["graphid&from=$tmp&period=$HTTP_GET_VARS["period\">");
+		$tmp=$HTTP_GET_VARS["from"]+12*14;
+		echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=$tmp&period=".$HTTP_GET_VARS["period"]."\">");
 		echo("Week back</A>] ");
 
-		$tmp=$HTTP_GET_VARS["from+12;
-		echo("[<A HREF=\"charts.php?graphid=$HTTP_GET_VARS["graphid&from=$tmp&period=$HTTP_GET_VARS["period\">");
+		$tmp=$HTTP_GET_VARS["from"]+12;
+		echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=$tmp&period=".$HTTP_GET_VARS["period"]."\">");
 		echo("12h back</A>] ");
 		
-		$tmp=$HTTP_GET_VARS["from+1;
-		echo("[<A HREF=\"charts.php?graphid=$HTTP_GET_VARS["graphid&from=$tmp&period=$HTTP_GET_VARS["period\">");
+		$tmp=$HTTP_GET_VARS["from"]+1;
+		echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=$tmp&period=".$HTTP_GET_VARS["period"]."\">");
 		echo("1h back</A>] ");
 
-		$tmp=$HTTP_GET_VARS["period+3600;
-		echo("[<A HREF=\"charts.php?graphid=$HTTP_GET_VARS["graphid&from=$HTTP_GET_VARS["from&period=$tmp\">");
+		$tmp=$HTTP_GET_VARS["period"]+3600;
+		echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=".$HTTP_GET_VARS["from"]."&period=$tmp\">");
 		echo("+1h</A>] ");
 
-		if ($HTTP_GET_VARS["period>3600) 
+		if ($HTTP_GET_VARS["period"]>3600) 
 		{
-			$tmp=$HTTP_GET_VARS["period-3600;
-			echo("[<A HREF=\"charts.php?graphid=$HTTP_GET_VARS["graphid&from=$HTTP_GET_VARS["from&period=$tmp\">");
+			$tmp=$HTTP_GET_VARS["period"]-3600;
+			echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=".$HTTP_GET_VARS["from"]."&period=$tmp\">");
 			echo("-1h</A>] ");
 		}
 		else
@@ -134,20 +134,20 @@
 			echo("[-1h]");
 		}
 	
-		if ($HTTP_GET_VARS["from>0) // HOUR FORWARD
+		if ($HTTP_GET_VARS["from"]>0) // HOUR FORWARD
 		{
-			$tmp=$HTTP_GET_VARS["from-1;
-			echo("[<A HREF=\"charts.php?graphid=$HTTP_GET_VARS["graphid&from=$tmp&period=$HTTP_GET_VARS["period\">");
+			$tmp=$HTTP_GET_VARS["from"]-1;
+			echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=$tmp&period=".$HTTP_GET_VARS["period"]."\">");
 			echo("1h forward</A>] ");
 		}
 		else
 		{
 			echo("[1h forward]");  
 		}
-		if (isset($HTTP_GET_VARS["From) && ($HTTP_GET_VARS["From>0))
+		if (isset($HTTP_GET_VARS["from"]) && ($HTTP_GET_VARS["from"]>0))
 		{
-			$tmp=$HTTP_GET_VARS["from-12;
-			echo("[<A HREF=\"charts.php?graphid=$HTTP_GET_VARS["graphid&from=$tmp&period=$HTTP_GET_VARS["period\">");
+			$tmp=$HTTP_GET_VARS["from"]-12;
+			echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=$tmp&period=".$HTTP_GET_VARS["period"]."\">");
 			echo("12h forward</A>] ");
 		}
 		else
@@ -155,10 +155,10 @@
 			echo("[12h forward]");
 		}
 	
-		if (isset($HTTP_GET_VARS["From) && ($HTTP_GET_VARS["From>0))
+		if (isset($HTTP_GET_VARS["from"]) && ($HTTP_GET_VARS["from"]>0))
 		{
-			$tmp=$HTTP_GET_VARS["from-12*14;
-			echo("[<A HREF=\"charts.php?graphid=$HTTP_GET_VARS["graphid&from=$tmp&period=$HTTP_GET_VARS["period\">");
+			$tmp=$HTTP_GET_VARS["from"]-12*14;
+			echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=$tmp&period=".$HTTP_GET_VARS["period"]."\">");
 			echo("Week forward</A>] ");
 		}
 		else