- fixes for graph time navigation (Alexei)

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

3 files changed, 27 insertions, 11 deletions

diff --git a/frontends/php/charts.php b/frontends/php/charts.php
index 2a59367a..0413e8ec 100644
--- a/frontends/php/charts.php
+++ b/frontends/php/charts.php
@@ -36,6 +36,7 @@
 	{
 		show_header($page["title"],0,$nomenu);
 	}
+
 ?>
 
 <?php
@@ -172,19 +173,20 @@
 		$hour=3600;
 		foreach(array(1,2,4,8,12,24) as $count){
 			$tmp=$hour*$count;
-			echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=".$HTTP_GET_VARS["from"]."&period=".$tmp."&keep=".$HTTP_GET_VARS["keep"]."\">");
+			echo("[<A HREF=\"charts.php?period=$tmp".url_param("graphid").url_param("from").url_param("keep").url_param("fullscreen")."\">");
 			echo($count."h</A>]&nbsp;");
 		}
 
             echo("or&nbsp;");
 		$tmp=$HTTP_GET_VARS["period"]+$hour;
-		echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=".$HTTP_GET_VARS["from"]."&period=".$tmp."&keep=".$HTTP_GET_VARS["keep"]."\">");
+		echo("[<A HREF=\"charts.php?period=$tmp".url_param("graphid").url_param("from").url_param("keep").url_param("fullscreen")."\">");
 		echo("+1h</A>]&nbsp;");
 
 		if ($HTTP_GET_VARS["period"]>$hour) 
 		{
 			$tmp=$HTTP_GET_VARS["period"]-$hour;
-			echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=".$HTTP_GET_VARS["from"]."&period=".$tmp."&keep=".$HTTP_GET_VARS["keep"]."\">");
+//			echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=".$HTTP_GET_VARS["from"]."&period=".$tmp."&keep=".$HTTP_GET_VARS["keep"]."\">");
+			echo("[<A HREF=\"charts.php?period=$tmp".url_param("graphid").url_param("from").url_param("keep").url_param("fullscreen")."\">");
 			echo("-1h</A>]&nbsp;");
 		}
 		else
@@ -199,7 +201,7 @@
 		$day=24;
 		foreach(array(0,1,2,7,14) as $count){
 			$tmp=$day*$count;
-			echo("[<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=".$tmp."&period=".$HTTP_GET_VARS["period"]."&keep=".$HTTP_GET_VARS["keep"]."\">");
+			echo("[<A HREF=\"charts.php?from=$tmp".url_param("graphid").url_param("period").url_param("keep").url_param("fullscreen")."\">");
 			echo($count."d</A>]&nbsp;");
 		}
             
@@ -210,11 +212,11 @@
 			echo(" <b>Keep&nbsp;period&nbsp;=</b>&nbsp;");
 			if($HTTP_GET_VARS["keep"] == 1)
 			{
-				echo("<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=".$HTTP_GET_VARS["from"]."&period=".$HTTP_GET_VARS["period"]."&keep=0\">Off</a>");
+				echo("<A HREF=\"charts.php?keep=0".url_param("graphid").url_param("from").url_param("period").url_param("fullscreen")."\">On</a>");
 			}
 			else
 			{
-				echo("<A HREF=\"charts.php?graphid=".$HTTP_GET_VARS["graphid"]."&from=".$HTTP_GET_VARS["from"]."&period=".$HTTP_GET_VARS["period"]."&keep=1\">On</a>");
+				echo("<A HREF=\"charts.php?keep=1".url_param("graphid").url_param("from").url_param("period").url_param("fullscreen")."\">Off</a>");
 			}
 		}
 
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index e51d3a1d..24ceb73d 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -30,6 +30,20 @@
 		return str_replace(" ","&nbsp;",$str);;
 	}
 
+	function url_param($parameter)
+	{
+		global $HTTP_GET_VARS;
+	
+		if(isset($HTTP_GET_VARS[$parameter]))
+		{
+			return "&$parameter=".$HTTP_GET_VARS[$parameter];
+		}
+		else
+		{
+			return "";
+		}
+	}
+
 	function getmicrotime()
 	{
 		list($usec, $sec) = explode(" ",microtime()); 
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index 564a6fcd..f1d18eef 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -19,12 +19,12 @@
 **/
 ?>
 <?php
-//	$DB_TYPE	="POSTGRESQL";
-	$DB_TYPE	="MYSQL";
-	$DB_SERVER	="localhost";
+	$DB_TYPE	="POSTGRESQL";
+//	$DB_TYPE	="MYSQL";
+	$DB_SERVER	="127.0.0.1";
 	$DB_DATABASE	="zabbix";
-	$DB_USER	="root";
-	$DB_PASSWORD	="";
+	$DB_USER	="zabbix";
+	$DB_PASSWORD	="zabbix";
 
 	$USER_DETAILS	="";