diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-17 15:02:02 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-17 15:02:02 +0000 |
| commit | b82812f00576369e65c996ef51264de66ce63d57 (patch) | |
| tree | a3ba8c407e03edd1905f591aa2d14bf32acc4f9b /frontends/php/services_form.php | |
| parent | cd6be85dfcfccb202f2d2a9ca9db062725e45d5c (diff) | |
| download | zabbix-b82812f00576369e65c996ef51264de66ce63d57.tar.gz zabbix-b82812f00576369e65c996ef51264de66ce63d57.tar.xz zabbix-b82812f00576369e65c996ef51264de66ce63d57.zip | |
- [DEV-137] fixes in graph zoom for KQ (Artem)
- [DEV-137] fixes for possible errors under Oracle (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5632 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/services_form.php')
| -rw-r--r-- | frontends/php/services_form.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/frontends/php/services_form.php b/frontends/php/services_form.php index 80bf12e1..e81fb28f 100644 --- a/frontends/php/services_form.php +++ b/frontends/php/services_form.php @@ -88,12 +88,12 @@ include_once "include/page_header.php"; //---------------------------------------------------------------------- $available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY); - $available_triggers = get_accessible_triggers(PERM_READ_ONLY); + $available_triggers = get_accessible_triggers(PERM_READ_ONLY,PERM_RES_IDS_ARRAY); if(isset($_REQUEST['serviceid']) && $_REQUEST['serviceid'] > 0){ $sql = 'SELECT s.* '. ' FROM services s '. - ' WHERE (s.triggerid IS NULL OR s.triggerid IN ('.$available_triggers.')) '. + ' WHERE (s.triggerid IS NULL OR '.DBcondition('s.triggerid',$available_triggers).') '. ' AND s.serviceid='.$_REQUEST['serviceid']; if(!$service = DBfetch(DBselect($sql))){ access_deny(); @@ -206,7 +206,7 @@ if(isset($_REQUEST['pservices'])){ $query = 'SELECT DISTINCT s.* '. ' FROM services s '. ' WHERE '.DBin_node('s.serviceid'). - ' AND (s.triggerid IS NULL OR s.triggerid in ('.$available_triggers.')) '. + ' AND (s.triggerid IS NULL OR '.DBcondition('s.triggerid',$available_triggers).') '. ' AND s.serviceid NOT IN ('.$childs_str.$service['serviceid'].') '. ' ORDER BY s.sortorder,s.name'; } @@ -214,7 +214,7 @@ if(isset($_REQUEST['pservices'])){ $query = 'SELECT DISTINCT s.* '. ' FROM services s '. ' WHERE '.DBin_node('s.serviceid'). - ' AND (s.triggerid IS NULL OR s.triggerid in ('.$available_triggers.')) '. + ' AND (s.triggerid IS NULL OR '.DBcondition('s.triggerid',$available_triggers).') '. ' ORDER BY s.sortorder,s.name'; } @@ -276,7 +276,7 @@ if(isset($_REQUEST['cservices'])){ $query = 'SELECT DISTINCT s.* '. ' FROM services s '. ' WHERE '.DBin_node('s.serviceid'). - ' AND (s.triggerid IS NULL OR s.triggerid in ('.$available_triggers.')) '. + ' AND (s.triggerid IS NULL OR '.DBcondition('s.triggerid',$available_triggers).') '. ' AND s.serviceid NOT IN ('.$childs_str.$service['serviceid'].') '. ' ORDER BY s.sortorder,s.name'; @@ -284,7 +284,7 @@ if(isset($_REQUEST['cservices'])){ $query = 'SELECT DISTINCT s.* '. ' FROM services s '. ' WHERE '.DBin_node('s.serviceid'). - ' AND (s.triggerid IS NULL OR s.triggerid in ('.$available_triggers.')) '. + ' AND (s.triggerid IS NULL OR '.DBcondition('s.triggerid',$available_triggers).') '. ' ORDER BY s.sortorder,s.name'; } @@ -408,7 +408,7 @@ if(isset($_REQUEST['sform'])){ $query = 'SELECT DISTINCT s.*, sl.soft '. ' FROM services s1, services s2, services_links sl, services s '. - ' WHERE (s.triggerid IS NULL OR s.triggerid IN ('.$available_triggers.')) '. + ' WHERE (s.triggerid IS NULL OR '.DBcondition('s.triggerid',$available_triggers).') '. ' AND '.DBin_node('s.serviceid'). ' AND sl.serviceupid=s1.serviceid '. ' AND sl.servicedownid=s2.serviceid '. |