diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-05-27 08:24:17 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-05-27 08:24:17 +0000 |
| commit | c0bfb062b8ac422278fbd5b299ecbef51203011b (patch) | |
| tree | 0d21b48a18b42a9fafeb19236cff97f50436bc3a /frontends/php/include/actions.inc.php | |
| parent | 1528814bf6b442cc01211b9f0b3f2adaadf970f4 (diff) | |
| download | zabbix-c0bfb062b8ac422278fbd5b299ecbef51203011b.tar.gz zabbix-c0bfb062b8ac422278fbd5b299ecbef51203011b.tar.xz zabbix-c0bfb062b8ac422278fbd5b299ecbef51203011b.zip | |
- [DEV-173] added support of notification escalations on server side
git-svn-id: svn://svn.zabbix.com/trunk@5725 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/actions.inc.php')
| -rw-r--r-- | frontends/php/include/actions.inc.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index f18bd128..302d424e 100644 --- a/frontends/php/include/actions.inc.php +++ b/frontends/php/include/actions.inc.php @@ -796,9 +796,9 @@ include_once 'include/discovery.inc.php'; )); $sql = 'SELECT DISTINCT a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,a.status,a.retries,a.error '. - ' FROM alerts a,media_type mt,events e '. - ' WHERE mt.mediatypeid=a.mediatypeid '. - ' AND e.eventid = a.eventid'. + ' FROM events e,alerts a'. + ' left join media_type mt on mt.mediatypeid=a.mediatypeid'. + ' WHERE e.eventid = a.eventid'. $sql_cond. ' AND '.DBcondition('e.objectid',$available_triggers). ' AND '.DBin_node('a.alertid'). @@ -870,9 +870,9 @@ function get_actions_for_event($eventid){ $result=DBselect('SELECT DISTINCT a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,a.status,a.retries,a.error '. - ' FROM alerts a,media_type mt,events e '. - ' WHERE mt.mediatypeid=a.mediatypeid '. - ' AND a.eventid='.$eventid. + ' FROM events e,alerts a'. + ' left join media_type mt on mt.mediatypeid=a.mediatypeid'. + ' WHERE a.eventid='.$eventid. ' AND e.eventid = a.eventid'. ' AND '.DBcondition('e.objectid',$available_triggers). ' AND '.DBin_node('a.alertid'). @@ -932,9 +932,9 @@ function get_actions_hint_by_eventid($eventid,$status=NULL){ )); $sql = 'SELECT DISTINCT a.alertid,mt.description,a.sendto,a.status,u.alias '. - ' FROM alerts a,media_type mt,events e, users u '. - ' WHERE mt.mediatypeid=a.mediatypeid '. - ' AND a.eventid='.$eventid. + ' FROM events e,users u,alerts a'. + ' left join media_type mt on mt.mediatypeid=a.mediatypeid'. + ' WHERE a.eventid='.$eventid. (is_null($status)?'':' AND a.status='.$status). ' AND e.eventid = a.eventid'. ' AND '.DBcondition('e.objectid',$available_triggers). |