diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-01 15:09:38 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-01 15:09:38 +0000 |
| commit | 9158473c0884eabb4877274af46d3991cb6ed854 (patch) | |
| tree | 848a2c2d27e942355d102fe377abf6706e680529 /frontends/php/history.php | |
| parent | b205072539c6f5a77b7fdc69bd3b8387314576da (diff) | |
| download | zabbix-9158473c0884eabb4877274af46d3991cb6ed854.tar.gz zabbix-9158473c0884eabb4877274af46d3991cb6ed854.tar.xz zabbix-9158473c0884eabb4877274af46d3991cb6ed854.zip | |
- [DEV-137] returning graphs, maps, screens to menu (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5809 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/history.php')
| -rw-r--r-- | frontends/php/history.php | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/frontends/php/history.php b/frontends/php/history.php index cc716e64..54561b6c 100644 --- a/frontends/php/history.php +++ b/frontends/php/history.php @@ -155,13 +155,11 @@ include_once "include/page_header.php"; if(isset($_REQUEST['plaintext'])) echo $main_header.SBR; - if($_REQUEST['action']=='showgraph'){ - $_REQUEST['period'] = get_request('period',get_profile('web.item.graph.period', ZBX_PERIOD_DEFAULT, PROFILE_TYPE_INT, $_REQUEST['itemid'])); - if($_REQUEST['period'] >= ZBX_MIN_PERIOD){ - update_profile('web.item.graph.period',$_REQUEST['period'], PROFILE_TYPE_INT, $_REQUEST['itemid']); - } + $_REQUEST['period'] = get_request('period',get_profile('web.item.graph.period', ZBX_PERIOD_DEFAULT, PROFILE_TYPE_INT, $_REQUEST['itemid'])); + if($_REQUEST['period'] >= ZBX_MIN_PERIOD){ + update_profile('web.item.graph.period',$_REQUEST['period'], PROFILE_TYPE_INT, $_REQUEST['itemid']); } - + $l_header = array(new CLink($item_data['host'],'latest.php?hostid='.$item_data['hostid']),': ', item_description($item_data['description'],$item_data['key_'])); @@ -234,12 +232,6 @@ include_once "include/page_header.php"; $form->AddVar("itemid",$_REQUEST["itemid"]); - if($_REQUEST["action"]!="showlatest") - { - $form->AddVar("from",$_REQUEST["from"]); - $form->AddVar("period",$_REQUEST["period"]); - } - if(isset($_REQUEST["filter_task"])) $form->AddVar("filter_task",$_REQUEST["filter_task"]); if(isset($_REQUEST["filter"])) $form->AddVar("filter",$_REQUEST["filter"]); if(isset($_REQUEST["mark_color"])) $form->AddVar("mark_color",$_REQUEST["mark_color"]); @@ -270,7 +262,8 @@ include_once "include/page_header.php"; } else if($_REQUEST["action"]=="showvalues" || $_REQUEST["action"]=="showlatest"){ - if($_REQUEST["action"]=="showvalues"){ + if($_REQUEST["action"]=="showvalues"){ + $time = time(null) - $effectiveperiod - $_REQUEST["from"] * 3600; $till = time(null) - $_REQUEST["from"] * 3600; $hours=$effectiveperiod / 3600; |