Not finished:

 - new concept of defenition of actions, one screen (Alexei)
 - new fields for table 'actions' (Alexei)


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

4 files changed, 16 insertions, 18 deletions

diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index f3f4df21..db6f9f81 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -276,4 +276,18 @@
 			}
 		}
 	}
+
+	function	get_source_description($source)
+	{
+		$desc="Unknown";
+		if($source==1)
+		{
+			$desc="IT Service";
+		}
+		elseif($source==0)
+		{
+			$desc="Trigger";
+		}
+		return $desc;
+	}
 ?>
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 05e38709..25e6b82c 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -573,23 +573,6 @@
 	}
 */
 
-	function	get_scope_description($scope)
-	{
-		$desc="Unknown";
-		if($scope==2)
-		{
-			$desc="All";
-		}
-		elseif($scope==1)
-		{
-			$desc="Host";
-		}
-		elseif($scope==0)
-		{
-			$desc="Trigger";
-		}
-		return $desc;
-	}
 
 //	The hash has form <md5sum of triggerid>,<sum of priorities>
 	function	calc_trigger_hash()
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index a5b2b41d..c63bfd74 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -1699,7 +1699,7 @@
 		echo nbsp(S_ACTION_TYPE);
 		show_table2_h_delimiter();
 		echo "<select class=\"biginput\" name=\"actiontype\" size=\"1\" onChange=\"submit()\">";
-		echo "<option value=\"0\""; if($actiontype==0) echo " selected"; echo ">".S_MESSAGE;
+		echo "<option value=\"0\""; if($actiontype==0) echo " selected"; echo ">".S_SEND_MESSAGE;
 		echo "<option value=\"1\""; if($actiontype==1) echo " selected"; echo ">".S_REMOTE_COMMAND;
 		echo "</select>";
 
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 6dee0983..b9d47e7b 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -53,6 +53,7 @@
 	"S_FILTER_TRIGGER_SEVERITY"=>		"Filter: Trigger severity",
 	"S_FILTER_WHEN_TRIGGER_BECOMES"=>	"Filter: When trigger becomes",
 	"S_ACTION_TYPE"=>			"Action type",
+	"S_SEND_MESSAGE"=>			"Send message",
 	"S_REMOTE_COMMAND"=>			"Remote command",
 
 //	actions.php