summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2004-12-20 10:06:38 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2004-12-20 10:06:38 +0000
commitfec48242f4ea295b14166896404a7ac634d9687d (patch)
tree0935af977704630f1b30cce9a7b43b44d48018bd
parenta660368aa5e103a9343d4d84badc24419961ecef (diff)
downloadzabbix-fec48242f4ea295b14166896404a7ac634d9687d.tar.gz
zabbix-fec48242f4ea295b14166896404a7ac634d9687d.tar.xz
zabbix-fec48242f4ea295b14166896404a7ac634d9687d.zip
- fixed time navigation for user-defined graphs (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@1543 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--ChangeLog1
-rw-r--r--frontends/php/charts.php8
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 29255959..83c6873d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
Changes for 1.1alpha3:
+ - fixed time navigation for user-defined graphs (Alexei)
- added link to ZABBIX manual from all forms (Alexei)
- icmppingsec to return '0' if cannot ping (Alexei)
- added error reason for unsupported items (Alexei)
diff --git a/frontends/php/charts.php b/frontends/php/charts.php
index 0a4758b5..de5233f2 100644
--- a/frontends/php/charts.php
+++ b/frontends/php/charts.php
@@ -183,8 +183,8 @@
$day=24;
// $a already defined
-// $a=array("1h"=>1,"2h"=>2,"4h"=>4,"8h"=>8,"12h"=>12,
-// "24h"=>24,"week"=>7*24,"month"=>31*24,"year"=>365*24);
+ $a=array("1h"=>1,"2h"=>2,"4h"=>4,"8h"=>8,"12h"=>12,
+ "24h"=>24,"week"=>7*24,"month"=>31*24,"year"=>365*24);
foreach($a as $label=>$hours)
{
echo "[";
@@ -214,8 +214,8 @@
$day=24;
// $a already defined
-// $a=array("1h"=>1,"2h"=>2,"4h"=>4,"8h"=>8,"12h"=>12,
-// "24h"=>24,"week"=>7*24,"month"=>31*24,"year"=>365*24);
+ $a=array("1h"=>1,"2h"=>2,"4h"=>4,"8h"=>8,"12h"=>12,
+ "24h"=>24,"week"=>7*24,"month"=>31*24,"year"=>365*24);
foreach($a as $label=>$hours)
{
echo "[";