- added housekeeping of trends (Alexei)

 - added column items.trends (Alexei)
 - added escaping of SQL statements where needed (Alexei)
 - added src/zabbix_sucker/checks_agent.[h,c] (Alexei)
 - added src/zabbix_sucker/checks_internal.[h,c] (Alexei)
 - added src/zabbix_sucker/checks_snmp.[h,c] (Alexei)
 - added src/zabbix_sucker/checks_simple.[h,c] (Alexei)


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

5 files changed, 20 insertions, 5 deletions

diff --git a/frontends/php/about.php b/frontends/php/about.php
index 739250d4..9a4e3038 100644
--- a/frontends/php/about.php
+++ b/frontends/php/about.php
@@ -40,7 +40,7 @@
 </TR>
 <TR BGCOLOR=#DDDDDD>
 <TD ALIGN=LEFT>
-	<font face="Helvetica"><a href="http://www.zabbix.com/manual.php>"<?php echo S_LATEST_ZABBIX_MANUAL; ?></a></font><br>
+	<font face="Helvetica"><a href="http://www.zabbix.com/manual.php"><?php echo S_LATEST_ZABBIX_MANUAL; ?></a></font><br>
 </TD>
 <TD>
 <?php echo S_LATEST_ZABBIX_MANUAL_DETAILS; ?>
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 19189f79..675de396 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -104,7 +104,8 @@
 		$host=@iif(isset($_GET["host"]),$_GET["host"],"");
 		$port=@iif(isset($_GET["port"]),$_GET["port"],10000);
 		$delay=@iif(isset($_GET["delay"]),$_GET["delay"],30);
-		$history=@iif(isset($_GET["history"]),$_GET["history"],365);
+		$history=@iif(isset($_GET["history"]),$_GET["history"],90);
+		$trends=@iif(isset($_GET["trends"]),$_GET["trends"],365);
 		$status=@iif(isset($_GET["status"]),$_GET["status"],0);
 		$type=@iif(isset($_GET["type"]),$_GET["type"],0);
 		$snmp_community=@iif(isset($_GET["snmp_community"]),$_GET["snmp_community"],"public");
@@ -119,7 +120,7 @@
 
 		if(isset($_GET["register"])&&($_GET["register"] == "change"))
 		{
-			$result=DBselect("select i.description, i.key_, h.host, h.port, i.delay, i.history, i.status, i.type, i.snmp_community,i.snmp_oid,i.value_type,i.trapper_hosts,i.snmp_port,i.units,i.multiplier,h.hostid,i.delta from items i,hosts h where i.itemid=".$_GET["itemid"]." and h.hostid=i.hostid");
+			$result=DBselect("select i.description, i.key_, h.host, h.port, i.delay, i.history, i.status, i.type, i.snmp_community,i.snmp_oid,i.value_type,i.trapper_hosts,i.snmp_port,i.units,i.multiplier,h.hostid,i.delta,i.trends from items i,hosts h where i.itemid=".$_GET["itemid"]." and h.hostid=i.hostid");
 		
 			$description=DBget_field($result,0,0);
 			$key=DBget_field($result,0,1);
@@ -138,6 +139,7 @@
 			$multiplier=DBget_field($result,0,14);
 			$hostid=DBget_field($result,0,15);
 			$delta=DBget_field($result,0,16);
+			$trends=DBget_field($result,0,17);
 		}
 
 		echo "<br>";
@@ -269,6 +271,11 @@
 		echo "<input class=\"biginput\" name=\"history\" value=\"$history\" size=8>";
 
 		show_table2_v_delimiter();
+		echo nbsp("Keep trends (in days)");
+		show_table2_h_delimiter();
+		echo "<input class=\"biginput\" name=\"trends\" value=\"$trends\" size=8>";
+
+		show_table2_v_delimiter();
 		echo "Status";
 		show_table2_h_delimiter();
 		echo "<SELECT class=\"biginput\" NAME=\"status\" value=\"$status\" size=\"1\">";
