Update of actions in GUI.

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

1 files changed, 14 insertions, 16 deletions

diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index 31e73ffd..afa34a76 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -34,15 +34,15 @@
 		return	$result;
 	}
 
-	# Update Action
+	# Add Action
 
-	function	update_action( $actionid, $filter_triggerid, $userid, $good, $delay, $subject, $message, $severity, $recipient, $usrgrpid, $maxrepeats, $repeatdelay)
+	function	add_action( $userid, $delay, $subject, $message, $recipient, $usrgrpid, $maxrepeats, $repeatdelay)
 	{
-		if(!check_right_on_trigger("A",$triggerid))
-		{
-                        error("Insufficient permissions");
-                        return 0;
-		}
+//		if(!check_right_on_trigger("A",$triggerid))
+//		{
+//                      error("Insufficient permissions");
+//                      return 0;
+//		}
 
 		if($recipient == RECIPIENT_TYPE_USER)
 		{
@@ -52,19 +52,17 @@
 		{
 			$id = $usrgrpid;
 		}
-		$subject=addslashes($subject);
-		$message=addslashes($message);
 
-		$sql="update actions set filter_triggerid=$filter_triggerid,userid=$id,good=$good,delay=$delay,nextcheck=0,subject='$subject',message='$message',severity=$severity,recipient=$recipient,maxrepeats=$maxrepeats,repeatdelay=$repeatdelay where actionid=$actionid";
+		$sql="insert into actions (userid,delay,nextcheck,subject,message,recipient,maxrepeats,repeatdelay) values ($id,$delay,0,'$subject','$message',$recipient,$maxrepeats,$repeatdelay)";
 		$result=DBexecute($sql);
-		return $result;
+		return DBinsert_id($result,"actions","actionid");
 	}
 
-	# Add Action
+	# Update Action
 
-	function	add_action( $userid, $delay, $subject, $message, $recipient, $usrgrpid, $maxrepeats, $repeatdelay)
+	function	update_action($actionid, $userid, $delay, $subject, $message, $recipient, $usrgrpid, $maxrepeats, $repeatdelay)
 	{
-//		if(!check_right_on_trigger("A",$triggerid))
+//		if(!check_right_on_trigger("U",$triggerid))
 //		{
 //                      error("Insufficient permissions");
 //                      return 0;
@@ -79,9 +77,9 @@
 			$id = $usrgrpid;
 		}
 
-		$sql="insert into actions (userid,delay,nextcheck,subject,message,recipient,maxrepeats,repeatdelay) values ($id,$delay,0,'$subject','$message',$recipient,$maxrepeats,$repeatdelay)";
+		$sql="update actions set userid=$id,delay=$delay,nextcheck=0,subject='$subject',message='$message',recipient=$recipient,maxrepeats=$maxrepeats, repeatdelay=$repeatdelay where actionid=$actionid";
 		$result=DBexecute($sql);
-		return DBinsert_id($result,"actions","actionid");
+		return $result;
 	}
 
 	# Delete Action by userid