diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-12-27 18:34:39 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-12-27 18:34:39 +0000 |
| commit | 09554d562e4d076bc5d1178d6e6f13eeae5f8f02 (patch) | |
| tree | 84fdb3a34554543eb9154c8cbd9d653e1ca429f2 /frontends/php/actionconf.php | |
| parent | 461bb2a4ff683a38e6b2066f8c3fec67e110e44a (diff) | |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2434 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/actionconf.php')
| -rw-r--r-- | frontends/php/actionconf.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/frontends/php/actionconf.php b/frontends/php/actionconf.php index bb73301b..52559269 100644 --- a/frontends/php/actionconf.php +++ b/frontends/php/actionconf.php @@ -176,10 +176,17 @@ $result=DBselect($sql); table_begin(); - table_header(array(S_SOURCE,S_SEND_MESSAGE_TO,S_DELAY,S_SUBJECT,S_REPEATS,S_ACTIONS)); + table_header(array(S_SOURCE,S_CONDITIONS,S_SEND_MESSAGE_TO,S_DELAY,S_SUBJECT,S_REPEATS,S_ACTIONS)); $col=0; while($row=DBfetch($result)) { + $sql="select * from conditions where actionid=".$row["actionid"]; + $result2=DBselect($sql); + $conditions=""; + while($condition=DBfetch($result2)) + { + $conditions=$conditions.get_condition_desc($condition["conditiontype"],$condition["operator"],$condition["value"])."<br>"; + } if($row["recipient"] == RECIPIENT_TYPE_USER) { @@ -205,6 +212,7 @@ table_row(array( get_source_description($row["source"]), + $conditions, $recipient, htmlspecialchars($row["delay"]), htmlspecialchars($row["subject"]), |