added user group for database down messages [GUI]

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

3 files changed, 67 insertions, 19 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index b8c2b0ac..fd1ee764 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1011,17 +1011,51 @@ else
 
 	# Update configuration
 
-	function	update_config($event_history,$alert_history,$refresh_unsupported,$work_period)
+	function	update_config($event_history,$alert_history,$refresh_unsupported,$work_period,$alert_usrgrpid)
 	{
-		if(validate_period($work_period) != 0)
+		global $ZBX_CURNODEID;
+
+		$update = array();
+
+		if(!is_null($event_history))
+		{
+			$update[] = 'event_history='.$event_history;
+		}
+		if(!is_null($alert_history))
+		{
+			$update[] = 'alert_history='.$alert_history;
+		}
+		if(!is_null($refresh_unsupported))
+		{
+			$update[] = 'refresh_unsupported='.$refresh_unsupported;
+		}
+		if(!is_null($work_period))
+		{
+			if(validate_period($work_period) != 0)
+			{
+				error(S_ICORRECT_WORK_PERIOD);
+				return NULL;
+			}
+			$update[] = 'work_period='.zbx_dbstr($work_period);
+		}
+		if(!is_null($alert_usrgrpid))
+		{
+			if($alert_usrgrpid != 0 && !DBfetch(DBselect('select usrgrpid from usrgrp where usrgrpid='.$alert_usrgrpid)))
+			{
+				error(S_INCORRECT_GROUP);;
+				return NULL;
+			}
+			$update[] = 'alert_usrgrpid='.$alert_usrgrpid;
+		}
+		if(count($update) == 0)
 		{
-			error("Icorrect work period");
+			error(S_NOTHING_TO_DO);
 			return NULL;
 		}
 
-		return	DBexecute("update config set event_history=$event_history,alert_history=$alert_history,".
-			" refresh_unsupported=$refresh_unsupported,".
-			" work_period=".zbx_dbstr($work_period));
+		return	DBexecute('update config set '.implode(',',$update).
+			' where '.DBid2nodeid('configid')."=".$ZBX_CURNODEID);
+
 	}
 
 	function	&get_table_header($col1, $col2=SPACE)
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 8f002940..f9a2bd29 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -3396,12 +3396,13 @@
 		$frmHouseKeep = new CFormTable(S_HOUSEKEEPER,"config.php");
 		$frmHouseKeep->SetHelp("web.config.housekeeper.php");
 		$frmHouseKeep->AddVar("config",get_request("config",0));
-		$frmHouseKeep->AddVar("refresh_unsupported",$config["refresh_unsupported"]);
-		$frmHouseKeep->AddVar("work_period",$config["work_period"]);
+
 		$frmHouseKeep->AddRow(S_DO_NOT_KEEP_ACTIONS_OLDER_THAN,
 			new CTextBox("alert_history",$config["alert_history"],8));
+
 		$frmHouseKeep->AddRow(S_DO_NOT_KEEP_EVENTS_OLDER_THAN,
 			new CTextBox("event_history",$config["event_history"],8));
+
 		$frmHouseKeep->AddItemToBottomRow(new CButton("save",S_SAVE));
 		$frmHouseKeep->Show();
 	}
@@ -3413,28 +3414,37 @@
 		$frmHouseKeep = new CFormTable(S_WORKING_TIME,"config.php");
 		$frmHouseKeep->SetHelp("web.config.workperiod.php");
 		$frmHouseKeep->AddVar("config",get_request("config",7));
-		$frmHouseKeep->AddVar("alert_history",$config["alert_history"]);
-		$frmHouseKeep->AddVar("event_history",$config["event_history"]);
-		$frmHouseKeep->AddVar("refresh_unsupported",$config["refresh_unsupported"]);
+
 		$frmHouseKeep->AddRow(S_WORKING_TIME,
 			new CTextBox("work_period",$config["work_period"],35));
+
 		$frmHouseKeep->AddItemToBottomRow(new CButton("save",S_SAVE));
 		$frmHouseKeep->Show();
 	}
 
 	function	insert_other_parameters_form()
 	{
+		global $ZBX_CURNODEID;
+
 		$config=select_config();
 		
-		$frmHouseKeep = new CFormTable(S_OTHER_PARAMETERS,"config.php");
-		$frmHouseKeep->SetHelp("web.config.other.php");
-		$frmHouseKeep->AddVar("config",get_request("config",5));
-		$frmHouseKeep->AddVar("alert_history",$config["alert_history"]);
-		$frmHouseKeep->AddVar("event_history",$config["event_history"]);
-		$frmHouseKeep->AddVar("work_period",$config["work_period"]);
+		$frmHouseKeep = new CFormTable(S_OTHER_PARAMETERS,'config.php');
+		$frmHouseKeep->SetHelp('web.config.other.php');
+		$frmHouseKeep->AddVar('config',get_request('config',5));
+		
 		$frmHouseKeep->AddRow(S_REFRESH_UNSUPPORTED_ITEMS,
-			new CTextBox("refresh_unsupported",$config["refresh_unsupported"],8));
-		$frmHouseKeep->AddItemToBottomRow(new CButton("save",S_SAVE));
+			new CTextBox('refresh_unsupported',$config['refresh_unsupported'],8));
+
+		$cmbUsrGrp = new CComboBox('alert_usrgrpid', $config['alert_usrgrpid']);
+		$cmbUsrGrp->AddItem(0, S_NONE);
+		$result=DBselect('select usrgrpid,name from usrgrp'.
+				' where '.DBid2nodeid('usrgrpid').'='.$ZBX_CURNODEID.
+				' order by name');
+		while($row=DBfetch($result))
+			$cmbUsrGrp->AddItem($row['usrgrpid'], $row['name']);
+		$frmHouseKeep->AddRow(S_USER_GROUP_FOR_DATABASE_DOWN_MESSAGE,$cmbUsrGrp);
+
+		$frmHouseKeep->AddItemToBottomRow(new CButton('save',S_SAVE));
 		$frmHouseKeep->Show();
 	}
 
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 98cec786..c30f697c 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -376,6 +376,10 @@
 	"S_CREATE_IMAGE"=>			"Create Image",
 	"S_CREATE_RULE"=>			"Create Rule",
 	"S_WORKING_TIME"=>			"Working time",
+	"S_USER_GROUP_FOR_DATABASE_DOWN_MESSAGE"=>"User group for database down message",
+	"S_INCORRECT_GROUP"=>			"Incorrect group",
+	"S_NOTHING_TO_DO"=>			"Nothing to do",
+	"S_ICORRECT_WORK_PERIOD"=>		"Icorrect work period",
 	
 //	nodes.php
 	"S_NODE"=>				"Node",