summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--frontends/php/actionconf.php18
-rw-r--r--frontends/php/include/actions.inc.php10
-rw-r--r--frontends/php/include/forms.inc.php31
-rw-r--r--frontends/php/include/locales/cn_zh.inc.php5
-rw-r--r--frontends/php/include/locales/de_de.inc.php5
-rw-r--r--frontends/php/include/locales/en_gb.inc.php5
-rw-r--r--frontends/php/include/locales/ja_jp.inc.php5
-rw-r--r--frontends/php/include/locales/nl_nl.inc.php5
-rw-r--r--frontends/php/include/locales/sv_se.inc.php5
10 files changed, 8 insertions, 83 deletions
diff --git a/ChangeLog b/ChangeLog
index 3726af25..277d4c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@ Changes for 1.3.4:
- fixed warning when enabling/disabling action (Alexei)
- added support of avg() for items having integer type (Alexei)
- added user group for database down messages (Alexei/Eugene)
- - removed support of action repeats (Alexei)
+ - removed support of action repeats (Alexei/Eugene)
- fixed upgrade of rights,sysmaps,sysmaps_elements (Alexei)
- fixed initial creation of user rights in data.sql (Alexei)
- fixes of PostgreSQL compile (Alexei)
diff --git a/frontends/php/actionconf.php b/frontends/php/actionconf.php
index 8f6826cd..273e0493 100644
--- a/frontends/php/actionconf.php
+++ b/frontends/php/actionconf.php
@@ -47,13 +47,9 @@ include_once "include/page_header.php";
"subject"=> array(T_ZBX_STR, O_OPT, NULL, NOT_EMPTY, '{actiontype}==0&&isset({save})'),
"message"=> array(T_ZBX_STR, O_OPT, NULL, NOT_EMPTY, '{actiontype}==0&&isset({save})'),
"scripts"=> array(T_ZBX_STR, O_OPT, NULL, NOT_EMPTY, '{actiontype}==1&&isset({save})'),
- "repeat"=> array(T_ZBX_INT, O_OPT, NULL, IN("0,1"), 'isset({save})'),
"status"=> array(T_ZBX_INT, O_OPT, NULL, IN("0,1"), 'isset({save})'),
"evaltype"=> array(T_ZBX_INT, O_OPT, NULL, IN(ACTION_EVAL_TYPE_AND_OR.','.ACTION_EVAL_TYPE_AND.','.ACTION_EVAL_TYPE_OR), 'isset({save})'),
- "maxrepeats"=> array(T_ZBX_INT, O_OPT, NULL, BETWEEN(0,65535),'{repeat}==1&&isset({save})'),
- "repeatdelay"=> array(T_ZBX_INT, O_OPT, NULL, BETWEEN(0,65535),'{repeat}==1&&isset({save})'),
-
"conditions"=> array(NULL, O_OPT, NULL, NULL, NULL),
// "conditions[i][type]"=> array(T_ZBX_INT, O_OPT, NULL, NULL, NULL),
// "conditions[i][operator]"=> array(T_ZBX_INT, O_OPT, NULL, NULL, NULL),
@@ -103,12 +99,6 @@ include_once "include/page_header.php";
}
elseif(isset($_REQUEST["save"]))
{
- if($_REQUEST["repeat"]==0)
- {
- $_REQUEST["maxrepeats"]=0;
- $_REQUEST["repeatdelay"]=600;
- }
-
if(isset($_REQUEST["actionid"]))
{
// TODO check permission by new value.
@@ -116,8 +106,7 @@ include_once "include/page_header.php";
$result = update_action($actionid,
$_REQUEST['actiontype'],$_REQUEST['userid'],
$_REQUEST["subject"], $_REQUEST["message"],$_REQUEST["recipient"],
- $_REQUEST["maxrepeats"],$_REQUEST["repeatdelay"],$_REQUEST["status"],
- $_REQUEST["scripts"],$_REQUEST["evaltype"]);
+ $_REQUEST["status"],$_REQUEST["scripts"],$_REQUEST["evaltype"]);
show_messages($result,S_ACTION_UPDATED,S_CANNOT_UPDATE_ACTION);
} else {
@@ -127,8 +116,7 @@ include_once "include/page_header.php";
$actionid=add_action(
$_REQUEST['actiontype'],$_REQUEST['userid'],
$_REQUEST["subject"],$_REQUEST["message"],$_REQUEST["recipient"],
- $_REQUEST["maxrepeats"],$_REQUEST["repeatdelay"],$_REQUEST["status"],
- $_REQUEST["scripts"],$_REQUEST["evaltype"]);
+ $_REQUEST["status"],$_REQUEST["scripts"],$_REQUEST["evaltype"]);
$result=$actionid;
show_messages($result,S_ACTION_ADDED,S_CANNOT_ADD_ACTION);
@@ -281,7 +269,6 @@ include_once "include/page_header.php";
S_CONDITIONS,
$_REQUEST["actiontype"] == ACTION_TYPE_MESSAGE ? S_SEND_MESSAGE_TO : S_REMOTE_COMMAND,
$_REQUEST["actiontype"] == ACTION_TYPE_MESSAGE ? S_SUBJECT : NULL,
- S_REPEATS,
S_STATUS));
$result=DBselect("select * from actions where actiontype=".$_REQUEST["actiontype"].
@@ -350,7 +337,6 @@ include_once "include/page_header.php";
$conditions,
$recipient,
$subject,
- $row["maxrepeats"] == 0 ? S_NO_REPEATS : $row["maxrepeats"],
$status
));
}
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index 68b8c84f..436ae2b1 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -85,7 +85,7 @@
# Add Action
- function add_action($actiontype,$userid,$subject,$message,$recipient,$maxrepeats,$repeatdelay,$status,$scripts,$evaltype)
+ function add_action($actiontype,$userid,$subject,$message,$recipient,$status,$scripts,$evaltype)
{
// TODO check permission by new value.
@@ -102,8 +102,8 @@
}
$actionid=get_dbid("actions","actionid");
$sql="insert into actions (actionid,actiontype,userid,subject,message,recipient,".
- "maxrepeats,repeatdelay,status,scripts,evaltype) values ($actionid,$actiontype,$userid,".zbx_dbstr($subject).",".
- zbx_dbstr($message).",$recipient,$maxrepeats,$repeatdelay,$status,".zbx_dbstr($scripts).",$evaltype)";
+ "status,scripts,evaltype) values ($actionid,$actiontype,$userid,".zbx_dbstr($subject).",".
+ zbx_dbstr($message).",$recipient,$status,".zbx_dbstr($scripts).",$evaltype)";
$result=DBexecute($sql);
if(!$result)
return $result;
@@ -112,7 +112,7 @@
# Update Action
- function update_action($actionid,$actiontype,$userid,$subject,$message,$recipient,$maxrepeats,$repeatdelay,$status,$scripts,$evaltype)
+ function update_action($actionid,$actiontype,$userid,$subject,$message,$recipient,$status,$scripts,$evaltype)
{
// TODO check permission by new value.
@@ -128,7 +128,7 @@
if(!check_commands($scripts)) return FALSE;
}
- $result=DBexecute("update actions set actiontype=$actiontype,userid=$userid,subject=".zbx_dbstr($subject).",message=".zbx_dbstr($message).",recipient=$recipient,maxrepeats=$maxrepeats, repeatdelay=$repeatdelay,status=$status,scripts=".zbx_dbstr($scripts).",evaltype=$evaltype where actionid=$actionid");
+ $result=DBexecute("update actions set actiontype=$actiontype,userid=$userid,subject=".zbx_dbstr($subject).",message=".zbx_dbstr($message).",recipient=$recipient,status=$status,scripts=".zbx_dbstr($scripts).",evaltype=$evaltype where actionid=$actionid");
return $result;
}
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index f9a2bd29..70bd4464 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -2538,24 +2538,10 @@
$subject = $action["subject"];
$message = $action["message"];
$recipient = $action["recipient"];
- $maxrepeats = $action["maxrepeats"];
- $repeatdelay = $action["repeatdelay"];
$status = $action["status"];
$scripts = $action["scripts"];
$evaltype = $action["evaltype"];
- if(isset($_REQUEST["repeat"]))
- {
- $repeat=$_REQUEST["repeat"];
- }
- else if($maxrepeats==0)
- {
- $repeat=0;
- }
- else
- {
- $repeat=1;
- }
$result=DBselect("select conditiontype, operator, value from conditions".
" where actionid=".$_REQUEST["actionid"]." order by conditiontype");
@@ -2580,9 +2566,6 @@
$scope = get_request("scope",0);
$recipient = get_request("recipient",RECIPIENT_TYPE_GROUP);
$severity = get_request("severity",0);
- $maxrepeats = get_request("maxrepeats",0);
- $repeatdelay = get_request("repeatdelay",600);
- $repeat = get_request("repeat",0);
$status = get_request("status",ACTION_STATUS_ENABLED);
$uid = get_request("userid",0);
$scripts = get_request("scripts","");
@@ -2842,20 +2825,6 @@
$frmAction->AddVar("message",$message);
}
- $cmbRepeat = new CComboBox('repeat',$repeat,'submit()');
- $cmbRepeat->AddItem(0,S_NO_REPEATS);
- $cmbRepeat->AddItem(1,S_REPEAT);
- $frmAction->AddRow(S_REPEAT, $cmbRepeat);
-
- if($repeat>0)
- {
- $frmAction->AddRow(S_NUMBER_OF_REPEATS, new CTextBox('maxrepeats',$maxrepeats,5));
- $frmAction->AddRow(S_DELAY_BETWEEN_REPEATS, new CTextBox('repeatdelay',$repeatdelay,5));
- } else {
- $frmAction->AddVar("maxrepeats",$maxrepeats);
- $frmAction->AddVar("repeatdelay",$repeatdelay);
- }
-
$cmbStatus = new CComboBox('status',$status);
$cmbStatus->AddItem(0,S_ENABLED);
$cmbStatus->AddItem(1,S_DISABLED);
diff --git a/frontends/php/include/locales/cn_zh.inc.php b/frontends/php/include/locales/cn_zh.inc.php
index 3ba66a7d..50e9e4b6 100644
--- a/frontends/php/include/locales/cn_zh.inc.php
+++ b/frontends/php/include/locales/cn_zh.inc.php
@@ -62,11 +62,6 @@
"S_AVERAGE"=> "Average",
"S_HIGH"=> "严重",
"S_DISASTER"=> "灾难",
- "S_REPEAT"=> "重复",
- "S_REPEATS"=> "重复",
- "S_NO_REPEATS"=> "不重复",
- "S_NUMBER_OF_REPEATS"=> "重复次数",
- "S_DELAY_BETWEEN_REPEATS"=> "重复间隔",
// alarms.php
"S_ALARMS"=> "alarms",
diff --git a/frontends/php/include/locales/de_de.inc.php b/frontends/php/include/locales/de_de.inc.php
index 1d7755d1..c610ffaa 100644
--- a/frontends/php/include/locales/de_de.inc.php
+++ b/frontends/php/include/locales/de_de.inc.php
@@ -69,11 +69,6 @@
"S_AVERAGE"=> "Durchschnitt",
"S_HIGH"=> "Hoch",
"S_DISASTER"=> "Desaster",
- "S_REPEAT"=> "Erinnern",
- "S_REPEATS"=> "Erinnerungen",
- "S_NO_REPEATS"=> "keine Erinnerung",
- "S_NUMBER_OF_REPEATS"=> "Anzahl der Erinnerungen",
- "S_DELAY_BETWEEN_REPEATS"=> "Zeitversatz zwischen Erinnerungen",
// alarms.php
"S_ALARMS"=> "Alarme",
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index c30f697c..5245e24e 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -202,11 +202,6 @@
"S_AVERAGE"=> "Average",
"S_HIGH"=> "High",
"S_DISASTER"=> "Disaster",
- "S_REPEAT"=> "Repeat",
- "S_REPEATS"=> "Repeats",
- "S_NO_REPEATS"=> "No repeats",
- "S_NUMBER_OF_REPEATS"=> "Number of repeats",
- "S_DELAY_BETWEEN_REPEATS"=> "Delay between repeats",
"S_AND_OR_BIG"=> "AND / OR",
"S_AND_BIG"=> "AND",
"S_AND"=> "and",
diff --git a/frontends/php/include/locales/ja_jp.inc.php b/frontends/php/include/locales/ja_jp.inc.php
index 808f2c9f..0fbf23e6 100644
--- a/frontends/php/include/locales/ja_jp.inc.php
+++ b/frontends/php/include/locales/ja_jp.inc.php
@@ -78,11 +78,6 @@
"S_AVERAGE"=> "Average",
"S_HIGH"=> "High",
"S_DISASTER"=> "Disaster",
- "S_REPEAT"=> "绻般倞杩斻仐",
- "S_REPEATS"=> "绻般倞杩斻仐",
- "S_NO_REPEATS"=> "绻般倞杩斻仐",
- "S_NUMBER_OF_REPEATS"=> "绻般倞杩斻仐鍥炴暟",
- "S_DELAY_BETWEEN_REPEATS"=> "绻般倞杩斻仐闁撻殧",
// alarms.php
"S_ALARMS"=> "銈€儵銉笺儬",
diff --git a/frontends/php/include/locales/nl_nl.inc.php b/frontends/php/include/locales/nl_nl.inc.php
index 54729282..2bcddb65 100644
--- a/frontends/php/include/locales/nl_nl.inc.php
+++ b/frontends/php/include/locales/nl_nl.inc.php
@@ -96,11 +96,6 @@
"S_AVERAGE"=> "Gemiddelde",
"S_HIGH"=> "Hoog",
"S_DISASTER"=> "Catastrofe",
- "S_REPEAT"=> "Herhaal",
- "S_REPEATS"=> "Herhalingen",
- "S_NO_REPEATS"=> "Geen herhalingen",
- "S_NUMBER_OF_REPEATS"=> "Nummer herhalingen",
- "S_DELAY_BETWEEN_REPEATS"=> "Vertraging tussen herhalingen",
"S_CREATE_ACTION"=> "Maak een actie",
// alarms.php
diff --git a/frontends/php/include/locales/sv_se.inc.php b/frontends/php/include/locales/sv_se.inc.php
index 6d78183d..4773d059 100644
--- a/frontends/php/include/locales/sv_se.inc.php
+++ b/frontends/php/include/locales/sv_se.inc.php
@@ -101,11 +101,6 @@
"S_AVERAGE"=> "Medel",
"S_HIGH"=> "H鰃",
"S_DISASTER"=> "Allvarlig",
- "S_REPEAT"=> "Upprepa",
- "S_REPEATS"=> "Upprepningar",
- "S_NO_REPEATS"=> "Inga upprepningar",
- "S_NUMBER_OF_REPEATS"=> "Antal upprepningar",
- "S_DELAY_BETWEEN_REPEATS"=> "F鰎dr鰆ning mellan upprepningar",
"S_CREATE_ACTION"=> "Skapa 錿g鋜d",
// alarms.php
generated by cgit (git 2.34.1) at 2024-09-23 18:33:37 +0000