diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-03-26 13:32:07 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-03-26 13:32:07 +0000 |
| commit | 8effb9f42e77764a9cc59a361f655c641df5d2aa (patch) | |
| tree | 41859c0471934f0ff1742d8acc35cbb7f8fe6c0f /frontends/php/include | |
| parent | 84b76acee504a3160ab2b568ab7517aedc8e5eb5 (diff) | |
| download | zabbix-8effb9f42e77764a9cc59a361f655c641df5d2aa.tar.gz zabbix-8effb9f42e77764a9cc59a361f655c641df5d2aa.tar.xz zabbix-8effb9f42e77764a9cc59a361f655c641df5d2aa.zip | |
- allow actions without conditions
git-svn-id: svn://svn.zabbix.com/trunk@3928 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/actions.inc.php | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index 9303c125..771db058 100644 --- a/frontends/php/include/actions.inc.php +++ b/frontends/php/include/actions.inc.php @@ -167,12 +167,16 @@ { if(!is_array($conditions) || count($conditions) == 0) { + /* error(S_NO_CONDITIONS_DEFINED); return false; + */ + } + else + { + if(!check_permission_for_action_conditions($conditions)) + return false; } - - if(!check_permission_for_action_conditions($conditions)) - return false; if(!is_array($operations) || count($operations) == 0) { @@ -218,12 +222,16 @@ { if(!is_array($conditions) || count($conditions) == 0) { + /* error(S_NO_CONDITIONS_DEFINED); return false; + */ + } + else + { + if(!check_permission_for_action_conditions($conditions)) + return false; } - - if(!check_permission_for_action_conditions($conditions)) - return false; if(!is_array($operations) || count($operations) == 0) { |