diff --git a/frontends/php/include/local_en.inc.php b/frontends/php/include/local_en.inc.php
index 90800db9..6a4b6a51 100644
--- a/frontends/php/include/local_en.inc.php
+++ b/frontends/php/include/local_en.inc.php
@@ -240,7 +240,7 @@
 	define("S_USE_THE_HOST_AS_A_TEMPLATE",		"Use the host as a template");
 	define("S_DELETE_SELECTED_HOST_Q",		"Delete selected host?");
 
-//	config.php
+//	items.php
 	define("S_CONFIGURATION_OF_ITEMS",		"Configuration of items");
 	define("S_CONFIGURATION_OF_ITEMS_BIG",		"CONFIGURATION OF ITEMS");
 	define("S_CANNOT_UPDATE_ITEM",			"Cannot update item");
@@ -258,6 +258,7 @@
 	define("S_DESCRIPTION",				"Description");
 	define("S_UPDATE_INTERVAL",			"Update interval");
 	define("S_HISTORY",				"History");
+	define("S_TRENDS",				"Trends");
 	define("S_SHORT_NAME",				"Short name");
 	define("S_ZABBIX_AGENT",			"Zabbix agent");
 	define("S_SNMPV1_AGENT",			"SNMPv1 agent");
diff --git a/frontends/php/items.php b/frontends/php/items.php
index fa515d58..91b6a41f 100644
--- a/frontends/php/items.php
+++ b/frontends/php/items.php
@@ -192,7 +192,7 @@
 	$lasthost="";
 	if(isset($_GET["hostid"])&&!isset($_GET["type"])) 
 	{
-		$result=DBselect("select h.host,i.key_,i.itemid,i.description,h.port,i.delay,i.history,i.lastvalue,i.lastclock,i.status,i.lastdelete,i.nextcheck,h.hostid,i.type from hosts h,items i where h.hostid=i.hostid and h.hostid=".$_GET["hostid"]." order by h.host,i.key_,i.description");
+		$result=DBselect("select h.host,i.key_,i.itemid,i.description,h.port,i.delay,i.history,i.lastvalue,i.lastclock,i.status,i.lastdelete,i.nextcheck,h.hostid,i.type,i.trends from hosts h,items i where h.hostid=i.hostid and h.hostid=".$_GET["hostid"]." order by h.host,i.key_,i.description");
 		$col=0;
 		while($row=DBfetch($result))
 		{
@@ -219,6 +219,7 @@
 				echo "<TD WIDTH=10% NOSAVE><B>".S_DESCRIPTION."</B></TD>";
 				echo "<TD WIDTH=5%  NOSAVE><B>".S_UPDATE_INTERVAL."</B></TD>";
 				echo "<TD WIDTH=5%  NOSAVE><B>".S_HISTORY."</B></TD>";
+				echo "<TD WIDTH=5%  NOSAVE><B>".S_TRENDS."</B></TD>";
 				echo "<TD><B>".S_SHORT_NAME."</B></TD>";
 				echo "<TD WIDTH=5% NOSAVE><B>".S_TYPE."</B></TD>";
 				echo "<TD WIDTH=5% NOSAVE><B>".S_STATUS."</B></TD>";
@@ -237,6 +238,7 @@
 			echo "<TD>".$row["description"]."</TD>";
 			echo "<TD>".$row["delay"]."</TD>";
 			echo "<TD>".$row["history"]."</TD>";
+			echo "<TD>".$row["trends"]."</TD>";
 			echo "<TD>".$row["host"].":".$row["key_"]."</TD>";
 	
 			echo "<td align=center>";
diff --git a/frontends/php/maps.php b/frontends/php/maps.php
index d6a56e0b..040fa7b2 100644
--- a/frontends/php/maps.php
+++ b/frontends/php/maps.php
@@ -75,6 +75,11 @@
 		show_table3_h_delimiter();
 		echo "<form name=\"form2\" method=\"get\" action=\"maps.php\">";
 
+		if(isset($_GET["fullscreen"]))
+		{
+			echo "<input name=\"fullscreen\" type=\"hidden\" value=".$_GET["fullscreen"].">";
+		}
+
 		if(isset($_GET["sysmapid"])&&($_GET["sysmapid"]==0))
 		{
 			unset($_GET["sysmapid"]);