Minor changes.

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

3 files changed, 9 insertions, 8 deletions

diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index 10a732c2..fafe4ab5 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -21,15 +21,15 @@
 <?php
 	# Update Action
 
-	function	update_action( $actionid, $triggerid, $userid, $good, $delay, $subject, $message, $scope, $severity, $recipient, $usrgrpid)
+	function	update_action( $actionid, $triggerid, $userid, $good, $delay, $subject, $message, $scope, $severity, $recipient, $usrgrpid, $maxrepeats, $repeatdelay)
 	{
 		delete_action($actionid);
-		return add_action( $triggerid, $userid, $good, $delay, $subject, $message, $scope, $severity, $recipient, $usrgrpid);
+		return add_action( $triggerid, $userid, $good, $delay, $subject, $message, $scope, $severity, $recipient, $usrgrpid, $maxrepeats, $repeatdelay);
 	}
 
 	# Add Action
 
-	function	add_action( $triggerid, $userid, $good, $delay, $subject, $message, $scope, $severity, $recipient, $usrgrpid)
+	function	add_action( $triggerid, $userid, $good, $delay, $subject, $message, $scope, $severity, $recipient, $usrgrpid, $maxrepeats, $repeatdelay)
 	{
 		if(!check_right_on_trigger("A",$triggerid))
 		{
@@ -48,7 +48,7 @@
 
 		if($scope==2)
 		{
-			$sql="insert into actions (triggerid,userid,good,delay,nextcheck,subject,message,scope,severity,recipient) values (0,$id,$good,$delay,0,'*Automatically generated*','*Automatically generated*',$scope,$severity,$recipient)";
+			$sql="insert into actions (triggerid,userid,good,delay,nextcheck,subject,message,scope,severity,recipient,maxrepeats,repeatdelay) values (0,$id,$good,$delay,0,'*Automatically generated*','*Automatically generated*',$scope,$severity,$recipient,$maxrepeats,$repeatdelay)";
 			$result=DBexecute($sql);
 			return DBinsert_id($result,"actions","actionid");
 		}
@@ -59,7 +59,7 @@
 			$result=DBselect($sql);
 			while($row=DBfetch($result))
 			{
-				$sql="insert into actions (triggerid,userid,good,delay,nextcheck,subject,message,scope,severity,recipient) values (".$row["hostid"].",$id,$good,$delay,0,'*Automatically generated*','*Automatically generated*',$scope,$severity,$recipient)";
+				$sql="insert into actions (triggerid,userid,good,delay,nextcheck,subject,message,scope,severity,recipientmaxrepeats,repeatdelay) values (".$row["hostid"].",$id,$good,$delay,0,'*Automatically generated*','*Automatically generated*',$scope,$severity,$recipient,$maxrepeats,$repeatdelay)";
 //				echo "$sql<br>";
 				DBexecute($sql);
 			}
@@ -67,7 +67,7 @@
 		}
 		else
 		{
-			$sql="insert into actions (triggerid,userid,good,delay,nextcheck,subject,message,scope,severity,recipient) values ($triggerid,$id,$good,$delay,0,'$subject','$message',$scope,$severity,$recipient)";
+			$sql="insert into actions (triggerid,userid,good,delay,nextcheck,subject,message,scope,severity,recipient,maxrepeats,repeatdelay) values ($triggerid,$id,$good,$delay,0,'$subject','$message',$scope,$severity,$recipient,$maxrepeats,$repeatdelay)";
 			$result=DBexecute($sql);
 			return DBinsert_id($result,"actions","actionid");
 		}
@@ -140,7 +140,7 @@
 			{
 				$host=get_host_by_hostid($row["hostid"]);
 				$message=str_replace("{".$host_template["host"].":", "{".$host["host"].":", $action["message"]);
-				add_action($row2["triggerid"], $action["userid"], $action["good"], $action["delay"], $action["subject"], $message, $action["scope"], $action["severity"], $action["recipient"], $action["userid"]);
+				add_action($row2["triggerid"], $action["userid"], $action["good"], $action["delay"], $action["subject"], $message, $action["scope"], $action["severity"], $action["recipient"], $action["userid"], $action["maxrepeats"],$action["repeatdelay"]);
 			}
 		}
 	}
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index d73cf800..888f1b87 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -78,7 +78,7 @@
 	{
 		global $DB,$DB_TYPE;
 
-#		echo $query."<br>";
+//		echo $query."<br>";
 
 		if($DB_TYPE == "MYSQL")
 		{
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index a74c3158..991d4dc3 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -84,6 +84,7 @@
 	"S_REPEATS"=>				"Repeats",
 	"S_NO_REPEATS"=>			"No repeats",
 	"S_NUMBER_OF_REPEATS"=>			"Number of repeats",
+	"S_DELAY_BETWEEN_REPEATS"=>		"Delay between repeats",
 
 //	alarms.php
 	"S_ALARMS"=>				"Alarms",