- increased message size for alerts (Eugene)

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

3 files changed, 3 insertions, 3 deletions

diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index c0833e01..327b4e20 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -286,7 +286,7 @@
 		
 		$denyed_hosts = get_accessible_hosts_by_user($USER_DETAILS, PERM_READ_ONLY, PERM_MODE_LT);
 		
-		$result=DBselect("select a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,a.status,a.retries,".
+		$result=DBselect("select distinct a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,a.status,a.retries,".
 				"a.error from alerts a,media_type mt,functions f,items i ".
 				" where mt.mediatypeid=a.mediatypeid and a.triggerid=f.triggerid and f.itemid=i.itemid ".
 				" and i.hostid not in (".$denyed_hosts.")".
diff --git a/frontends/php/include/events.inc.php b/frontends/php/include/events.inc.php
index 9e402ee1..6334725b 100644
--- a/frontends/php/include/events.inc.php
+++ b/frontends/php/include/events.inc.php
@@ -39,7 +39,7 @@
 			$sql_cond = " and h.hostid=hg.hostid and hg.groupid=".$groupid;
 		}
 
-		$result = DBselect(" select t.triggerid,t.priority,t.description,h.host,e.clock,e.value ".
+		$result = DBselect("select distinct t.triggerid,t.priority,t.description,h.host,e.clock,e.value ".
 			" from events e, triggers t, functions f, items i, hosts h ".$sql_from.
 			" where ".DBid2nodeid("t.triggerid")."=".$nodeid.
 			" and e.triggerid=t.triggerid and t.triggerid=f.triggerid and f.itemid=i.itemid ".
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 998ed7b5..9a18ba19 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -1826,7 +1826,7 @@
 
 		$uid=null;
 
-		$frmAction = new CFormTable(S_ACTION,'actionconf.php');
+		$frmAction = new CFormTable(S_ACTION,'actionconf.php','post');
 		$frmAction->SetHelp('web.actions.action.php');
 
 		$conditions = get_request("conditions",array());