diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-18 10:56:37 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-18 10:56:37 +0000 |
| commit | d5ab62f761aa744402aac799c894dad15e3fa68a (patch) | |
| tree | f170360410fe3f8600c28fc2c517620a86f4eb9b /frontends/php/report2.php | |
| parent | ac9f1249cfe9a03b56ad1e58dbb0e227975c0f54 (diff) | |
| download | zabbix-d5ab62f761aa744402aac799c894dad15e3fa68a.tar.gz zabbix-d5ab62f761aa744402aac799c894dad15e3fa68a.tar.xz zabbix-d5ab62f761aa744402aac799c894dad15e3fa68a.zip | |
- [DEV-137] fixes for oracle (Artem)
- [DEV-137] small fixes (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5834 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/report2.php')
| -rw-r--r-- | frontends/php/report2.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/frontends/php/report2.php b/frontends/php/report2.php index 0853cd3c..f1c58b1f 100644 --- a/frontends/php/report2.php +++ b/frontends/php/report2.php @@ -138,6 +138,19 @@ include_once 'include/page_header.php'; $table->Show(); } else if(isset($_REQUEST['hostid'])){ + +/* + if($_REQUEST['hostid'] > 0){ + $row = DBfetch(DBselect('SELECT host FROM hosts WHERE hostid='.$_REQUEST['hostid'])); + show_table_header($row['host']); + } + else{ + if(isset($_REQUEST['tpl_triggerid']) && ($_REQUEST['tpl_triggerid'] > 0)) + show_table_header(expand_trigger_description($_REQUEST['tpl_triggerid'])); + else + show_table_header(S_ALL_HOSTS_BIG); + } +//*/ /************************* FILTER *************************/ /***********************************************************/ $filterForm = new CFormTable(S_FILTER);//,'events.php?filter_set=1','POST',null,'sform'); @@ -226,16 +239,6 @@ include_once 'include/page_header.php'; $sql_cond.= ' AND t.templateid='.$_REQUEST['tpl_triggerid']; } - if($_REQUEST['hostid'] > 0){ - $row = DBfetch(DBselect('SELECT host FROM hosts WHERE hostid='.$_REQUEST['hostid'])); - show_table_header($row['host']); - } - else{ - if(isset($_REQUEST['tpl_triggerid']) && ($_REQUEST['tpl_triggerid'] > 0)) - show_table_header(expand_trigger_description($_REQUEST['tpl_triggerid'])); - else - show_table_header(S_ALL_HOSTS_BIG); - } $result = DBselect('SELECT DISTINCT h.hostid,h.host,t.triggerid,t.expression,t.description,t.value '. ' FROM triggers t,hosts h,items i,functions f, hosts_templates ht, groups g, hosts_groups hg '. ' WHERE f.itemid=i.itemid '. |