Applied MySQL reconnect patch.

	zabbix_tmp/src/libs/zbxdbhigh/db.c
Applied Multiple Server Patch.
	zabbix/create/mysql/schema.sql
	zabbix/create/postgresql/schema.sql
	zabbix/frontends/php/include/config.inc.php
	zabbix/frontends/php/include/forms.inc.php
	zabbix/frontends/php/include/items.inc.php
	zabbix/frontends/php/include/locales/de_de.inc.php
	zabbix/frontends/php/include/locales/en_gb.inc.php
	zabbix/frontends/php/include/locales/fr_fr.inc.php
	zabbix/frontends/php/include/locales/it_it.inc.php
	zabbix/frontends/php/include/locales/lv_lv.inc.php
	zabbix/frontends/php/include/locales/ru_ru.inc.php
	zabbix/frontends/php/include/locales/sp_sp.inc.php
	zabbix/frontends/php/items.php
	zabbix/frontends/php/servers.php
	zabbix/include/common.h
	zabbix/misc/conf/zabbix_server.conf
	zabbix/src/zabbix_server/housekeeper/housekeeper.c
	zabbix/src/zabbix_server/housekeeper/housekeeper.h
	zabbix/src/zabbix_server/pinger/pinger.c
	zabbix/src/zabbix_server/pinger/pinger.h
	zabbix/src/zabbix_server/poller/poller.c
	zabbix/src/zabbix_server/poller/poller.h
	zabbix/src/zabbix_server/server.c
	zabbix/src/zabbix_server/timer/timer.c
	zabbix/src/zabbix_server/timer/timer.h
	zabbix/upgrades/dbpatches/1.1beta2_to_1.1beta3/mysql/patch.sql
	zabbix/upgrades/dbpatches/1.1beta2_to_1.1beta3/postgresql/patch.sql


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

1 files changed, 83 insertions, 1 deletions

diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index f13e14c2..ece7a259 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -289,10 +289,11 @@
 ;
 		$formula=@iif(isset($_REQUEST["formula"]),$_REQUEST["formula"],"1");
 		$logtimefmt=@iif(isset($_REQUEST["logtimefmt"]),$_REQUEST["logtimefmt"],"");
+		$serverid=@iif(isset($_REQUEST["serverid"]),$_REQUEST["serverid"],1);
 
 		if(isset($_REQUEST["register"])&&($_REQUEST["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,i.trends,i.snmpv3_securityname,i.snmpv3_securitylevel,i.snmpv3_authpassphrase,i.snmpv3_privpassphrase,i.formula,i.logtimefmt from items i,hosts h where i.itemid=".$_REQUEST["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,i.snmpv3_securityname,i.snmpv3_securitylevel,i.snmpv3_authpassphrase,i.snmpv3_privpassphrase,i.formula,i.logtimefmt,i.serverid from items i,hosts h where i.itemid=".$_REQUEST["itemid"]." and h.hostid=i.hostid");
 		
 			$description=DBget_field($result,0,0);
 			$key=DBget_field($result,0,1);
@@ -320,6 +321,7 @@
 
 			$formula=DBget_field($result,0,22);
 			$logtimefmt=DBget_field($result,0,23);
+			$serverid=DBget_field($result,0,24);
 		}
 
 		show_form_begin("items.item");
@@ -356,6 +358,33 @@
 	        }
 		echo "</select>";
 
+	        $result=DBselect("select serverid,host from servers");
+		if(DBnum_rows($result)>=2)
+		{
+			show_table2_v_delimiter($col++);
+			echo S_SERVERNAME;
+			show_table2_h_delimiter();
+			echo "<select class=\"biginput\" name=\"serverid\" value=\"1\">";
+		        while($row=DBfetch($result))
+		        {
+		                $serverid_=$row["serverid"];
+		                $host_=$row["host"];
+				if($serverid==$serverid_)
+				{
+		                	echo "<option value=\"$serverid_\" selected>$host_";
+				}
+				else
+				{
+		                	echo "<option value=\"$serverid_\">$host_";
+				}
+		        }
+			echo "</select>";
+		}
+		else
+		{
+		echo "<input type=\"hidden\" value=1 name=\"serverid\">";
+		}
+
 		show_table2_v_delimiter($col++);
 		echo S_TYPE;
 		show_table2_h_delimiter();
@@ -1495,4 +1524,57 @@
 
 		show_table2_header_end();
 	}
+
+
+
+
+
+
+	function	insert_zabbix_server_form($page,$serverid=0,$create=1)
+	{
+		$host = $serverip = $serverport = "";
+		$col=0;
+
+		$sql="select s.serverid,s.host,s.ip,s.port from servers s where s.serverid=$serverid";
+		$result=DBselect($sql);
+		while($row=DBfetch($result))
+		{
+			$host=$row["host"];
+			$serverip=$row["ip"];
+			$serverport=$row["port"];
+		}
+
+		show_form_begin("index.servers");
+		echo "Servers";
+
+		show_table2_v_delimiter($col++);
+		echo "<form method=\"post\" action=\"$page\">";
+
+		echo S_SERVER_HOST;
+		show_table2_h_delimiter();
+		echo "<input class=\"biginput\" name=\"host\" value=\"$host\" size=20>";
+
+		show_table2_v_delimiter($col++);
+		echo S_SERVER_IP;
+		show_table2_h_delimiter();
+		echo "<input class=\"biginput\" name=\"serverip\" value=\"$serverip\" size=20>";
+
+		show_table2_v_delimiter($col++);
+		echo S_SERVER_PORT;
+		show_table2_h_delimiter();
+		echo "<input class=\"biginput\" name=\"serverport\" value=\"$serverport\" size=20>";
+
+		show_table2_v_delimiter2();
+		if($serverid==0)
+		{
+			echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"Add\">";
+		}
+		else
+		{
+			echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"Update\">";
+		}
+		echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"Delete\">";
+		show_table2_header_end();
+	}
+
 ?>