diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-30 09:52:51 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-30 09:52:51 +0000 |
| commit | 37248fa7b984f33291fa9715f301787b17c28ee7 (patch) | |
| tree | a5ee801c754c75201ce591b5efc6c3f348965ca5 /frontends/php/history.php | |
| parent | 9245d334df5ddcce1806d870b21585e6e5b45472 (diff) | |
| download | zabbix-37248fa7b984f33291fa9715f301787b17c28ee7.tar.gz zabbix-37248fa7b984f33291fa9715f301787b17c28ee7.tar.xz zabbix-37248fa7b984f33291fa9715f301787b17c28ee7.zip | |
- merged rev. 4205:4207 from branches/1.4.1 (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@4208 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/history.php')
| -rw-r--r-- | frontends/php/history.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/history.php b/frontends/php/history.php index c2a0052f..0f655963 100644 --- a/frontends/php/history.php +++ b/frontends/php/history.php @@ -44,7 +44,7 @@ include_once "include/page_header.php"; "itemid"=> array(T_ZBX_INT, O_MAND, P_SYS, DB_ID, null), "from"=> array(T_ZBX_INT, O_OPT, null, '{}>=0', null), - "period"=> array(T_ZBX_INT, O_OPT, null, '{}>=3600', null), + "period"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(ZBX_MIN_PERIOD,ZBX_MAX_PERIOD), null), "dec"=> array(T_ZBX_INT, O_OPT, null, null, null), "inc"=> array(T_ZBX_INT, O_OPT, null, null, null), "left"=> array(T_ZBX_INT, O_OPT, null, null, null), @@ -129,8 +129,8 @@ include_once "include/page_header.php"; if($_REQUEST["action"]=="showgraph") { - $_REQUEST["period"] = get_request("period",get_profile("web.item[".$_REQUEST["itemid"]."].graph.period", 3600)); - if($_REQUEST["period"] >= 3600) + $_REQUEST["period"] = get_request("period",get_profile("web.item[".$_REQUEST["itemid"]."].graph.period", ZBX_PERIOD_DEFAULT)); + if($_REQUEST["period"] >= ZBX_MIN_PERIOD) { update_profile("web.item[".$_REQUEST["itemid"]."].graph.period",$_REQUEST["period"]); } |