diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-04 09:37:28 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-04 09:37:28 +0000 |
| commit | 456d33cecd93804e8dcd9f3884ad21fb4eb71ab4 (patch) | |
| tree | ff55a7db28efa2a5f1b64039c5e0d4ada32451dd /frontends/php/tr_status.php | |
| parent | 2b0511e7bd0e50025368b2c159b92fdec1fc011b (diff) | |
| download | zabbix-456d33cecd93804e8dcd9f3884ad21fb4eb71ab4.tar.gz zabbix-456d33cecd93804e8dcd9f3884ad21fb4eb71ab4.tar.xz zabbix-456d33cecd93804e8dcd9f3884ad21fb4eb71ab4.zip | |
- [DEV-137] minor fixes (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5866 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/tr_status.php')
| -rw-r--r-- | frontends/php/tr_status.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php index 9503f0bd..7053ac6e 100644 --- a/frontends/php/tr_status.php +++ b/frontends/php/tr_status.php @@ -132,7 +132,7 @@ include_once "include/page_header.php"; //-------- $config=select_config(); - + /* FILTER */ if(isset($_REQUEST['filter_rst'])){ $_REQUEST['show_actions'] = get_request('show_actions', 0); @@ -170,16 +170,16 @@ include_once "include/page_header.php"; if(TRIGGERS_OPTION_NOFALSEFORB && ($_REQUEST['show_triggers'] == TRIGGERS_OPTION_NOFALSEFORB)){ $_REQUEST['show_events'] = EVENTS_OPTION_NOFALSEFORB; } - + if(($_REQUEST['show_events'] == EVENTS_OPTION_NOFALSEFORB) && ($_REQUEST['show_triggers'] != TRIGGERS_OPTION_NOFALSEFORB)){ $_REQUEST['show_events'] = EVENTS_OPTION_NOEVENT; } - if(!$config['event_ack_enable'] && (($_REQUEST['show_events'] != EVENTS_OPTION_NOEVENT) || ($_REQUEST['show_events'] != EVENTS_OPTION_ALL))){ + if((EVENT_ACK_DISABLED == $config['event_ack_enable']) && !str_in_array($_REQUEST['show_events'],array(EVENTS_OPTION_NOEVENT,EVENTS_OPTION_ALL))){ $_REQUEST['show_events'] = EVENTS_OPTION_NOEVENT; } //-- - + if(isset($_REQUEST['filter_set']) || isset($_REQUEST['filter_rst'])){ update_profile('web.tr_status.filter.show_actions',$_REQUEST['show_actions'], PROFILE_TYPE_INT); update_profile('web.tr_status.filter.show_details',$_REQUEST['show_details'], PROFILE_TYPE_INT); @@ -309,7 +309,7 @@ include_once "include/page_header.php"; $filterForm->SetMethod('post'); $filterForm->AddVar('fullscreen',$_REQUEST['fullscreen']); - + $tr_select = new CComboBox('show_triggers',$show_triggers,'javasctipt: submit();'); if(TRIGGERS_OPTION_ONLYTRUE){ $tr_select->Additem(TRIGGERS_OPTION_ONLYTRUE,S_SHOW_ONLY_TRUE); @@ -342,7 +342,7 @@ include_once "include/page_header.php"; //------- JP ------- if($show_triggers==TRIGGERS_OPTION_NOFALSEFORB){ - $ev_select->Additem(EVENTS_OPTION_NOFALSEFORB,' - ','yes'); + $ev_select->AddItem(EVENTS_OPTION_NOFALSEFORB,' - ','yes'); $ev_select->AddOption('disabled','disabled'); } //--- |