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/charts.php | |
| parent | 715779b96fa92ec73fdb4e5d58791af6bb2e5683 (diff) | |
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/charts.php')
| -rw-r--r-- | frontends/php/charts.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/frontends/php/charts.php b/frontends/php/charts.php index b63ebc5f..86ac99f5 100644 --- a/frontends/php/charts.php +++ b/frontends/php/charts.php @@ -36,7 +36,7 @@ { show_header($page["title"],0,$nomenu); } - navigation_bar_calc(); + $effectiveperiod=navigation_bar_calc(); ?> @@ -51,9 +51,9 @@ { $_REQUEST["from"]=0; } - if(!isset($_REQUEST["period"])) + if(!isset($effectiveperiod)) { - $_REQUEST["period"]=3600; + $effectiveperiod=3600; } if(!isset($_REQUEST["keep"])) @@ -172,7 +172,7 @@ if(isset($_REQUEST["graphid"])) { echo "<script language=\"JavaScript\">"; - echo "document.write(\"<IMG SRC='chart2.php?graphid=".$_REQUEST["graphid"].url_param("stime")."&period=".$_REQUEST["period"]."&from=".$_REQUEST["from"]."&width=\"+(document.width-108)+\"'>\")"; + echo "document.write(\"<IMG SRC='chart2.php?graphid=".$_REQUEST["graphid"].url_param("stime")."&period=".$effectiveperiod."&from=".$_REQUEST["from"]."&width=\"+(document.width-108)+\"'>\")"; echo "</script>"; } else |