From 9861c01db836851bd9314ce8991cd5d146cc117d Mon Sep 17 00:00:00 2001 From: Jordi Sanfeliu Date: Wed, 29 Nov 2023 17:32:51 +0100 Subject: [PATCH] fixed the size of graphs in Multihost viewer when using a bigger 'global_zoom' value --- lib/ambsens.pm | 13 ++++--- lib/amdenergy.pm | 13 ++++--- lib/amdgpu.pm | 13 ++++--- lib/apache.pm | 53 +++++++++++++------------- lib/apcupsd.pm | 53 +++++++++++++------------- lib/bind.pm | 61 +++++++++++++++--------------- lib/chrony.pm | 53 +++++++++++++------------- lib/disk.pm | 29 ++++++++------- lib/du.pm | 13 ++++--- lib/fail2ban.pm | 13 ++++--- lib/fs.pm | 37 +++++++++--------- lib/ftp.pm | 29 ++++++++------- lib/gensens.pm | 13 ++++--- lib/hptemp.pm | 29 ++++++++------- lib/icecast.pm | 21 ++++++----- lib/int.pm | 29 ++++++++------- lib/intelrapl.pm | 13 ++++--- lib/ipmi.pm | 13 ++++--- lib/kern.pm | 29 ++++++++------- lib/libvirt.pm | 37 +++++++++--------- lib/lighttpd.pm | 29 ++++++++------- lib/lmsens.pm | 45 +++++++++++----------- lib/mail.pm | 53 +++++++++++++------------- lib/memcached.pm | 61 +++++++++++++++--------------- lib/mongodb.pm | 69 ++++++++++++++++++---------------- lib/mysql.pm | 53 +++++++++++++------------- lib/net.pm | 29 ++++++++------- lib/netstat.pm | 45 +++++++++++----------- lib/nfsc.pm | 53 +++++++++++++------------- lib/nfss.pm | 77 ++++++++++++++++++++------------------ lib/nginx.pm | 29 ++++++++------- lib/ntp.pm | 29 ++++++++------- lib/nut.pm | 53 +++++++++++++------------- lib/nvidia.pm | 29 ++++++++------- lib/nvidiagpu.pm | 13 ++++--- lib/nvme.pm | 13 ++++--- lib/pagespeed.pm | 69 ++++++++++++++++++---------------- lib/pgsql.pm | 93 ++++++++++++++++++++++++---------------------- lib/phpapc.pm | 29 ++++++++------- lib/phpfpm.pm | 53 +++++++++++++------------- lib/port.pm | 13 ++++--- lib/proc.pm | 13 ++++--- lib/process.pm | 85 ++++++++++++++++++++++-------------------- lib/raspberrypi.pm | 29 ++++++++------- lib/redis.pm | 53 +++++++++++++------------- lib/serv.pm | 13 ++++--- lib/squid.pm | 77 ++++++++++++++++++++------------------ lib/system.pm | 45 +++++++++++----------- lib/tc.pm | 37 +++++++++--------- lib/tinyproxy.pm | 29 ++++++++------- lib/traffacct.pm | 21 ++++++----- lib/unbound.pm | 85 ++++++++++++++++++++++-------------------- lib/user.pm | 29 ++++++++------- lib/varnish.pm | 53 +++++++++++++------------- lib/verlihub.pm | 29 ++++++++------- lib/wowza.pm | 45 +++++++++++----------- lib/zfs.pm | 61 +++++++++++++++--------------- 57 files changed, 1188 insertions(+), 1017 deletions(-) diff --git a/lib/ambsens.pm b/lib/ambsens.pm index 3c2d80a4..112b54e7 100644 --- a/lib/ambsens.pm +++ b/lib/ambsens.pm @@ -264,7 +264,7 @@ sub ambsens_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -387,13 +387,16 @@ sub ambsens_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @sl = split(',', $ambsens->{list})); $n++) { $str = $u . $package . $n . "." . $tf->{when} . ".$imgfmt_lc"; @@ -468,7 +471,7 @@ sub ambsens_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:s1=$rrd:ambsens" . $n . "_s1:AVERAGE", @@ -497,7 +500,7 @@ sub ambsens_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:s1=$rrd:ambsens" . $n . "_s1:AVERAGE", @@ -521,8 +524,8 @@ sub ambsens_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/amdenergy.pm b/lib/amdenergy.pm index a42b68a3..8fa66b1b 100644 --- a/lib/amdenergy.pm +++ b/lib/amdenergy.pm @@ -380,7 +380,7 @@ sub amdenergy_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -509,13 +509,16 @@ sub amdenergy_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $plots_per_list_item = 1; foreach my $k (sort keys %{$amdenergy->{list}}) { @@ -712,7 +715,7 @@ sub amdenergy_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, $large_plot ? () : @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -734,7 +737,7 @@ sub amdenergy_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, $large_plot ? () : @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -752,8 +755,8 @@ sub amdenergy_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * $plots_per_list_item + $n_plot], IMG => $IMG[$e * $plots_per_list_item + $n_plot]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/amdgpu.pm b/lib/amdgpu.pm index 3549fa1d..ed28426f 100644 --- a/lib/amdgpu.pm +++ b/lib/amdgpu.pm @@ -312,7 +312,7 @@ sub amdgpu_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -443,13 +443,16 @@ sub amdgpu_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < keys(%{$amdgpu->{list}}); $n++) { for($n2 = 0; $n2 < $number_of_sensor_values_in_use; $n2++) { @@ -712,7 +715,7 @@ sub amdgpu_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, $n_plot < $main_sensor_plots ? () : @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -734,7 +737,7 @@ sub amdgpu_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, $n_plot < $main_sensor_plots ? () : @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -752,8 +755,8 @@ sub amdgpu_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * $number_of_sensor_values_in_use + $n_plot], IMG => $IMG[$e * $number_of_sensor_values_in_use + $n_plot]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/apache.pm b/lib/apache.pm index 4017bcc8..1a819b7a 100644 --- a/lib/apache.pm +++ b/lib/apache.pm @@ -720,7 +720,7 @@ sub apache_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -827,13 +827,16 @@ sub apache_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @al = split(',', $apache->{list})); $n++) { for($n2 = 1; $n2 <= 6; $n2++) { @@ -903,7 +906,7 @@ sub apache_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:apache" . $e . "_busy=$rrd:apache" . $e . "_busy:AVERAGE", @@ -929,7 +932,7 @@ sub apache_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:apache" . $e . "_busy=$rrd:apache" . $e . "_busy:AVERAGE", @@ -948,8 +951,8 @@ sub apache_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1033,7 +1036,7 @@ sub apache_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:apache" . $e . "_star=$rrd:apache" . $e . "_star:AVERAGE", @@ -1061,7 +1064,7 @@ sub apache_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:apache" . $e . "_star=$rrd:apache" . $e . "_star:AVERAGE", @@ -1083,8 +1086,8 @@ sub apache_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1132,7 +1135,7 @@ sub apache_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1154,7 +1157,7 @@ sub apache_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1172,8 +1175,8 @@ sub apache_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1217,7 +1220,7 @@ sub apache_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1239,7 +1242,7 @@ sub apache_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1257,8 +1260,8 @@ sub apache_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1309,7 +1312,7 @@ sub apache_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1334,7 +1337,7 @@ sub apache_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1355,8 +1358,8 @@ sub apache_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1400,7 +1403,7 @@ sub apache_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1422,7 +1425,7 @@ sub apache_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1440,8 +1443,8 @@ sub apache_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/apcupsd.pm b/lib/apcupsd.pm index dd7babc7..4fa48105 100644 --- a/lib/apcupsd.pm +++ b/lib/apcupsd.pm @@ -286,7 +286,7 @@ sub apcupsd_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -404,13 +404,16 @@ sub apcupsd_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @al = split(',', $apcupsd->{list})); $n++) { for($n2 = 1; $n2 <= 6; $n2++) { @@ -534,7 +537,7 @@ sub apcupsd_cgi { altscaling_options($alt_scaling_for_voltage), @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:htran=$rrd:apcupsd" . $e . "_htran:AVERAGE", @@ -562,7 +565,7 @@ sub apcupsd_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:htran=$rrd:apcupsd" . $e . "_htran:AVERAGE", @@ -582,8 +585,8 @@ sub apcupsd_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -641,7 +644,7 @@ sub apcupsd_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:bchar=$rrd:apcupsd" . $e . "_bchar:AVERAGE", @@ -667,7 +670,7 @@ sub apcupsd_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:bchar=$rrd:apcupsd" . $e . "_bchar:AVERAGE", @@ -686,8 +689,8 @@ sub apcupsd_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -746,7 +749,7 @@ sub apcupsd_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -770,7 +773,7 @@ sub apcupsd_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -790,8 +793,8 @@ sub apcupsd_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -838,7 +841,7 @@ sub apcupsd_cgi { altscaling_options($alt_scaling_for_battery_voltage), @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -862,7 +865,7 @@ sub apcupsd_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -881,8 +884,8 @@ sub apcupsd_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -929,7 +932,7 @@ sub apcupsd_cgi { altscaling_options($alt_scaling_for_timeleft), @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -953,7 +956,7 @@ sub apcupsd_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -972,8 +975,8 @@ sub apcupsd_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1016,7 +1019,7 @@ sub apcupsd_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1038,7 +1041,7 @@ sub apcupsd_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1056,8 +1059,8 @@ sub apcupsd_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/bind.pm b/lib/bind.pm index 1332a3b0..0d44298d 100644 --- a/lib/bind.pm +++ b/lib/bind.pm @@ -572,7 +572,7 @@ sub bind_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -797,13 +797,16 @@ sub bind_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @bl = split(',', $bind->{list})); $n++) { for($n2 = 1; $n2 <= 7; $n2++) { @@ -865,7 +868,7 @@ sub bind_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:inq0=$rrd:bind" . $e . "_inq01:AVERAGE", @@ -905,7 +908,7 @@ sub bind_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:inq0=$rrd:bind" . $e . "_inq01:AVERAGE", @@ -940,8 +943,8 @@ sub bind_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7], IMG => $IMG[$e * 7]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -992,7 +995,7 @@ sub bind_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ouq0=$rrd:bind" . $e . "_ouq01:AVERAGE", @@ -1032,7 +1035,7 @@ sub bind_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ouq0=$rrd:bind" . $e . "_ouq01:AVERAGE", @@ -1067,8 +1070,8 @@ sub bind_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 1], IMG => $IMG[$e * 7 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1117,7 +1120,7 @@ sub bind_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ss0=$rrd:bind" . $e . "_ss01:AVERAGE", @@ -1157,7 +1160,7 @@ sub bind_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ss0=$rrd:bind" . $e . "_ss01:AVERAGE", @@ -1192,8 +1195,8 @@ sub bind_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 2], IMG => $IMG[$e * 7 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1244,7 +1247,7 @@ sub bind_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:rs0=$rrd:bind" . $e . "_rs01:AVERAGE", @@ -1284,7 +1287,7 @@ sub bind_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:rs0=$rrd:bind" . $e . "_rs01:AVERAGE", @@ -1319,8 +1322,8 @@ sub bind_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 3], IMG => $IMG[$e * 7 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1369,7 +1372,7 @@ sub bind_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:crr0=$rrd:bind" . $e . "_crr01:AVERAGE", @@ -1409,7 +1412,7 @@ sub bind_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:crr0=$rrd:bind" . $e . "_crr01:AVERAGE", @@ -1444,8 +1447,8 @@ sub bind_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 4], IMG => $IMG[$e * 7 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1497,7 +1500,7 @@ sub bind_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1528,7 +1531,7 @@ sub bind_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1549,8 +1552,8 @@ sub bind_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 5], IMG => $IMG[$e * 7 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1590,7 +1593,7 @@ sub bind_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1614,7 +1617,7 @@ sub bind_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1633,8 +1636,8 @@ sub bind_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 6], IMG => $IMG[$e * 7 + 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/chrony.pm b/lib/chrony.pm index 529191fe..3da6e3b4 100644 --- a/lib/chrony.pm +++ b/lib/chrony.pm @@ -224,7 +224,7 @@ sub chrony_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -329,13 +329,16 @@ sub chrony_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @cl = split(',', $chrony->{list})); $n++) { for($n2 = 1; $n2 <= 6; $n2++) { @@ -435,7 +438,7 @@ sub chrony_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:loffset=$rrd:chrony" . $e . "_loffset:AVERAGE", @@ -461,7 +464,7 @@ sub chrony_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:loffset=$rrd:chrony" . $e . "_loffset:AVERAGE", @@ -479,8 +482,8 @@ sub chrony_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -531,7 +534,7 @@ sub chrony_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:rootdel=$rrd:chrony" . $e . "_rootdel:AVERAGE", @@ -555,7 +558,7 @@ sub chrony_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:rootdel=$rrd:chrony" . $e . "_rootdel:AVERAGE", @@ -573,8 +576,8 @@ sub chrony_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -621,7 +624,7 @@ sub chrony_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -643,7 +646,7 @@ sub chrony_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -661,8 +664,8 @@ sub chrony_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -705,7 +708,7 @@ sub chrony_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -728,7 +731,7 @@ sub chrony_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -747,8 +750,8 @@ sub chrony_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -790,7 +793,7 @@ sub chrony_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -812,7 +815,7 @@ sub chrony_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -830,8 +833,8 @@ sub chrony_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -873,7 +876,7 @@ sub chrony_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -895,7 +898,7 @@ sub chrony_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -913,8 +916,8 @@ sub chrony_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/disk.pm b/lib/disk.pm index ca3e6e16..76b18fb8 100644 --- a/lib/disk.pm +++ b/lib/disk.pm @@ -310,7 +310,7 @@ sub disk_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -438,13 +438,16 @@ sub disk_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < keys(%{$disk->{list}}); $n++) { for($n2 = 1; $n2 <= 8; $n2++) { @@ -560,7 +563,7 @@ sub disk_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:temp0=$rrd:disk" . $e ."_hd0_temp:AVERAGE", @@ -588,7 +591,7 @@ sub disk_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:temp0=$rrd:disk" . $e ."_hd0_temp:AVERAGE", @@ -612,8 +615,8 @@ sub disk_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3], IMG => $IMG[$e * 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -711,7 +714,7 @@ sub disk_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -740,7 +743,7 @@ sub disk_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -765,8 +768,8 @@ sub disk_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3 + 1], IMG => $IMG[$e * 3 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -860,7 +863,7 @@ sub disk_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -889,7 +892,7 @@ sub disk_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -914,8 +917,8 @@ sub disk_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3 + 2], IMG => $IMG[$e * 3 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/du.pm b/lib/du.pm index e79a6f6b..a1d754be 100644 --- a/lib/du.pm +++ b/lib/du.pm @@ -245,7 +245,7 @@ sub du_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -373,13 +373,16 @@ sub du_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(@disk_list); $n++) { $str = $u . $package . $n . "." . $tf->{when} . ".$imgfmt_lc"; @@ -506,7 +509,7 @@ sub du_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF0, @@ -527,7 +530,7 @@ sub du_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF0, @@ -543,8 +546,8 @@ sub du_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/fail2ban.pm b/lib/fail2ban.pm index 2697b949..98f2378e 100644 --- a/lib/fail2ban.pm +++ b/lib/fail2ban.pm @@ -235,7 +235,7 @@ sub fail2ban_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -363,13 +363,16 @@ sub fail2ban_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @fl = split(',', $fail2ban->{list})); $n++) { $str = $u . $package . $n . "." . $tf->{when} . ".$imgfmt_lc"; @@ -429,7 +432,7 @@ sub fail2ban_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:j1=$rrd:fail2ban" . $n . "_j1:AVERAGE", @@ -458,7 +461,7 @@ sub fail2ban_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:j1=$rrd:fail2ban" . $n . "_j1:AVERAGE", @@ -482,8 +485,8 @@ sub fail2ban_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/fs.pm b/lib/fs.pm index d360191f..3c4646e6 100644 --- a/lib/fs.pm +++ b/lib/fs.pm @@ -858,7 +858,7 @@ sub fs_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -983,13 +983,16 @@ sub fs_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < keys(%{$fs->{list}}); $n++) { for($n2 = 1; $n2 <= 4; $n2++) { @@ -1067,7 +1070,7 @@ sub fs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:fs0=$rrd:fs" . $e . "_use0:AVERAGE", @@ -1095,7 +1098,7 @@ sub fs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:fs0=$rrd:fs" . $e . "_use0:AVERAGE", @@ -1119,8 +1122,8 @@ sub fs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4], IMG => $IMG[$e * 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1187,7 +1190,7 @@ sub fs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ioa0=$rrd:fs" . $e . "_ioa0:AVERAGE", @@ -1215,7 +1218,7 @@ sub fs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ioa0=$rrd:fs" . $e . "_ioa0:AVERAGE", @@ -1239,8 +1242,8 @@ sub fs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4 + 1], IMG => $IMG[$e * 4 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1304,7 +1307,7 @@ sub fs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:fs0=$rrd:fs" . $e . "_ino0:AVERAGE", @@ -1332,7 +1335,7 @@ sub fs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:fs0=$rrd:fs" . $e . "_ino0:AVERAGE", @@ -1356,8 +1359,8 @@ sub fs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4 + 2], IMG => $IMG[$e * 4 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1459,7 +1462,7 @@ sub fs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:tim0=$rrd:fs" . $e . "_tim0:AVERAGE", @@ -1495,7 +1498,7 @@ sub fs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:tim0=$rrd:fs" . $e . "_tim0:AVERAGE", @@ -1527,8 +1530,8 @@ sub fs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4 + 3], IMG => $IMG[$e * 4 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/ftp.pm b/lib/ftp.pm index 7abcc188..a6d5470a 100644 --- a/lib/ftp.pm +++ b/lib/ftp.pm @@ -312,7 +312,7 @@ sub ftp_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -401,13 +401,16 @@ sub ftp_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -488,7 +491,7 @@ sub ftp_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:retr=$rrd:ftp_retr:AVERAGE", @@ -515,7 +518,7 @@ sub ftp_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:retr=$rrd:ftp_retr:AVERAGE", @@ -536,8 +539,8 @@ sub ftp_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -595,7 +598,7 @@ sub ftp_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -620,7 +623,7 @@ sub ftp_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -640,8 +643,8 @@ sub ftp_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -698,7 +701,7 @@ sub ftp_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -721,7 +724,7 @@ sub ftp_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -739,8 +742,8 @@ sub ftp_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/gensens.pm b/lib/gensens.pm index 2d30a155..fd4ebc89 100644 --- a/lib/gensens.pm +++ b/lib/gensens.pm @@ -257,7 +257,7 @@ sub gensens_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -388,13 +388,16 @@ sub gensens_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < keys(%{$gensens->{list}}); $n++) { $str = $u . $package . $n . "." . $tf->{when} . ".$imgfmt_lc"; @@ -524,7 +527,7 @@ sub gensens_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:gsen0=$rrd:gensens" . $e . "_s1:AVERAGE", @@ -553,7 +556,7 @@ sub gensens_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:gsen0=$rrd:gensens" . $e . "_s1:AVERAGE", @@ -577,8 +580,8 @@ sub gensens_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/hptemp.pm b/lib/hptemp.pm index 0987c708..2e3b0a2f 100644 --- a/lib/hptemp.pm +++ b/lib/hptemp.pm @@ -256,7 +256,7 @@ sub hptemp_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -393,13 +393,16 @@ sub hptemp_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -487,7 +490,7 @@ sub hptemp_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:temp0=$rrd:hptemp1_1:AVERAGE", @@ -516,7 +519,7 @@ sub hptemp_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:temp0=$rrd:hptemp1_1:AVERAGE", @@ -539,8 +542,8 @@ sub hptemp_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -620,7 +623,7 @@ sub hptemp_cgi { "--height=$height", "--lower-limit=0", @extra, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -647,7 +650,7 @@ sub hptemp_cgi { "--lower-limit=0", @full_size_mode, @extra, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -669,8 +672,8 @@ sub hptemp_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -746,7 +749,7 @@ sub hptemp_cgi { "--height=$height", "--lower-limit=0", @extra, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -773,7 +776,7 @@ sub hptemp_cgi { "--lower-limit=0", @full_size_mode, @extra, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -795,8 +798,8 @@ sub hptemp_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/icecast.pm b/lib/icecast.pm index 8be4bf1d..bf56e945 100644 --- a/lib/icecast.pm +++ b/lib/icecast.pm @@ -230,7 +230,7 @@ sub icecast_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -375,13 +375,16 @@ sub icecast_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @il = split(',', $icecast->{list})); $n++) { $str = $u . $package . $n . "1." . $tf->{when} . ".$imgfmt_lc"; @@ -457,7 +460,7 @@ sub icecast_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ice" . $e . "_mp0=$rrd:icecast" . $e . "_mp0_ls:AVERAGE", @@ -486,7 +489,7 @@ sub icecast_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ice" . $e . "_mp0=$rrd:icecast" . $e . "_mp0_ls:AVERAGE", @@ -510,8 +513,8 @@ sub icecast_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 2], IMG => $IMG[$e * 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -561,7 +564,7 @@ sub icecast_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ice" . $e . "_mp0=$rrd:icecast" . $e . "_mp0_br:AVERAGE", @@ -590,7 +593,7 @@ sub icecast_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ice" . $e . "_mp0=$rrd:icecast" . $e . "_mp0_br:AVERAGE", @@ -614,8 +617,8 @@ sub icecast_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 2 + 1], IMG => $IMG[$e * 2 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/int.pm b/lib/int.pm index 271100fe..473b9560 100644 --- a/lib/int.pm +++ b/lib/int.pm @@ -437,7 +437,7 @@ sub int_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -976,13 +976,16 @@ sub int_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -1070,7 +1073,7 @@ sub int_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF1, @@ -1091,7 +1094,7 @@ sub int_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF1, @@ -1107,8 +1110,8 @@ sub int_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1148,7 +1151,7 @@ sub int_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1170,7 +1173,7 @@ sub int_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1187,8 +1190,8 @@ sub int_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1224,7 +1227,7 @@ sub int_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1246,7 +1249,7 @@ sub int_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1263,8 +1266,8 @@ sub int_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/intelrapl.pm b/lib/intelrapl.pm index 0fa447d7..2cb923c9 100644 --- a/lib/intelrapl.pm +++ b/lib/intelrapl.pm @@ -357,7 +357,7 @@ sub intelrapl_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -473,13 +473,16 @@ sub intelrapl_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $plots_per_list_item = 1; for($n = 0; $n < keys(%{$intelrapl->{list}}); $n++) { @@ -732,7 +735,7 @@ sub intelrapl_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, $large_plot ? () : @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -754,7 +757,7 @@ sub intelrapl_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, $large_plot ? () : @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -772,8 +775,8 @@ sub intelrapl_cgi { push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * $plots_per_list_item + $n_plot] . "\">\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/ipmi.pm b/lib/ipmi.pm index e2b62387..f77aae64 100644 --- a/lib/ipmi.pm +++ b/lib/ipmi.pm @@ -223,7 +223,7 @@ sub ipmi_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -347,13 +347,16 @@ sub ipmi_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(@sensor_list); $n++) { $str = $u . $package . $n . "." . $tf->{when} . ".$imgfmt_lc"; @@ -440,7 +443,7 @@ sub ipmi_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:s1=$rrd:ipmi" . $n . "_s1:AVERAGE", @@ -469,7 +472,7 @@ sub ipmi_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:s1=$rrd:ipmi" . $n . "_s1:AVERAGE", @@ -493,8 +496,8 @@ sub ipmi_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/kern.pm b/lib/kern.pm index 502ef81e..a7ed6052 100644 --- a/lib/kern.pm +++ b/lib/kern.pm @@ -385,7 +385,7 @@ sub kern_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -465,13 +465,16 @@ sub kern_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -713,7 +716,7 @@ sub kern_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:user=$rrd:kern_user:AVERAGE", @@ -741,7 +744,7 @@ sub kern_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:user=$rrd:kern_user:AVERAGE", @@ -764,8 +767,8 @@ sub kern_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -826,7 +829,7 @@ sub kern_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -850,7 +853,7 @@ sub kern_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -869,8 +872,8 @@ sub kern_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -928,7 +931,7 @@ sub kern_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -952,7 +955,7 @@ sub kern_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -971,8 +974,8 @@ sub kern_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/libvirt.pm b/lib/libvirt.pm index 391410ce..f581989c 100644 --- a/lib/libvirt.pm +++ b/lib/libvirt.pm @@ -314,7 +314,7 @@ sub libvirt_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -456,13 +456,16 @@ sub libvirt_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < keys(%{$libvirt->{list}}); $n++) { for($n2 = 1; $n2 <= 4; $n2++) { @@ -538,7 +541,7 @@ sub libvirt_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:cpu0=$rrd:libv" . $e . "_cpu0:AVERAGE", @@ -566,7 +569,7 @@ sub libvirt_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:cpu0=$rrd:libv" . $e . "_cpu0:AVERAGE", @@ -590,8 +593,8 @@ sub libvirt_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4], IMG => $IMG[$e * 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -652,7 +655,7 @@ sub libvirt_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:mem0=$rrd:libv" . $e . "_mem0:AVERAGE", @@ -688,7 +691,7 @@ sub libvirt_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:mem0=$rrd:libv" . $e . "_mem0:AVERAGE", @@ -720,8 +723,8 @@ sub libvirt_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4 + 1], IMG => $IMG[$e * 4 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -779,7 +782,7 @@ sub libvirt_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:dsk0=$rrd:libv" . $e . "_dsk0:AVERAGE", @@ -815,7 +818,7 @@ sub libvirt_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:dsk0=$rrd:libv" . $e . "_dsk0:AVERAGE", @@ -847,8 +850,8 @@ sub libvirt_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4 + 2], IMG => $IMG[$e * 4 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -928,7 +931,7 @@ sub libvirt_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:net0=$rrd:libv" . $e . "_net0:AVERAGE", @@ -956,7 +959,7 @@ sub libvirt_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:net0=$rrd:libv" . $e . "_net0:AVERAGE", @@ -980,8 +983,8 @@ sub libvirt_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4 + 3], IMG => $IMG[$e * 4 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/lighttpd.pm b/lib/lighttpd.pm index 3ae0c68b..800eadae 100644 --- a/lib/lighttpd.pm +++ b/lib/lighttpd.pm @@ -210,7 +210,7 @@ sub lighttpd_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -322,13 +322,16 @@ sub lighttpd_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @ll = split(',', $lighttpd->{list})); $n++) { for($n2 = 1; $n2 <= 3; $n2++) { @@ -397,7 +400,7 @@ sub lighttpd_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:lighttpd" . $e . "_busy=$rrd:lighttpd" . $e . "_busy:AVERAGE", @@ -423,7 +426,7 @@ sub lighttpd_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:lighttpd" . $e . "_busy=$rrd:lighttpd" . $e . "_busy:AVERAGE", @@ -442,8 +445,8 @@ sub lighttpd_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3], IMG => $IMG[$e * 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -496,7 +499,7 @@ sub lighttpd_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -518,7 +521,7 @@ sub lighttpd_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -536,8 +539,8 @@ sub lighttpd_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3 + 1], IMG => $IMG[$e * 3 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -581,7 +584,7 @@ sub lighttpd_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -603,7 +606,7 @@ sub lighttpd_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -621,8 +624,8 @@ sub lighttpd_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3 + 2], IMG => $IMG[$e * 3 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/lmsens.pm b/lib/lmsens.pm index 02f7aeca..04241702 100644 --- a/lib/lmsens.pm +++ b/lib/lmsens.pm @@ -429,7 +429,7 @@ sub lmsens_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -638,13 +638,16 @@ sub lmsens_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -761,7 +764,7 @@ sub lmsens_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:core0=$rrd:lmsens_core0:AVERAGE", @@ -797,7 +800,7 @@ sub lmsens_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:core0=$rrd:lmsens_core0:AVERAGE", @@ -828,8 +831,8 @@ sub lmsens_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -958,7 +961,7 @@ sub lmsens_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:volt0=$rrd:lmsens_volt0:AVERAGE", @@ -990,7 +993,7 @@ sub lmsens_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:volt0=$rrd:lmsens_volt0:AVERAGE", @@ -1017,8 +1020,8 @@ sub lmsens_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1103,7 +1106,7 @@ sub lmsens_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1131,7 +1134,7 @@ sub lmsens_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1153,8 +1156,8 @@ sub lmsens_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1243,7 +1246,7 @@ sub lmsens_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1274,7 +1277,7 @@ sub lmsens_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1299,8 +1302,8 @@ sub lmsens_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG4z, IMG => $IMG4) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1402,7 +1405,7 @@ sub lmsens_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1433,7 +1436,7 @@ sub lmsens_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1458,8 +1461,8 @@ sub lmsens_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG5z, IMG => $IMG5) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/mail.pm b/lib/mail.pm index ac1c640f..ae173ae0 100644 --- a/lib/mail.pm +++ b/lib/mail.pm @@ -731,7 +731,7 @@ sub mail_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -828,13 +828,16 @@ sub mail_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -1102,7 +1105,7 @@ sub mail_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:in=$rrd:mail_in:AVERAGE", @@ -1139,7 +1142,7 @@ sub mail_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:in=$rrd:mail_in:AVERAGE", @@ -1170,8 +1173,8 @@ sub mail_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1244,7 +1247,7 @@ sub mail_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:in=$rrd:mail_bytes_recvd:AVERAGE", @@ -1270,7 +1273,7 @@ sub mail_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:in=$rrd:mail_bytes_recvd:AVERAGE", @@ -1289,8 +1292,8 @@ sub mail_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1338,7 +1341,7 @@ sub mail_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1360,7 +1363,7 @@ sub mail_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1377,8 +1380,8 @@ sub mail_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1422,7 +1425,7 @@ sub mail_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1445,7 +1448,7 @@ sub mail_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1462,8 +1465,8 @@ sub mail_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG4z, IMG => $IMG4) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1514,7 +1517,7 @@ sub mail_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1539,7 +1542,7 @@ sub mail_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1559,8 +1562,8 @@ sub mail_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG5z, IMG => $IMG5) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1628,7 +1631,7 @@ sub mail_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1653,7 +1656,7 @@ sub mail_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1673,8 +1676,8 @@ sub mail_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG6z, IMG => $IMG6) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/memcached.pm b/lib/memcached.pm index c1c0c841..01ac4d3f 100644 --- a/lib/memcached.pm +++ b/lib/memcached.pm @@ -404,7 +404,7 @@ sub memcached_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -509,13 +509,16 @@ sub memcached_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @ml = split(',', $memcached->{list})); $n++) { for($n2 = 1; $n2 <= 7; $n2++) { @@ -653,7 +656,7 @@ sub memcached_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:inchit=$rrd:memc" . $e . "_inchit:AVERAGE", @@ -685,7 +688,7 @@ sub memcached_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:inchit=$rrd:memc" . $e . "_inchit:AVERAGE", @@ -709,8 +712,8 @@ sub memcached_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7], IMG => $IMG[$e * 7]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -789,7 +792,7 @@ sub memcached_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:autcmd=$rrd:memc" . $e . "_autcmd:AVERAGE", @@ -822,7 +825,7 @@ sub memcached_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:autcmd=$rrd:memc" . $e . "_autcmd:AVERAGE", @@ -845,8 +848,8 @@ sub memcached_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 1], IMG => $IMG[$e * 7 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -896,7 +899,7 @@ sub memcached_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -921,7 +924,7 @@ sub memcached_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -939,8 +942,8 @@ sub memcached_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 2], IMG => $IMG[$e * 7 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -982,7 +985,7 @@ sub memcached_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1004,7 +1007,7 @@ sub memcached_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1022,8 +1025,8 @@ sub memcached_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 3], IMG => $IMG[$e * 7 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1071,7 +1074,7 @@ sub memcached_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1095,7 +1098,7 @@ sub memcached_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1115,8 +1118,8 @@ sub memcached_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 4], IMG => $IMG[$e * 7 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1164,7 +1167,7 @@ sub memcached_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1188,7 +1191,7 @@ sub memcached_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1208,8 +1211,8 @@ sub memcached_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 5], IMG => $IMG[$e * 7 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1260,7 +1263,7 @@ sub memcached_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1283,7 +1286,7 @@ sub memcached_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1302,8 +1305,8 @@ sub memcached_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 7 + 6], IMG => $IMG[$e * 7 + 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/mongodb.pm b/lib/mongodb.pm index 8d3c3f0c..fa9da5e7 100644 --- a/lib/mongodb.pm +++ b/lib/mongodb.pm @@ -591,7 +591,7 @@ sub mongodb_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -730,13 +730,16 @@ sub mongodb_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @ml = split(',', $mongodb->{list})); $n++) { for($n2 = 1; $n2 <= 6; $n2++) { @@ -846,7 +849,7 @@ sub mongodb_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:insert=$rrd:mongodb" . $e . "_op_ins:AVERAGE", @@ -873,7 +876,7 @@ sub mongodb_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:insert=$rrd:mongodb" . $e . "_op_ins:AVERAGE", @@ -895,8 +898,8 @@ sub mongodb_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -956,7 +959,7 @@ sub mongodb_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:deleted=$rrd:mongodb" . $e . "_doc_del:AVERAGE", @@ -981,7 +984,7 @@ sub mongodb_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:deleted=$rrd:mongodb" . $e . "_doc_del:AVERAGE", @@ -1001,8 +1004,8 @@ sub mongodb_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1051,7 +1054,7 @@ sub mongodb_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1074,7 +1077,7 @@ sub mongodb_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1093,8 +1096,8 @@ sub mongodb_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1139,7 +1142,7 @@ sub mongodb_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1162,7 +1165,7 @@ sub mongodb_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1181,8 +1184,8 @@ sub mongodb_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1227,7 +1230,7 @@ sub mongodb_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1250,7 +1253,7 @@ sub mongodb_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1269,8 +1272,8 @@ sub mongodb_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1336,7 +1339,7 @@ sub mongodb_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1359,7 +1362,7 @@ sub mongodb_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1378,8 +1381,8 @@ sub mongodb_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1453,7 +1456,7 @@ sub mongodb_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1477,7 +1480,7 @@ sub mongodb_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1496,8 +1499,8 @@ sub mongodb_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1551,7 +1554,7 @@ sub mongodb_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1575,7 +1578,7 @@ sub mongodb_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1594,8 +1597,8 @@ sub mongodb_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/mysql.pm b/lib/mysql.pm index e8fdca09..cde948bb 100644 --- a/lib/mysql.pm +++ b/lib/mysql.pm @@ -494,7 +494,7 @@ sub mysql_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -612,13 +612,16 @@ sub mysql_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @ml = split(',', $mysql->{list})); $n++) { for($n2 = 1; $n2 <= 6; $n2++) { @@ -739,7 +742,7 @@ sub mysql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:com_select=$rrd:mysql" . $e . "_csel:AVERAGE", @@ -769,7 +772,7 @@ sub mysql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:com_select=$rrd:mysql" . $e . "_csel:AVERAGE", @@ -795,8 +798,8 @@ sub mysql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -876,7 +879,7 @@ sub mysql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:tcache_hit_r=$rrd:mysql" . $e . "_tchr:AVERAGE", @@ -903,7 +906,7 @@ sub mysql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:tcache_hit_r=$rrd:mysql" . $e . "_tchr:AVERAGE", @@ -926,8 +929,8 @@ sub mysql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -981,7 +984,7 @@ sub mysql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1004,7 +1007,7 @@ sub mysql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1023,8 +1026,8 @@ sub mysql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1074,7 +1077,7 @@ sub mysql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1097,7 +1100,7 @@ sub mysql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1116,8 +1119,8 @@ sub mysql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1172,7 +1175,7 @@ sub mysql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1196,7 +1199,7 @@ sub mysql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1216,8 +1219,8 @@ sub mysql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1283,7 +1286,7 @@ sub mysql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1306,7 +1309,7 @@ sub mysql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1325,8 +1328,8 @@ sub mysql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/net.pm b/lib/net.pm index 5d2f2266..b80c81a7 100644 --- a/lib/net.pm +++ b/lib/net.pm @@ -268,7 +268,7 @@ sub net_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -387,13 +387,16 @@ sub net_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1; my $IMG2; @@ -491,7 +494,7 @@ sub net_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:in=$rrd:net" . $n . "_bytes_in:AVERAGE", @@ -519,7 +522,7 @@ sub net_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:in=$rrd:net" . $n . "_bytes_in:AVERAGE", @@ -537,8 +540,8 @@ sub net_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -599,7 +602,7 @@ sub net_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -622,7 +625,7 @@ sub net_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -641,8 +644,8 @@ sub net_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -699,7 +702,7 @@ sub net_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -722,7 +725,7 @@ sub net_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -741,8 +744,8 @@ sub net_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/netstat.pm b/lib/netstat.pm index a682dfb0..b9896de1 100644 --- a/lib/netstat.pm +++ b/lib/netstat.pm @@ -361,7 +361,7 @@ sub netstat_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -440,13 +440,16 @@ sub netstat_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -540,7 +543,7 @@ sub netstat_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:i4_closed=$rrd:nstat4_closed:AVERAGE", @@ -567,7 +570,7 @@ sub netstat_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:i4_closed=$rrd:nstat4_closed:AVERAGE", @@ -589,8 +592,8 @@ sub netstat_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -668,7 +671,7 @@ sub netstat_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:i6_closed=$rrd:nstat6_closed:AVERAGE", @@ -695,7 +698,7 @@ sub netstat_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:i6_closed=$rrd:nstat6_closed:AVERAGE", @@ -717,8 +720,8 @@ sub netstat_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -775,7 +778,7 @@ sub netstat_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -801,7 +804,7 @@ sub netstat_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -821,8 +824,8 @@ sub netstat_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -881,7 +884,7 @@ sub netstat_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -909,7 +912,7 @@ sub netstat_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -931,8 +934,8 @@ sub netstat_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG4z, IMG => $IMG4) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -977,7 +980,7 @@ sub netstat_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1001,7 +1004,7 @@ sub netstat_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1019,8 +1022,8 @@ sub netstat_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG5z, IMG => $IMG5) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/nfsc.pm b/lib/nfsc.pm index d6598eb5..6f702cc0 100644 --- a/lib/nfsc.pm +++ b/lib/nfsc.pm @@ -226,7 +226,7 @@ sub nfsc_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -370,13 +370,16 @@ sub nfsc_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; my $IMG3 = $u . $package . "3." . $tf->{when} . ".$imgfmt_lc"; @@ -453,7 +456,7 @@ sub nfsc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -474,7 +477,7 @@ sub nfsc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -489,8 +492,8 @@ sub nfsc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -550,7 +553,7 @@ sub nfsc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -570,7 +573,7 @@ sub nfsc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -585,8 +588,8 @@ sub nfsc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -656,7 +659,7 @@ sub nfsc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -677,7 +680,7 @@ sub nfsc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -693,8 +696,8 @@ sub nfsc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -760,7 +763,7 @@ sub nfsc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -781,7 +784,7 @@ sub nfsc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -797,8 +800,8 @@ sub nfsc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG4z, IMG => $IMG4) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -864,7 +867,7 @@ sub nfsc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -885,7 +888,7 @@ sub nfsc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -901,8 +904,8 @@ sub nfsc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG5z, IMG => $IMG5) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -956,7 +959,7 @@ sub nfsc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -980,7 +983,7 @@ sub nfsc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -999,8 +1002,8 @@ sub nfsc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG6z, IMG => $IMG6) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/nfss.pm b/lib/nfss.pm index 59969679..f159d7b4 100644 --- a/lib/nfss.pm +++ b/lib/nfss.pm @@ -361,7 +361,7 @@ sub nfss_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -521,13 +521,16 @@ sub nfss_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; my $IMG3 = $u . $package . "3." . $tf->{when} . ".$imgfmt_lc"; @@ -615,7 +618,7 @@ sub nfss_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -636,7 +639,7 @@ sub nfss_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -651,8 +654,8 @@ sub nfss_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -712,7 +715,7 @@ sub nfss_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -732,7 +735,7 @@ sub nfss_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -747,8 +750,8 @@ sub nfss_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -808,7 +811,7 @@ sub nfss_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -828,7 +831,7 @@ sub nfss_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -843,8 +846,8 @@ sub nfss_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -899,7 +902,7 @@ sub nfss_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -922,7 +925,7 @@ sub nfss_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -940,8 +943,8 @@ sub nfss_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG4z, IMG => $IMG4) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -995,7 +998,7 @@ sub nfss_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1020,7 +1023,7 @@ sub nfss_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1040,8 +1043,8 @@ sub nfss_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG5z, IMG => $IMG5) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1095,7 +1098,7 @@ sub nfss_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1121,7 +1124,7 @@ sub nfss_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1142,8 +1145,8 @@ sub nfss_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG6z, IMG => $IMG6) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1215,7 +1218,7 @@ sub nfss_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1247,7 +1250,7 @@ sub nfss_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1274,8 +1277,8 @@ sub nfss_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG7z, IMG => $IMG7) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1329,7 +1332,7 @@ sub nfss_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1353,7 +1356,7 @@ sub nfss_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1372,8 +1375,8 @@ sub nfss_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG8z, IMG => $IMG8) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1427,7 +1430,7 @@ sub nfss_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1453,7 +1456,7 @@ sub nfss_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1474,8 +1477,8 @@ sub nfss_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG9z, IMG => $IMG9) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/nginx.pm b/lib/nginx.pm index 499ad69c..58aaa5fa 100644 --- a/lib/nginx.pm +++ b/lib/nginx.pm @@ -258,7 +258,7 @@ sub nginx_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -350,13 +350,16 @@ sub nginx_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -435,7 +438,7 @@ sub nginx_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:total=$rrd:nginx_total:AVERAGE", @@ -460,7 +463,7 @@ sub nginx_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:total=$rrd:nginx_total:AVERAGE", @@ -479,8 +482,8 @@ sub nginx_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -528,7 +531,7 @@ sub nginx_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -550,7 +553,7 @@ sub nginx_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -567,8 +570,8 @@ sub nginx_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -684,7 +687,7 @@ sub nginx_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -708,7 +711,7 @@ sub nginx_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -727,8 +730,8 @@ sub nginx_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/ntp.pm b/lib/ntp.pm index 88031a94..ba311057 100644 --- a/lib/ntp.pm +++ b/lib/ntp.pm @@ -202,7 +202,7 @@ sub ntp_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -334,13 +334,16 @@ sub ntp_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @nl = split(',', $ntp->{list})); $n++) { for($n2 = 1; $n2 <= 3; $n2++) { @@ -413,7 +416,7 @@ sub ntp_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ntp" . $e . "_del=$rrd:ntp" . $e . "_del:AVERAGE", @@ -440,7 +443,7 @@ sub ntp_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ntp" . $e . "_del=$rrd:ntp" . $e . "_del:AVERAGE", @@ -460,8 +463,8 @@ sub ntp_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3], IMG => $IMG[$e * 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -504,7 +507,7 @@ sub ntp_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -526,7 +529,7 @@ sub ntp_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -544,8 +547,8 @@ sub ntp_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3 + 1], IMG => $IMG[$e * 3 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -593,7 +596,7 @@ sub ntp_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -624,7 +627,7 @@ sub ntp_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -651,8 +654,8 @@ sub ntp_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3 + 2], IMG => $IMG[$e * 3 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/nut.pm b/lib/nut.pm index a769969f..aee9687d 100644 --- a/lib/nut.pm +++ b/lib/nut.pm @@ -285,7 +285,7 @@ sub nut_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -404,13 +404,16 @@ sub nut_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @nl = split(',', $nut->{list})); $n++) { for($n2 = 1; $n2 <= 6; $n2++) { @@ -540,7 +543,7 @@ sub nut_cgi { altscaling_options($alt_scaling_for_voltage), @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ltran=$rrd:nut" . $e . "_ltran:AVERAGE", @@ -568,7 +571,7 @@ sub nut_cgi { altscaling_options($alt_scaling_for_voltage), @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:ltran=$rrd:nut" . $e . "_ltran:AVERAGE", @@ -588,8 +591,8 @@ sub nut_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -649,7 +652,7 @@ sub nut_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:bchar=$rrd:nut" . $e . "_bchar:AVERAGE", @@ -676,7 +679,7 @@ sub nut_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:bchar=$rrd:nut" . $e . "_bchar:AVERAGE", @@ -695,8 +698,8 @@ sub nut_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -755,7 +758,7 @@ sub nut_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -779,7 +782,7 @@ sub nut_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -799,8 +802,8 @@ sub nut_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -847,7 +850,7 @@ sub nut_cgi { altscaling_options($alt_scaling_for_battery_voltage), @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -871,7 +874,7 @@ sub nut_cgi { altscaling_options($alt_scaling_for_battery_voltage), @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -890,8 +893,8 @@ sub nut_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -938,7 +941,7 @@ sub nut_cgi { altscaling_options($alt_scaling_for_timeleft), @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -964,7 +967,7 @@ sub nut_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -985,8 +988,8 @@ sub nut_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1029,7 +1032,7 @@ sub nut_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1051,7 +1054,7 @@ sub nut_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1069,8 +1072,8 @@ sub nut_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/nvidia.pm b/lib/nvidia.pm index 514f2ae1..21f6daec 100644 --- a/lib/nvidia.pm +++ b/lib/nvidia.pm @@ -282,7 +282,7 @@ sub nvidia_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -397,13 +397,16 @@ sub nvidia_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -486,7 +489,7 @@ sub nvidia_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:temp0=$rrd:nvidia_temp0:AVERAGE", @@ -516,7 +519,7 @@ sub nvidia_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:temp0=$rrd:nvidia_temp0:AVERAGE", @@ -540,8 +543,8 @@ sub nvidia_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -595,7 +598,7 @@ sub nvidia_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -626,7 +629,7 @@ sub nvidia_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -651,8 +654,8 @@ sub nvidia_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -703,7 +706,7 @@ sub nvidia_cgi { @extra, @riglim, @{$cgi->{version12}}, - $zoom, + $global_zoom, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, "DEF:mem0=$rrd:nvidia_mem0:AVERAGE", @@ -733,7 +736,7 @@ sub nvidia_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -758,8 +761,8 @@ sub nvidia_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/nvidiagpu.pm b/lib/nvidiagpu.pm index f5bed3a3..b4d4c8f1 100644 --- a/lib/nvidiagpu.pm +++ b/lib/nvidiagpu.pm @@ -257,7 +257,7 @@ sub nvidiagpu_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -388,13 +388,16 @@ sub nvidiagpu_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < keys(%{$nvidiagpu->{list}}); $n++) { for($n2 = 0; $n2 < $number_of_sensor_values_in_use; $n2++) { @@ -641,7 +644,7 @@ sub nvidiagpu_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, $n_plot < $main_sensor_plots ? () : @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -663,7 +666,7 @@ sub nvidiagpu_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, $n_plot < $main_sensor_plots ? () : @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -681,8 +684,8 @@ sub nvidiagpu_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * $number_of_sensor_values_in_use + $n_plot], IMG => $IMG[$e * $number_of_sensor_values_in_use + $n_plot]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/nvme.pm b/lib/nvme.pm index 015d5fc5..bff4cbcf 100644 --- a/lib/nvme.pm +++ b/lib/nvme.pm @@ -359,7 +359,7 @@ sub nvme_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -491,13 +491,16 @@ sub nvme_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; # Plot settings in order of the smart array. # Array index is the smart sensor index: @@ -719,7 +722,7 @@ sub nvme_cgi { @scaling_options, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, $n_plot < $main_smart_plots ? () : @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -742,7 +745,7 @@ sub nvme_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, $n_plot < $main_smart_plots ? () : @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -760,8 +763,8 @@ sub nvme_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * $number_of_plots + $n_plot], IMG => $IMG[$e * $number_of_plots + $n_plot]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/pagespeed.pm b/lib/pagespeed.pm index 27d3f392..6136dbe2 100644 --- a/lib/pagespeed.pm +++ b/lib/pagespeed.pm @@ -646,7 +646,7 @@ sub pagespeed_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -756,13 +756,16 @@ sub pagespeed_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @pl = split(',', $pagespeed->{list})); $n++) { for($n2 = 1; $n2 <= 8; $n2++) { @@ -875,7 +878,7 @@ sub pagespeed_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:cahit=$rrd:pagespeed" . $e . "_cahit:AVERAGE", @@ -905,7 +908,7 @@ sub pagespeed_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:cahit=$rrd:pagespeed" . $e . "_cahit:AVERAGE", @@ -931,8 +934,8 @@ sub pagespeed_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 8], IMG => $IMG[$e * 8]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1011,7 +1014,7 @@ sub pagespeed_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:urltri=$rrd:pagespeed" . $e . "_urltri:AVERAGE", @@ -1038,7 +1041,7 @@ sub pagespeed_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:urltri=$rrd:pagespeed" . $e . "_urltri:AVERAGE", @@ -1061,8 +1064,8 @@ sub pagespeed_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 8 + 1], IMG => $IMG[$e * 8 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1122,7 +1125,7 @@ sub pagespeed_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:cftob=$rrd:pagespeed" . $e . "_cftob:AVERAGE", @@ -1150,7 +1153,7 @@ sub pagespeed_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:cftob=$rrd:pagespeed" . $e . "_cftob:AVERAGE", @@ -1174,8 +1177,8 @@ sub pagespeed_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 8 + 2], IMG => $IMG[$e * 8 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1228,7 +1231,7 @@ sub pagespeed_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1255,7 +1258,7 @@ sub pagespeed_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1278,8 +1281,8 @@ sub pagespeed_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 8 + 3], IMG => $IMG[$e * 8 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1328,7 +1331,7 @@ sub pagespeed_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1355,7 +1358,7 @@ sub pagespeed_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1378,8 +1381,8 @@ sub pagespeed_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 8 + 4], IMG => $IMG[$e * 8 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1425,7 +1428,7 @@ sub pagespeed_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1451,7 +1454,7 @@ sub pagespeed_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1473,8 +1476,8 @@ sub pagespeed_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 8 + 5], IMG => $IMG[$e * 8 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1523,7 +1526,7 @@ sub pagespeed_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1550,7 +1553,7 @@ sub pagespeed_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1573,8 +1576,8 @@ sub pagespeed_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 8 + 6], IMG => $IMG[$e * 8 + 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1608,7 +1611,7 @@ sub pagespeed_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1630,7 +1633,7 @@ sub pagespeed_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1648,8 +1651,8 @@ sub pagespeed_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 8 + 7], IMG => $IMG[$e * 8 + 7]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/pgsql.pm b/lib/pgsql.pm index 89414c0a..16ffc938 100644 --- a/lib/pgsql.pm +++ b/lib/pgsql.pm @@ -649,7 +649,7 @@ sub pgsql_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -764,13 +764,16 @@ sub pgsql_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @pl = split(',', $pgsql->{list})); $n++) { for($n2 = 1; $n2 <= 6; $n2++) { @@ -887,7 +890,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:returned=$rrd:pgsql" . $e . "_trret:AVERAGE", @@ -915,7 +918,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:returned=$rrd:pgsql" . $e . "_trret:AVERAGE", @@ -936,8 +939,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1017,7 +1020,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:bgwchkt=$rrd:pgsql" . $e . "_tbgwchkt:AVERAGE", @@ -1044,7 +1047,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:bgwchkt=$rrd:pgsql" . $e . "_tbgwchkt:AVERAGE", @@ -1067,8 +1070,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1114,7 +1117,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1136,7 +1139,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1154,8 +1157,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1209,7 +1212,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1235,7 +1238,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1257,8 +1260,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1307,7 +1310,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1330,7 +1333,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1349,8 +1352,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1399,7 +1402,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1422,7 +1425,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1441,8 +1444,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1529,7 +1532,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:returned=$rrd:pgsql" . $e . $e3 . "_rret:AVERAGE", @@ -1554,7 +1557,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:returned=$rrd:pgsql" . $e . $e3 . "_rret:AVERAGE", @@ -1574,8 +1577,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1640,7 +1643,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1666,7 +1669,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1687,8 +1690,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1738,7 +1741,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1760,7 +1763,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1777,8 +1780,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1832,7 +1835,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1856,7 +1859,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1874,8 +1877,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1929,7 +1932,7 @@ sub pgsql_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1953,7 +1956,7 @@ sub pgsql_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1971,8 +1974,8 @@ sub pgsql_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/phpapc.pm b/lib/phpapc.pm index e489e1ef..419d3bd6 100644 --- a/lib/phpapc.pm +++ b/lib/phpapc.pm @@ -206,7 +206,7 @@ sub phpapc_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -313,13 +313,16 @@ sub phpapc_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @pl = split(',', $phpapc->{list})); $n++) { for($n2 = 1; $n2 <= 3; $n2++) { @@ -418,7 +421,7 @@ sub phpapc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:phpapc" . $e . "_free=$rrd:phpapc" . $e . "_free:AVERAGE", @@ -444,7 +447,7 @@ sub phpapc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:phpapc" . $e . "_free=$rrd:phpapc" . $e . "_free:AVERAGE", @@ -463,8 +466,8 @@ sub phpapc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3], IMG => $IMG[$e * 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -517,7 +520,7 @@ sub phpapc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -540,7 +543,7 @@ sub phpapc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -559,8 +562,8 @@ sub phpapc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3 + 1], IMG => $IMG[$e * 3 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -604,7 +607,7 @@ sub phpapc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -628,7 +631,7 @@ sub phpapc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -648,8 +651,8 @@ sub phpapc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3 + 2], IMG => $IMG[$e * 3 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/phpfpm.pm b/lib/phpfpm.pm index 226fb659..5416aafb 100644 --- a/lib/phpfpm.pm +++ b/lib/phpfpm.pm @@ -242,7 +242,7 @@ sub phpfpm_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -380,13 +380,16 @@ sub phpfpm_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; $n = 0; foreach my $pfg (sort keys %{$phpfpm->{group}}) { @@ -470,7 +473,7 @@ sub phpfpm_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:acon" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_aconn0:AVERAGE", @@ -499,7 +502,7 @@ sub phpfpm_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:acon" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_aconn0:AVERAGE", @@ -523,8 +526,8 @@ sub phpfpm_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -567,7 +570,7 @@ sub phpfpm_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:aproc" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_aproc0:AVERAGE", @@ -595,7 +598,7 @@ sub phpfpm_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:aproc" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_aproc0:AVERAGE", @@ -619,8 +622,8 @@ sub phpfpm_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -663,7 +666,7 @@ sub phpfpm_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -692,7 +695,7 @@ sub phpfpm_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -717,8 +720,8 @@ sub phpfpm_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -756,7 +759,7 @@ sub phpfpm_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -801,7 +804,7 @@ sub phpfpm_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -842,8 +845,8 @@ sub phpfpm_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -881,7 +884,7 @@ sub phpfpm_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -910,7 +913,7 @@ sub phpfpm_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -935,8 +938,8 @@ sub phpfpm_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -974,7 +977,7 @@ sub phpfpm_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1003,7 +1006,7 @@ sub phpfpm_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1028,8 +1031,8 @@ sub phpfpm_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/port.pm b/lib/port.pm index 5301a69b..c916c1bf 100644 --- a/lib/port.pm +++ b/lib/port.pm @@ -353,7 +353,7 @@ sub port_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -490,13 +490,16 @@ sub port_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $max = min($port->{max}, scalar(my @pl = split(',', $port->{list}))); for($n = 0; $n < $max; $n++) { @@ -678,7 +681,7 @@ sub port_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -704,7 +707,7 @@ sub port_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -725,8 +728,8 @@ sub port_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$n3], IMG => $IMG[$n3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/proc.pm b/lib/proc.pm index 3a3da3dd..131334b8 100644 --- a/lib/proc.pm +++ b/lib/proc.pm @@ -254,7 +254,7 @@ sub proc_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -367,13 +367,16 @@ sub proc_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < $ncpu; $n++) { $str = $u . $package . $n . "." . $tf->{when} . ".$imgfmt_lc"; @@ -630,7 +633,7 @@ sub proc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:user=$rrd:proc" . $n . "_user:AVERAGE", @@ -658,7 +661,7 @@ sub proc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:user=$rrd:proc" . $n . "_user:AVERAGE", @@ -681,8 +684,8 @@ sub proc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/process.pm b/lib/process.pm index f35a5ec1..ca36348a 100644 --- a/lib/process.pm +++ b/lib/process.pm @@ -353,7 +353,7 @@ sub process_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -497,13 +497,16 @@ sub process_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < keys(%{$process->{list}}); $n++) { for($n2 = 1; $n2 <= 10; $n2++) { @@ -571,7 +574,7 @@ sub process_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:cpu0=$rrd:proc" . $e . "_cpu0:AVERAGE", @@ -601,7 +604,7 @@ sub process_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:cpu0=$rrd:proc" . $e . "_cpu0:AVERAGE", @@ -627,8 +630,8 @@ sub process_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 10], IMG => $IMG[$e * 10]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -685,7 +688,7 @@ sub process_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:mem0=$rrd:proc" . $e . "_mem0:AVERAGE", @@ -725,7 +728,7 @@ sub process_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:mem0=$rrd:proc" . $e . "_mem0:AVERAGE", @@ -761,8 +764,8 @@ sub process_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 10 + 1], IMG => $IMG[$e * 10 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -816,7 +819,7 @@ sub process_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:dsk0=$rrd:proc" . $e . "_dsk0:AVERAGE", @@ -856,7 +859,7 @@ sub process_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:dsk0=$rrd:proc" . $e . "_dsk0:AVERAGE", @@ -892,8 +895,8 @@ sub process_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 10 + 2], IMG => $IMG[$e * 10 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -973,7 +976,7 @@ sub process_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:net0=$rrd:proc" . $e . "_net0:AVERAGE", @@ -1003,7 +1006,7 @@ sub process_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:net0=$rrd:proc" . $e . "_net0:AVERAGE", @@ -1029,8 +1032,8 @@ sub process_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 10 + 3], IMG => $IMG[$e * 10 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1084,7 +1087,7 @@ sub process_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:nof0=$rrd:proc" . $e . "_nof0:AVERAGE", @@ -1114,7 +1117,7 @@ sub process_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:nof0=$rrd:proc" . $e . "_nof0:AVERAGE", @@ -1140,8 +1143,8 @@ sub process_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 10 + 4], IMG => $IMG[$e * 10 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1198,7 +1201,7 @@ sub process_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:nth0=$rrd:proc" . $e . "_nth0:AVERAGE", @@ -1228,7 +1231,7 @@ sub process_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:nth0=$rrd:proc" . $e . "_nth0:AVERAGE", @@ -1254,8 +1257,8 @@ sub process_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 10 + 5], IMG => $IMG[$e * 10 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1315,7 +1318,7 @@ sub process_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:vcs0=$rrd:proc" . $e . "_vcs0:AVERAGE", @@ -1376,7 +1379,7 @@ sub process_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:vcs0=$rrd:proc" . $e . "_vcs0:AVERAGE", @@ -1433,8 +1436,8 @@ sub process_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 10 + 6], IMG => $IMG[$e * 10 + 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1491,7 +1494,7 @@ sub process_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:pro0=$rrd:proc" . $e . "_pro0:AVERAGE", @@ -1521,7 +1524,7 @@ sub process_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:pro0=$rrd:proc" . $e . "_pro0:AVERAGE", @@ -1547,8 +1550,8 @@ sub process_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 10 + 7], IMG => $IMG[$e * 10 + 7]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1618,7 +1621,7 @@ sub process_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:upt0=$rrd:proc" . $e . "_upt0:AVERAGE", @@ -1658,7 +1661,7 @@ sub process_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:upt0=$rrd:proc" . $e . "_upt0:AVERAGE", @@ -1694,8 +1697,8 @@ sub process_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 10 + 8], IMG => $IMG[$e * 10 + 8]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1752,7 +1755,7 @@ sub process_cgi { # "--height=$height", # @extra, # @riglim, -# $zoom, +# $global_zoom, # @{$cgi->{version12}}, # @{$colors->{graph_colors}}, # "DEF:xxx0=$rrd:proc" . $e . "_xxx0:AVERAGE", @@ -1782,7 +1785,7 @@ sub process_cgi { # @full_size_mode, # @extra, # @riglim, -# $zoom, +# $global_zoom, # @{$cgi->{version12}}, # @{$colors->{graph_colors}}, # "DEF:xxx0=$rrd:proc" . $e . "_xxx0:AVERAGE", @@ -1808,8 +1811,8 @@ sub process_cgi { # push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 10 + 9], IMG => $IMG[$e * 10 + 9]) . "\n"); # } else { # if($version eq "new") { -# $picz_width = $picz->{image_width} * $config->{global_zoom}; -# $picz_height = $picz->{image_height} * $config->{global_zoom}; +# $picz_width = $picz->{image_width} * $zoom; +# $picz_height = $picz->{image_height} * $zoom; # } else { # $picz_width = $width + 115; # $picz_height = $height + 100; diff --git a/lib/raspberrypi.pm b/lib/raspberrypi.pm index 4496019c..cde8d1a5 100644 --- a/lib/raspberrypi.pm +++ b/lib/raspberrypi.pm @@ -213,7 +213,7 @@ sub raspberrypi_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -345,13 +345,16 @@ sub raspberrypi_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -419,7 +422,7 @@ sub raspberrypi_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:clock0=$rrd:rpi_clock0:AVERAGE", @@ -448,7 +451,7 @@ sub raspberrypi_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:clock0=$rrd:rpi_clock0:AVERAGE", @@ -472,8 +475,8 @@ sub raspberrypi_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -525,7 +528,7 @@ sub raspberrypi_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -547,7 +550,7 @@ sub raspberrypi_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -564,8 +567,8 @@ sub raspberrypi_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -616,7 +619,7 @@ sub raspberrypi_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -641,7 +644,7 @@ sub raspberrypi_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -661,8 +664,8 @@ sub raspberrypi_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/redis.pm b/lib/redis.pm index a58a8162..4e974305 100644 --- a/lib/redis.pm +++ b/lib/redis.pm @@ -346,7 +346,7 @@ sub redis_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -459,13 +459,16 @@ sub redis_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @ml = split(',', $redis->{list})); $n++) { for($n2 = 1; $n2 <= 6; $n2++) { @@ -551,7 +554,7 @@ sub redis_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:tconn=$rrd:redis" . $e . "_tconn:AVERAGE", @@ -578,7 +581,7 @@ sub redis_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:tconn=$rrd:redis" . $e . "_tconn:AVERAGE", @@ -597,8 +600,8 @@ sub redis_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -659,7 +662,7 @@ sub redis_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:afrgr=$rrd:redis" . $e . "_afrgr:AVERAGE", @@ -686,7 +689,7 @@ sub redis_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:afrgr=$rrd:redis" . $e . "_afrgr:AVERAGE", @@ -706,8 +709,8 @@ sub redis_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -760,7 +763,7 @@ sub redis_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -784,7 +787,7 @@ sub redis_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -804,8 +807,8 @@ sub redis_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -850,7 +853,7 @@ sub redis_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -873,7 +876,7 @@ sub redis_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -892,8 +895,8 @@ sub redis_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -941,7 +944,7 @@ sub redis_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -965,7 +968,7 @@ sub redis_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -985,8 +988,8 @@ sub redis_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1052,7 +1055,7 @@ sub redis_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1075,7 +1078,7 @@ sub redis_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1094,8 +1097,8 @@ sub redis_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/serv.pm b/lib/serv.pm index b99c75e9..7f8b9d1c 100644 --- a/lib/serv.pm +++ b/lib/serv.pm @@ -357,7 +357,7 @@ sub serv_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -500,13 +500,16 @@ sub serv_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(keys %{$serv->{list}}); $n++) { $str = $u . $package . $n . "." . $tf->{when} . ".$imgfmt_lc"; @@ -637,7 +640,7 @@ sub serv_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF0, @@ -658,7 +661,7 @@ sub serv_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF0, @@ -674,8 +677,8 @@ sub serv_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/squid.pm b/lib/squid.pm index fb293ace..510ce3ec 100644 --- a/lib/squid.pm +++ b/lib/squid.pm @@ -467,7 +467,7 @@ sub squid_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -685,13 +685,16 @@ sub squid_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; my $IMG3 = $u . $package . "3." . $tf->{when} . ".$imgfmt_lc"; @@ -780,7 +783,7 @@ sub squid_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -800,7 +803,7 @@ sub squid_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -815,8 +818,8 @@ sub squid_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -877,7 +880,7 @@ sub squid_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -897,7 +900,7 @@ sub squid_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, @DEF, @@ -912,8 +915,8 @@ sub squid_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -999,7 +1002,7 @@ sub squid_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:squid_rq_1=$rrd:squid_rq_1:AVERAGE", @@ -1028,7 +1031,7 @@ sub squid_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:squid_rq_1=$rrd:squid_rq_1:AVERAGE", @@ -1052,8 +1055,8 @@ sub squid_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1105,7 +1108,7 @@ sub squid_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1131,7 +1134,7 @@ sub squid_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1152,8 +1155,8 @@ sub squid_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG4z, IMG => $IMG4) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1201,7 +1204,7 @@ sub squid_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1227,7 +1230,7 @@ sub squid_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1248,8 +1251,8 @@ sub squid_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG5z, IMG => $IMG5) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1303,7 +1306,7 @@ sub squid_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1327,7 +1330,7 @@ sub squid_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1346,8 +1349,8 @@ sub squid_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG6z, IMG => $IMG6) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1406,7 +1409,7 @@ sub squid_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1431,7 +1434,7 @@ sub squid_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1451,8 +1454,8 @@ sub squid_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG7z, IMG => $IMG7) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1518,7 +1521,7 @@ sub squid_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1541,7 +1544,7 @@ sub squid_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1559,8 +1562,8 @@ sub squid_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG8z, IMG => $IMG8) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1626,7 +1629,7 @@ sub squid_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1649,7 +1652,7 @@ sub squid_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1667,8 +1670,8 @@ sub squid_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG9z, IMG => $IMG9) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/system.pm b/lib/system.pm index 818b3ce5..fa60488c 100644 --- a/lib/system.pm +++ b/lib/system.pm @@ -434,7 +434,7 @@ sub system_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -533,13 +533,16 @@ sub system_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -622,7 +625,7 @@ sub system_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:load1=$rrd:system_load1:AVERAGE", @@ -647,7 +650,7 @@ sub system_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:load1=$rrd:system_load1:AVERAGE", @@ -665,8 +668,8 @@ sub system_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -721,7 +724,7 @@ sub system_cgi { "--rigid", "--base=1024", @extra, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:mtotl=$rrd:system_mtotl:AVERAGE", @@ -757,7 +760,7 @@ sub system_cgi { "--base=1024", @full_size_mode, @extra, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:mtotl=$rrd:system_mtotl:AVERAGE", @@ -784,8 +787,8 @@ sub system_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -862,7 +865,7 @@ sub system_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -890,7 +893,7 @@ sub system_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -913,8 +916,8 @@ sub system_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -954,7 +957,7 @@ sub system_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -976,7 +979,7 @@ sub system_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -993,8 +996,8 @@ sub system_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG4z, IMG => $IMG4) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1050,7 +1053,7 @@ sub system_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1073,7 +1076,7 @@ sub system_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1091,8 +1094,8 @@ sub system_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG5z, IMG => $IMG5) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/tc.pm b/lib/tc.pm index 366076b6..33b64b25 100644 --- a/lib/tc.pm +++ b/lib/tc.pm @@ -301,7 +301,7 @@ sub tc_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -439,13 +439,16 @@ sub tc_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @nl = split(',', $tc->{list})); $n++) { for($n2 = 1; $n2 <= 4; $n2++) { @@ -535,7 +538,7 @@ sub tc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:sent0=$rrd:tc" . $e . "_q1_sent:AVERAGE", @@ -564,7 +567,7 @@ sub tc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:sent0=$rrd:tc" . $e . "_q1_sent:AVERAGE", @@ -589,8 +592,8 @@ sub tc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4], IMG => $IMG[$e * 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -648,7 +651,7 @@ sub tc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:drop0=$rrd:tc" . $e . "_q1_drop:AVERAGE", @@ -677,7 +680,7 @@ sub tc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:drop0=$rrd:tc" . $e . "_q1_drop:AVERAGE", @@ -702,8 +705,8 @@ sub tc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4 + 1], IMG => $IMG[$e * 4 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -758,7 +761,7 @@ sub tc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:over0=$rrd:tc" . $e . "_q1_over:AVERAGE", @@ -787,7 +790,7 @@ sub tc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:over0=$rrd:tc" . $e . "_q1_over:AVERAGE", @@ -811,8 +814,8 @@ sub tc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4 + 2], IMG => $IMG[$e * 4 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -870,7 +873,7 @@ sub tc_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:requ0=$rrd:tc" . $e . "_q1_requ:AVERAGE", @@ -899,7 +902,7 @@ sub tc_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:requ0=$rrd:tc" . $e . "_q1_requ:AVERAGE", @@ -924,8 +927,8 @@ sub tc_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 4 + 3], IMG => $IMG[$e * 4 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/tinyproxy.pm b/lib/tinyproxy.pm index f0aef6d6..2038dab7 100644 --- a/lib/tinyproxy.pm +++ b/lib/tinyproxy.pm @@ -251,7 +251,7 @@ sub tinyproxy_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -358,13 +358,16 @@ sub tinyproxy_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @tl = split(',', $tinyproxy->{list})); $n++) { for($n2 = 1; $n2 <= 3; $n2++) { @@ -425,7 +428,7 @@ sub tinyproxy_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:tinyproxy" . $e . "_reqs=$rrd:tinyproxy" . $e . "_reqs:AVERAGE", @@ -451,7 +454,7 @@ sub tinyproxy_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:tinyproxy" . $e . "_reqs=$rrd:tinyproxy" . $e . "_reqs:AVERAGE", @@ -468,8 +471,8 @@ sub tinyproxy_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3], IMG => $IMG[$e * 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -515,7 +518,7 @@ sub tinyproxy_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -537,7 +540,7 @@ sub tinyproxy_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -555,8 +558,8 @@ sub tinyproxy_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3 + 1], IMG => $IMG[$e * 3 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -604,7 +607,7 @@ sub tinyproxy_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -628,7 +631,7 @@ sub tinyproxy_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -648,8 +651,8 @@ sub tinyproxy_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 3 + 2], IMG => $IMG[$e * 3 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/traffacct.pm b/lib/traffacct.pm index 5161b708..f251d304 100644 --- a/lib/traffacct.pm +++ b/lib/traffacct.pm @@ -496,7 +496,7 @@ sub traffacct_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -546,13 +546,16 @@ sub traffacct_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < $traffacct->{max}; $n++) { $str = $u . "traffacct" . $n . ".$tf->{when}" . ".$imgfmt_lc"; @@ -622,7 +625,7 @@ sub traffacct_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -645,7 +648,7 @@ sub traffacct_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -662,8 +665,8 @@ sub traffacct_cgi { print(" " . picz_a_element(config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -736,7 +739,7 @@ sub traffacct_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:in=$rrd:traffacct" . $cgi->{val} . "_in:AVERAGE", @@ -760,7 +763,7 @@ sub traffacct_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:in=$rrd:traffacct" . $cgi->{val} . "_in:AVERAGE", @@ -778,8 +781,8 @@ sub traffacct_cgi { print(" " . picz_a_element(config => $config, IMGz => $IMGz[$cgi->{val}], IMG => $IMG[$cgi->{val}]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/unbound.pm b/lib/unbound.pm index 243a34c3..4047d70d 100644 --- a/lib/unbound.pm +++ b/lib/unbound.pm @@ -818,7 +818,7 @@ sub unbound_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -958,13 +958,16 @@ sub unbound_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -1094,7 +1097,7 @@ sub unbound_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:tnumquer=$rrd:unbound_tnumquer:AVERAGE", @@ -1124,7 +1127,7 @@ sub unbound_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:tnumquer=$rrd:unbound_tnumquer:AVERAGE", @@ -1148,8 +1151,8 @@ sub unbound_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1200,7 +1203,7 @@ sub unbound_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:qtype0=$rrd:unbound_qtype01:AVERAGE", @@ -1240,7 +1243,7 @@ sub unbound_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:qtype0=$rrd:unbound_qtype01:AVERAGE", @@ -1275,8 +1278,8 @@ sub unbound_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1326,7 +1329,7 @@ sub unbound_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1349,7 +1352,7 @@ sub unbound_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:trtavg=$rrd:unbound_trtavg:AVERAGE", @@ -1366,8 +1369,8 @@ sub unbound_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1410,7 +1413,7 @@ sub unbound_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1434,7 +1437,7 @@ sub unbound_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:uptime=$rrd:unbound_uptime:AVERAGE", @@ -1451,8 +1454,8 @@ sub unbound_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG4z, IMG => $IMG4) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1520,7 +1523,7 @@ sub unbound_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1546,7 +1549,7 @@ sub unbound_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:unwquer=$rrd:unbound_unwquer:AVERAGE", @@ -1566,8 +1569,8 @@ sub unbound_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG5z, IMG => $IMG5) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1628,7 +1631,7 @@ sub unbound_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1654,7 +1657,7 @@ sub unbound_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:mcrrset=$rrd:unbound_mcrrset:AVERAGE", @@ -1673,8 +1676,8 @@ sub unbound_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG6z, IMG => $IMG6) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1772,7 +1775,7 @@ sub unbound_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:nanoerr=$rrd:unbound_nanoerr:AVERAGE", @@ -1802,7 +1805,7 @@ sub unbound_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:nanoerr=$rrd:unbound_nanoerr:AVERAGE", @@ -1827,8 +1830,8 @@ sub unbound_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG7z, IMG => $IMG7) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1925,7 +1928,7 @@ sub unbound_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:qflagqr=$rrd:unbound_qflagqr:AVERAGE", @@ -1955,7 +1958,7 @@ sub unbound_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:qflagqr=$rrd:unbound_qflagqr:AVERAGE", @@ -1980,8 +1983,8 @@ sub unbound_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG8z, IMG => $IMG8) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -2079,7 +2082,7 @@ sub unbound_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:h0uto2m=$rrd:unbound_h0uto2m:AVERAGE", @@ -2109,7 +2112,7 @@ sub unbound_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:h0uto2m=$rrd:unbound_h0uto2m:AVERAGE", @@ -2134,8 +2137,8 @@ sub unbound_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG9z, IMG => $IMG9) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -2232,7 +2235,7 @@ sub unbound_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:h1sto2s=$rrd:unbound_h1sto2s:AVERAGE", @@ -2262,7 +2265,7 @@ sub unbound_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:h1sto2s=$rrd:unbound_h1sto2s:AVERAGE", @@ -2287,8 +2290,8 @@ sub unbound_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG10z, IMG => $IMG10) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/user.pm b/lib/user.pm index 58de4a04..31259e57 100644 --- a/lib/user.pm +++ b/lib/user.pm @@ -170,7 +170,7 @@ sub user_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -248,13 +248,16 @@ sub user_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -307,7 +310,7 @@ sub user_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:sys=$rrd:user_sys:AVERAGE", @@ -332,7 +335,7 @@ sub user_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:sys=$rrd:user_sys:AVERAGE", @@ -348,8 +351,8 @@ sub user_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -397,7 +400,7 @@ sub user_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -419,7 +422,7 @@ sub user_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -436,8 +439,8 @@ sub user_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -481,7 +484,7 @@ sub user_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -503,7 +506,7 @@ sub user_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -520,8 +523,8 @@ sub user_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/varnish.pm b/lib/varnish.pm index 16066a63..f634bef7 100644 --- a/lib/varnish.pm +++ b/lib/varnish.pm @@ -380,7 +380,7 @@ sub varnish_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -467,13 +467,16 @@ sub varnish_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -586,7 +589,7 @@ sub varnish_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:nwcre=$rrd:varn0" . "_nwcre:AVERAGE", @@ -615,7 +618,7 @@ sub varnish_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:nwcre=$rrd:varn0" . "_nwcre:AVERAGE", @@ -637,8 +640,8 @@ sub varnish_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -722,7 +725,7 @@ sub varnish_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:bconn=$rrd:varn0" . "_bconn:AVERAGE", @@ -750,7 +753,7 @@ sub varnish_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:bconn=$rrd:varn0" . "_bconn:AVERAGE", @@ -773,8 +776,8 @@ sub varnish_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -827,7 +830,7 @@ sub varnish_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -851,7 +854,7 @@ sub varnish_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -870,8 +873,8 @@ sub varnish_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -919,7 +922,7 @@ sub varnish_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -943,7 +946,7 @@ sub varnish_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -962,8 +965,8 @@ sub varnish_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG4z, IMG => $IMG4) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1014,7 +1017,7 @@ sub varnish_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1039,7 +1042,7 @@ sub varnish_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1059,8 +1062,8 @@ sub varnish_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG5z, IMG => $IMG5) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1111,7 +1114,7 @@ sub varnish_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1134,7 +1137,7 @@ sub varnish_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1152,8 +1155,8 @@ sub varnish_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG6z, IMG => $IMG6) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/verlihub.pm b/lib/verlihub.pm index 40ac3e1d..a66caae7 100644 --- a/lib/verlihub.pm +++ b/lib/verlihub.pm @@ -171,7 +171,7 @@ sub verlihub_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -250,13 +250,16 @@ sub verlihub_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -309,7 +312,7 @@ sub verlihub_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:users_total=$rrd:users_total:AVERAGE", @@ -334,7 +337,7 @@ sub verlihub_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:users_total=$rrd:users_total:AVERAGE", @@ -350,8 +353,8 @@ sub verlihub_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -402,7 +405,7 @@ sub verlihub_cgi { "--units-exponent=0", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -425,7 +428,7 @@ sub verlihub_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -442,8 +445,8 @@ sub verlihub_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -488,7 +491,7 @@ sub verlihub_cgi { "--units-exponent=0", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -511,7 +514,7 @@ sub verlihub_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -528,8 +531,8 @@ sub verlihub_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/wowza.pm b/lib/wowza.pm index 8b8380e9..eabc847f 100644 --- a/lib/wowza.pm +++ b/lib/wowza.pm @@ -395,7 +395,7 @@ sub wowza_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -546,13 +546,16 @@ sub wowza_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; for($n = 0; $n < scalar(my @wl = split(',', $wowza->{list})); $n++) { for($n2 = 1; $n2 <= 5; $n2++) { @@ -628,7 +631,7 @@ sub wowza_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:wms" . $e . "_a0=$rrd:wms" . $e . "_a0_conncur:AVERAGE", @@ -658,7 +661,7 @@ sub wowza_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:wms" . $e . "_a0=$rrd:wms" . $e . "_a0_conncur:AVERAGE", @@ -682,8 +685,8 @@ sub wowza_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 5], IMG => $IMG[$e * 5]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -734,7 +737,7 @@ sub wowza_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:wms" . $e . "_a0i=$rrd:wms" . $e . "_a0_minbrt:AVERAGE", @@ -770,7 +773,7 @@ sub wowza_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:wms" . $e . "_a0i=$rrd:wms" . $e . "_a0_minbrt:AVERAGE", @@ -802,8 +805,8 @@ sub wowza_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 5 + 1], IMG => $IMG[$e * 5 + 1]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -848,7 +851,7 @@ sub wowza_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -877,7 +880,7 @@ sub wowza_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -902,8 +905,8 @@ sub wowza_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 5 + 2], IMG => $IMG[$e * 5 + 2]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -943,7 +946,7 @@ sub wowza_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -972,7 +975,7 @@ sub wowza_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -997,8 +1000,8 @@ sub wowza_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 5 + 3], IMG => $IMG[$e * 5 + 3]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1038,7 +1041,7 @@ sub wowza_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1067,7 +1070,7 @@ sub wowza_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1092,8 +1095,8 @@ sub wowza_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 5 + 4], IMG => $IMG[$e * 5 + 4]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; diff --git a/lib/zfs.pm b/lib/zfs.pm index b5b6c37e..d2ca671f 100644 --- a/lib/zfs.pm +++ b/lib/zfs.pm @@ -405,7 +405,7 @@ sub zfs_cgi { my $colors = $cgi->{colors}; my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; - my $zoom = "--zoom=" . $config->{global_zoom}; + my $zoom = $config->{global_zoom}; my %rrd = ( 'new' => \&RRDs::graphv, 'old' => \&RRDs::graph, @@ -512,13 +512,16 @@ sub zfs_cgi { # graph mode # if($silent eq "yes" || $silent eq "imagetag") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = "_"; } if($silent eq "imagetagbig") { + $zoom = 1; # force 'global_zoom' to 1 in Multihost viewer $colors->{fg_color} = "#000000"; # visible color for text mode $u = ""; } + my $global_zoom = "--zoom=" . $zoom; my $IMG1 = $u . $package . "1." . $tf->{when} . ".$imgfmt_lc"; my $IMG2 = $u . $package . "2." . $tf->{when} . ".$imgfmt_lc"; @@ -618,7 +621,7 @@ sub zfs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:arcsize=$rrd:zfs_arcsize:AVERAGE", @@ -646,7 +649,7 @@ sub zfs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:arcsize=$rrd:zfs_arcsize:AVERAGE", @@ -668,8 +671,8 @@ sub zfs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG1z, IMG => $IMG1) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -721,7 +724,7 @@ sub zfs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -745,7 +748,7 @@ sub zfs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -764,8 +767,8 @@ sub zfs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG2z, IMG => $IMG2) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -810,7 +813,7 @@ sub zfs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -833,7 +836,7 @@ sub zfs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -851,8 +854,8 @@ sub zfs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMG3z, IMG => $IMG3) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -910,7 +913,7 @@ sub zfs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -934,7 +937,7 @@ sub zfs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -953,8 +956,8 @@ sub zfs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1000,7 +1003,7 @@ sub zfs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1023,7 +1026,7 @@ sub zfs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1041,8 +1044,8 @@ sub zfs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1092,7 +1095,7 @@ sub zfs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1116,7 +1119,7 @@ sub zfs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1135,8 +1138,8 @@ sub zfs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100; @@ -1182,7 +1185,7 @@ sub zfs_cgi { "--height=$height", @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1208,7 +1211,7 @@ sub zfs_cgi { @full_size_mode, @extra, @riglim, - $zoom, + $global_zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -1229,8 +1232,8 @@ sub zfs_cgi { push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e]) . "\n"); } else { if($version eq "new") { - $picz_width = $picz->{image_width} * $config->{global_zoom}; - $picz_height = $picz->{image_height} * $config->{global_zoom}; + $picz_width = $picz->{image_width} * $zoom; + $picz_height = $picz->{image_height} * $zoom; } else { $picz_width = $width + 115; $picz_height = $height + 100;