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/include/graphs.inc.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/include/graphs.inc.php')
| -rw-r--r-- | frontends/php/include/graphs.inc.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php index 1ab73968..d9d986ec 100644 --- a/frontends/php/include/graphs.inc.php +++ b/frontends/php/include/graphs.inc.php @@ -564,7 +564,7 @@ function navigation_bar_calc() { // $workingperiod = 3600; - if(!isset($_REQUEST["period"])) $_REQUEST["period"]=3600; + if(!isset($_REQUEST["period"])) $_REQUEST["period"]=ZBX_PERIOD_DEFAULT; if(!isset($_REQUEST["from"])) $_REQUEST["from"]=0; if(!isset($_REQUEST["stime"])) $_REQUEST["stime"]=null; @@ -581,12 +581,12 @@ unset($_REQUEST["left"]); unset($_REQUEST["right"]); - if($_REQUEST["from"] <= 0) $_REQUEST["from"] = 0; - if($_REQUEST["period"] <= 3600) $_REQUEST["period"] = 3600; + if($_REQUEST["from"] <= 0) $_REQUEST["from"] = 0; + if($_REQUEST["period"] <= ZBX_MIN_PERIOD) $_REQUEST["period"] = ZBX_MIN_PERIOD; if(isset($_REQUEST["reset"])) { - $_REQUEST["period"] = 3600; + $_REQUEST["period"] = ZBX_PERIOD_DEFAULT; $_REQUEST["from"] = 0; // $workingperiod = 3600; } @@ -608,10 +608,10 @@ $form->AddItem(S_PERIOD.SPACE); - $period = get_request('period', 3600); + $period = get_request('period',ZBX_PERIOD_DEFAULT); if(in_array($period,array(3600,2*3600,4*3600,8*3600,12*3600,24*3600,7*24*3600,31*24*3600,365*24*3600))) - $custom_per = 3*3600; + $custom_per = ZBX_MIN_PERIOD; else $custom_per = $period; |