summaryrefslogtreecommitdiffstats
path: root/frontends/php/actionconf.php
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-02-13 07:53:21 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-02-13 07:53:21 +0000
commit46047202b0baa12a699ae13d05fa602740030a10 (patch)
tree01b608bb9636139559d14882b13426f8b8f87ad1 /frontends/php/actionconf.php
parent557a39fa4c35009c9aaf4ff29d1c877e0b8fb366 (diff)
downloadzabbix-46047202b0baa12a699ae13d05fa602740030a10.tar.gz
zabbix-46047202b0baa12a699ae13d05fa602740030a10.tar.xz
zabbix-46047202b0baa12a699ae13d05fa602740030a10.zip
- fixed incorrect groupid error for actions (Eugene)
(http://www.zabbix.com/forum/showthread.php?t=2146) git-svn-id: svn://svn.zabbix.com/trunk@2635 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/actionconf.php')
-rw-r--r--frontends/php/actionconf.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/actionconf.php b/frontends/php/actionconf.php
index c13dd164..d2ba403b 100644
--- a/frontends/php/actionconf.php
+++ b/frontends/php/actionconf.php
@@ -118,7 +118,7 @@
if(isset($_REQUEST["conditions"])) foreach($_REQUEST["conditions"] as $val)
add_action_condition($actionid,$val["type"],$val["operator"],$val["value"]);
- if(isset($_REQUEST["userid"]))
+ if($_REQUEST["recipient"] == RECIPIENT_TYPE_USER)
{
$user=get_user_by_userid($_REQUEST["userid"]);
add_audit(AUDIT_ACTION_ADD,AUDIT_RESOURCE_ACTION,
@@ -126,7 +126,7 @@
}
else
{
- $group=get_group_by_groupid($_REQUEST["usrgrpid"]);
+ $group=get_usergroup_by_groupid($_REQUEST["userid"]);
add_audit(AUDIT_ACTION_ADD,AUDIT_RESOURCE_ACTION,
"User [".$group["name"]."] subject [".$_REQUEST["subject"]."]");
}
@@ -219,7 +219,7 @@
}
else
{
- $groupd=get_usergroup_by_usrgrpid($row["userid"]);
+ $groupd=get_usergroup_by_groupid($row["userid"]);
$recipient=$groupd["name"];
}