Different changes for PHP forms.

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

7 files changed, 34 insertions, 10 deletions

diff --git a/frontends/php/charts.html b/frontends/php/charts.html
index 53a72f7e..c08582de 100644
--- a/frontends/php/charts.html
+++ b/frontends/php/charts.html
@@ -47,6 +47,11 @@
 			echo " ";
 		}
 
+		if(DBnum_rows($result) == 0)
+		{
+			echo "No graphs to display";
+		}
+
 		echo "</font>";
 		show_table_header_end();
 		echo "<br>";
diff --git a/frontends/php/graphs.html b/frontends/php/graphs.html
index c709ce01..7e0fe08b 100644
--- a/frontends/php/graphs.html
+++ b/frontends/php/graphs.html
@@ -63,6 +63,7 @@
 		echo "<TD><A HREF=\"graphs.html?graphid=$graphid_#form\">Change</A> - <A HREF=\"graphs.html?register=delete&graphid=$graphid_\">Delete</A></TD>";
 		echo "</TR>";
 	}
+
 	echo "</TABLE>";
 ?>
 
diff --git a/frontends/php/history.html b/frontends/php/history.html
index 73717640..0287696e 100644
--- a/frontends/php/history.html
+++ b/frontends/php/history.html
@@ -3,12 +3,6 @@
 
 	include "include/config.inc";
 
-	if(!isset($itemid))
-	{
-		echo "Missing <B>itemid</B> Parameter - See System Administror";
-		exit;
-	}
-
 	$now=time();
 
 	$result=DBselect("select h.host,i.description,i.nextcheck-$now,h.hostid from items i,hosts h where i.itemid=$itemid and h.hostid=i.hostid");
diff --git a/frontends/php/hosts.html b/frontends/php/hosts.html
index fc598c23..be745194 100644
--- a/frontends/php/hosts.html
+++ b/frontends/php/hosts.html
@@ -15,7 +15,7 @@
 	{
 		if($register=="add")
 		{
-			add_host($host,$port,$status);
+			add_host($host,$port,$status,$template);
 		}
 		if($register=="changestatus")
 		{
@@ -97,6 +97,12 @@
 	echo "<option value=\"1\">Not monitored";
 	echo "</select>";
 
+	show_table2_v_delimiter();
+	echo "Add items supported by zabbix_agent";
+	show_table2_h_delimiter();
+	echo "<INPUT TYPE=\"CHECKBOX\" CHECKED ";
+	echo " NAME=\"template\"  VALUE=\"true\">";
+
 	show_table2_v_delimiter2();
 	echo "<input type=\"submit\" name=\"register\" value=\"add\">";
 
diff --git a/frontends/php/include/config.inc b/frontends/php/include/config.inc
index 2d617642..b63d1db3 100644
--- a/frontends/php/include/config.inc
+++ b/frontends/php/include/config.inc
@@ -859,6 +859,7 @@
 
 	function	add_trigger($expression,$description,$priority,$istrue,$comments)
 	{
+		$description=addslashes($description);
 		$sql="insert into triggers  (description,priority,istrue,comments) values ('$description',$priority,$istrue,'$comments')";
 #		echo $sql,"<Br>";
 		$result=DBexecute($sql);
@@ -948,6 +949,7 @@
 						break;
 					}
 				}
+				$description=sprintf($description,$host);
 
 				add_trigger($expression,$description,0,0,"");
 			}
@@ -1020,13 +1022,16 @@
 
 	# Add Host definition
 
-	function	add_host($host,$port,$status)
+	function	add_host($host,$port,$status,$template)
 	{
 		$sql="insert into hosts (host,port,status) values ('$host',$port,$status)";
 		$result=DBexecute($sql);
 		$hostid=DBinsert_id($result,"hosts","hostid");
 
-		add_from_templates($hostid,$host);
+		if($template=="true")
+		{
+			add_from_templates($hostid,$host);
+		}
 
 	}
 
diff --git a/frontends/php/maps.html b/frontends/php/maps.html
index 901da295..4c1cb7fd 100644
--- a/frontends/php/maps.html
+++ b/frontends/php/maps.html
@@ -47,6 +47,11 @@
 			echo " ";
 		}
 
+		if(DBnum_rows($result) == 0)
+		{
+			echo "No maps to display";
+		}
+
 		echo "</font>";
 		show_table_header_end();
 		echo "<br>";
diff --git a/frontends/php/tr_status.html b/frontends/php/tr_status.html
index f0516b5a..219d8d16 100644
--- a/frontends/php/tr_status.html
+++ b/frontends/php/tr_status.html
@@ -214,7 +214,15 @@
 		{
 			echo "<TD>";
 			echo "<A HREF=\"actions.html?triggerid=$triggerid\">Show actions</A> - ";
-			echo "<A HREF=\"alarms.html?triggerid=$triggerid\">History</A>";
+			echo "<A HREF=\"alarms.html?triggerid=$triggerid\">History</A> - ";
+			if(isset($hostid))
+			{
+				echo "<A HREF=\"triggers.html?hostid=$hostid&triggerid=$triggerid#form\">Change</A>";
+			}
+			else
+			{
+				echo "<A HREF=\"triggers.html?triggerid=$triggerid#form\">Change</A>";
+			}
 			echo "</TD>";
 		}
 		if($istrue==0)	echo "</TR>\n";