- developed group permission system (Eugene)

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

1 files changed, 14 insertions, 14 deletions

diff --git a/frontends/php/include/acknow.inc.php b/frontends/php/include/acknow.inc.php
index 943d376f..5d08ef03 100644
--- a/frontends/php/include/acknow.inc.php
+++ b/frontends/php/include/acknow.inc.php
@@ -19,30 +19,30 @@
 **/
 ?>
 <?php
-	function	get_last_alarm_by_triggerid($triggerid)
+	function	get_last_event_by_triggerid($triggerid)
 	{
-		$db_alarms = DBselect("select * from alarms where triggerid=$triggerid".
-			" order by clock desc");
-		$row=DBfetch($db_alarms,1);
-		if(!$row)	return FALSE;
-		return $row;
+		$event_data = DBfetch(DBselect("select * from events where triggerid=$triggerid".
+			" order by clock desc", 1));
+		if(!$event_data)
+			return FALSE;
+		return $event_data;
 	}
 
-	function 	get_acknowledges_by_alarmid($alarmid)
+	function 	get_acknowledges_by_eventid($eventid)
 	{
-		return DBselect("select * from acknowledges where alarmid=$alarmid");
+		return DBselect("select * from acknowledges where eventid=$eventid");
 	}
 
-	function	add_acknowledge_coment($alarmid, $userid, $message)
+	function	add_acknowledge_coment($eventid, $userid, $message)
 	{
-		$result = set_alarm_acnowledged($alarmid);
+		$result = set_event_acnowledged($eventid);
 		if(!$result)
 			return $result;
 
 		$acknowledgeid = get_dbid("acknowledges","acknowledgeid");
 
-		$result =  DBexecute("insert into acknowledges (acknowledgeid,userid,alarmid,clock,message)".
-			" values ($acknowledgeid,$userid,$alarmid,".time().",".zbx_dbstr($message).")");
+		$result =  DBexecute("insert into acknowledges (acknowledgeid,userid,eventid,clock,message)".
+			" values ($acknowledgeid,$userid,$eventid,".time().",".zbx_dbstr($message).")");
 
 		if(!$result)
 			return $result;
@@ -50,8 +50,8 @@
 		return $acknowledgeid;
 	}
 
-	function	set_alarm_acnowledged($alarmid)
+	function	set_event_acnowledged($eventid)
 	{
-		return DBexecute("update alarms set acknowledged=1 where alarmid=$alarmid");
+		return DBexecute("update events set acknowledged=1 where eventid=$eventid");
 	}
 ?>