diff options
| author | james_wells <james_wells@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-18 03:17:13 +0000 |
|---|---|---|
| committer | james_wells <james_wells@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-18 03:17:13 +0000 |
| commit | f7c2b61c66cc33bb15842c4db07b145ace7ba7e9 (patch) | |
| tree | 82d878bee71b96b3ecd66eacfb1bf97788754c7d /frontends/php/include/graphs.inc.php | |
| parent | 715779b96fa92ec73fdb4e5d58791af6bb2e5683 (diff) | |
| download | zabbix-f7c2b61c66cc33bb15842c4db07b145ace7ba7e9.tar.gz zabbix-f7c2b61c66cc33bb15842c4db07b145ace7ba7e9.tar.xz zabbix-f7c2b61c66cc33bb15842c4db07b145ace7ba7e9.zip | |
Added preliminary host and user bulk loader. Still a lot more needs to be added.
zabbix/frontends/php/include/bulkloader.inc.php
zabbix/frontends/php/include/config.inc.php
zabbix/frontends/php/bulkloader.php
Applied SNMPv3 fix
zabbix/src/zabbix_server/poller/poller.c
zabbix/src/zabbix_server/poller/checks_snmp.c
Applied graph dropdown patch
zabbix/frontends/php/charts.php
zabbix/frontends/php/history.php
zabbix/frontends/php/screens.php
zabbix/frontends/php/include/graphs.inc.php
git-svn-id: svn://svn.zabbix.com/trunk@2334 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, 8 insertions, 4 deletions
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php index f2d44c2a..14ea38cb 100644 --- a/frontends/php/include/graphs.inc.php +++ b/frontends/php/include/graphs.inc.php @@ -207,14 +207,16 @@ if(!isset($_REQUEST["period"])) $_REQUEST["period"]=3600; if(!isset($_REQUEST["from"])) $_REQUEST["from"]=0; - if(isset($_REQUEST["inc"])) $_REQUEST["period"]= $_REQUEST["period"]+$_REQUEST["inc"]; - if(isset($_REQUEST["dec"])) $_REQUEST["period"]= $_REQUEST["period"]-$_REQUEST["dec"]; + if(isset($_REQUEST["inc"])) $workingperiod= $_REQUEST["period"]+$_REQUEST["inc"]; + if(isset($_REQUEST["dec"])) $workingperiod= $workingperiod-$_REQUEST["dec"]; + //if(isset($_REQUEST["inc"])) $_REQUEST["period"]= $_REQUEST["period"]+$_REQUEST["inc"]; + //if(isset($_REQUEST["dec"])) $_REQUEST["period"]= $_REQUEST["period"]-$_REQUEST["dec"]; if(isset($_REQUEST["left"])) $_REQUEST["from"]= $_REQUEST["from"]+$_REQUEST["left"]; if(isset($_REQUEST["right"])) $_REQUEST["from"]= $_REQUEST["from"]-$_REQUEST["right"]; - unset($_REQUEST["inc"]); - unset($_REQUEST["dec"]); + //unset($_REQUEST["inc"]); + //unset($_REQUEST["dec"]); unset($_REQUEST["left"]); unset($_REQUEST["right"]); @@ -225,7 +227,9 @@ { $_REQUEST["period"]=3600; $_REQUEST["from"]=0; + $workingperiod=3600; } + return $workingperiod; } function navigation_bar($url) |