Minor changes.

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

4 files changed, 23 insertions, 15 deletions

diff --git a/frontends/php/actions.php b/frontends/php/actions.php
index 8e709eae..c2016f94 100644
--- a/frontends/php/actions.php
+++ b/frontends/php/actions.php
@@ -40,7 +40,8 @@
 	{
 		if($_GET["register"]=="add")
 		{
-			$actionid=add_action( $_GET["triggerid"], $_GET["userid"], $_GET["good"], $_GET["delay"], $_GET["subject"], $_GET["message"],$_GET["scope"],$_GET["severity"],$_GET["recipient"],$_GET["usrgrpid"]);
+			if($_GET["repeat"]==0)	$_GET["maxrepeats"]=0;
+			$actionid=add_action( $_GET["triggerid"], $_GET["userid"], $_GET["good"], $_GET["delay"], $_GET["subject"], $_GET["message"],$_GET["scope"],$_GET["severity"],$_GET["recipient"],$_GET["usrgrpid"],$_GET["maxrepeats"],$_GET["repeatdelay"]);
 			add_action_to_linked_hosts($actionid);
 			show_messages($actionid,S_ACTION_ADDED,S_CANNOT_ADD_ACTION);
 			if($actionid)
@@ -59,8 +60,9 @@
 		}
 		if($_GET["register"]=="update")
 		{
-			$result=update_action( $_GET["actionid"], $_GET["triggerid"], $_GET["userid"], $_GET["good"], $_GET["delay"], $_GET["subject"], $_GET["message"],$_GET["scope"],$_GET["severity"],$_GET["recipient"],$_GET["usrgrpid"]);
-			show_messages($result,S_ACTION_UPDATED,S_CANNOT_UPATE_ACTION);
+			if($_GET["repeat"]==0)	$_GET["maxrepeats"]=0;
+			$result=update_action( $_GET["actionid"], $_GET["triggerid"], $_GET["userid"], $_GET["good"], $_GET["delay"], $_GET["subject"], $_GET["message"],$_GET["scope"],$_GET["severity"],$_GET["recipient"],$_GET["usrgrpid"],$_GET["maxrepeats"],$_GET["repeatdelay"]);
+			show_messages($result,S_ACTION_UPDATED,S_CANNOT_UPDATE_ACTION);
 			if($result)
 			{
 				if(isset($_GET["userid"]))
@@ -220,8 +222,8 @@
 		$scope=@iif(isset($_GET["scope"]),$_GET["scope"],DBget_field($result,0,7));
 		$severity=DBget_field($result,0,8);
 		$recipient=@iif(isset($_GET["recipient"]),$_GET["recipient"],DBget_field($result,0,9));
-		$maxrepeats=DBget_field($result,0,9);
-		$repeatdelay=DBget_field($result,0,10);
+		$maxrepeats=DBget_field($result,0,10);
+		$repeatdelay=DBget_field($result,0,11);
 		if($maxrepeats==0)
 		{
 			$repeat=0;
@@ -391,8 +393,8 @@
 	show_table2_h_delimiter();
 	echo "<select class=\"biginput\" name=\"repeat\" size=\"1\" onChange=\"submit()\">";
 
-	echo "<option value=\"0\""; if($maxrepeats==0) echo " selected"; echo ">".S_NO_REPEATS;
-	echo "<option value=\"1\""; if($maxrepeats!=0) echo " selected"; echo ">".S_REPEAT;
+	echo "<option value=\"0\""; if($repeat==0) echo " selected"; echo ">".S_NO_REPEATS;
+	echo "<option value=\"1\""; if($repeat==1) echo " selected"; echo ">".S_REPEAT;
 	echo "</select>";
 
 	if($repeat>0)
@@ -401,6 +403,11 @@
 		echo S_NUMBER_OF_REPEATS;
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"maxrepeats\" value=\"$maxrepeats\" size=2>";
+
+		show_table2_v_delimiter($col++);
+		echo S_DELAY_BETWEEN_REPEATS;
+		show_table2_h_delimiter();
+		echo "<input class=\"biginput\" name=\"repeatdelay\" value=\"$repeatdelay\" size=2>";
 	}
 
 	show_table2_v_delimiter2();
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",